onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 19:27:13 +01:00
Code Issues Releases Wiki Activity

update_check should properly handle html responses from captive portal proxies

Browse Source
This commit is contained in:
Vadim Kurland 2009-09-18 17:22:54 +00:00
parent e87fbb5adf
commit f3dc40113b
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 1471
#define BUILD_NUM 1473

14
src/gui/FWWindow.cpp
View File

@ -1740,9 +1740,21 @@ void FWWindow::updateTreeFont ()
void FWWindow::checkForUpgrade(const QString& server_response)
{
disconnect(current_version_http_getter, SIGNAL(done(const QString&)),
this, SLOT(checkForUpgrade(const QString&)));
/*
* getStatus() returns error status if server esponded with 302 or
* 301 redirect. Only "200" is considered success.
*/
if (current_version_http_getter->getStatus())
{
if (!server_response.trimmed().isEmpty())
/*
* server response may be some html or other data in case
* connection goes via proxy, esp. with captive portals. We
* should not interpret that as "new version is available"
*/
if (server_response.trimmed() == "update = 1")
{
QMessageBox::warning(
this,"Firewall Builder",

18
src/gui/PrefsDialog.cpp
View File

@ -404,18 +404,22 @@ void PrefsDialog::checkForUpgrade(const QString& server_response)
if (current_version_http_getter.getStatus())
{
if (server_response.trimmed().isEmpty())
{
QMessageBox::information(
this,"Firewall Builder",
tr("Your version of Firewall Builder is up to date."));
} else
/*
* server response may be some html or other data in case
* connection goes via proxy, esp. with captive portals. We
* should not interpret that as "new version is available"
*/
if (server_response.trimmed() == "update = 1")
{
QMessageBox::warning(
this,"Firewall Builder",
tr("A new version of Firewall Builder is available at"
" http://www.fwbuilder.org"));
} else
{
QMessageBox::information(
this,"Firewall Builder",
tr("Your version of Firewall Builder is up to date."));
}
} else
{