Skip to content

Commit 28307b0

Browse files
trowbridgec1trowbridgec1
committed
feat: Allow HTTP(S) redirects
Refs: PROD-21449
1 parent 1d11811 commit 28307b0

1 file changed

Lines changed: 23 additions & 8 deletions

File tree

‎UwxMainWindow.cpp‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,9 @@ MainWindow::SerialRead(
17631763
//Check if online XCompiler supports this device
17641764
if (LookupDNSName(true) == true)
17651765
{
1766-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/supported.php?JSON=1&Dev=").append(strDevName).append("&HashA=").append(remTempREM.captured(2)).append("&HashB=").append(remTempREM.captured(3)))));
1766+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/supported.php?JSON=1&Dev=").append(strDevName).append("&HashA=").append(remTempREM.captured(2)).append("&HashB=").append(remTempREM.captured(3))));
1767+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
1768+
gnmrReply = gnmManager->get(request);
17671769
}
17681770
}
17691771
else
@@ -1830,7 +1832,9 @@ MainWindow::SerialRead(
18301832
//XCompiler not found, try Online XCompiler
18311833
if (LookupDNSName(true) == true)
18321834
{
1833-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/supported.php?JSON=1&Dev=").append(strDevName).append("&HashA=").append(remTempREM.captured(2)).append("&HashB=").append(remTempREM.captured(3)))));
1835+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/supported.php?JSON=1&Dev=").append(strDevName).append("&HashA=").append(remTempREM.captured(2)).append("&HashB=").append(remTempREM.captured(3))));
1836+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
1837+
gnmrReply = gnmManager->get(request);
18341838
ui->statusBar->showMessage("Device support request sent...", 2000);
18351839

18361840
if (gchTermMode == MODE_COMPILE)
@@ -5009,6 +5013,7 @@ MainWindow::replyFinished(
50095013
baPostData.append("\r\n-----------------------------17192614014659--\r\n");
50105014
nrThisReq.setRawHeader("Content-Type", "multipart/form-data; boundary=---------------------------17192614014659");
50115015
nrThisReq.setRawHeader("Content-Length", QString::number(baPostData.length()).toUtf8());
5016+
nrThisReq.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
50125017
gnmrReply = gnmManager->post(nrThisReq, baPostData);
50135018
ui->statusBar->showMessage("Sending smartBASIC application for online compilation...", 500);
50145019
}
@@ -5772,7 +5777,9 @@ MainWindow::on_btn_ErrorCodeDownload_clicked(
57725777
ui->btn_UwTerminalXUpdate->setEnabled(false);
57735778
ui->btn_ModuleFirmware->setEnabled(false);
57745779
ui->btn_OnlineXComp_Supported->setEnabled(false);
5775-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/codes.csv"))));
5780+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/codes.csv")));
5781+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
5782+
gnmrReply = gnmManager->get(request);
57765783
ui->statusBar->showMessage("Downloading Error Code file...");
57775784
}
57785785
}
@@ -6001,7 +6008,9 @@ MainWindow::on_btn_ModuleFirmware_clicked(
60016008
ui->btn_UwTerminalXUpdate->setEnabled(false);
60026009
ui->btn_ModuleFirmware->setEnabled(false);
60036010
ui->btn_OnlineXComp_Supported->setEnabled(false);
6004-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/firmwares.php"))));
6011+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/firmwares.php")));
6012+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
6013+
gnmrReply = gnmManager->get(request);
60056014
ui->statusBar->showMessage("Checking for latest firmware versions...");
60066015
}
60076016
}
@@ -6257,7 +6266,9 @@ MainWindow::on_btn_OnlineXComp_Supported_clicked(
62576266
ui->btn_UwTerminalXUpdate->setEnabled(false);
62586267
ui->btn_ModuleFirmware->setEnabled(false);
62596268
ui->btn_OnlineXComp_Supported->setEnabled(false);
6260-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/compiler_list.php"))));
6269+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/compiler_list.php")));
6270+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
6271+
gnmrReply = gnmManager->get(request);
62616272
ui->statusBar->showMessage("Checking for supported XCompilers...");
62626273
}
62636274
}
@@ -8642,7 +8653,7 @@ MainWindow::UwTerminalXUpdateCheck(
86428653
ui->btn_UwTerminalXUpdate->setEnabled(false);
86438654
ui->btn_ModuleFirmware->setEnabled(false);
86448655
ui->btn_OnlineXComp_Supported->setEnabled(false);
8645-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/update_uwterminalx.php?Ver=").append(UwVersion).append("&OS=").append(
8656+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/update_uwterminalx.php?Ver=").append(UwVersion).append("&OS=").append(
86468657
#ifdef _WIN32
86478658
//Windows
86488659
#ifdef _WIN64
@@ -8675,7 +8686,9 @@ MainWindow::UwTerminalXUpdateCheck(
86758686
"LxOth"
86768687
#endif
86778688
#endif
8678-
))));
8689+
)));
8690+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
8691+
gnmrReply = gnmManager->get(request);
86798692
ui->statusBar->showMessage("Checking for UwTerminalX updates...");
86808693
}
86818694
}
@@ -8699,7 +8712,9 @@ MainWindow::ErrorCodeUpdateCheck(
86998712
ui->btn_UwTerminalXUpdate->setEnabled(false);
87008713
ui->btn_ModuleFirmware->setEnabled(false);
87018714
ui->btn_OnlineXComp_Supported->setEnabled(false);
8702-
gnmrReply = gnmManager->get(QNetworkRequest(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/update_errorcodes.php?Ver=").append(gpErrorMessages->value("Version", "0.00").toString()))));
8715+
QNetworkRequest request(QUrl(QString(WebProtocol).append("://").append(WEB_HOST_NAME).append("/update_errorcodes.php?Ver=").append(gpErrorMessages->value("Version", "0.00").toString())));
8716+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
8717+
gnmrReply = gnmManager->get(request);
87038718
ui->statusBar->showMessage("Checking for Error Code file updates...");
87048719
}
87058720
}

0 commit comments

Comments
 (0)