From unknown Tue May 19 06:17:40 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#926: The X2Go client does not like some special character in password like =?UTF-8?Q?=C2=A3?= Reply-To: sedutom@sduval.com, 926@bugs.x2go.org Resent-From: "Sebastien" Resent-To: x2go-dev@lists.x2go.org Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Fri, 21 Aug 2015 12:55:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: report 926 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: Received: via spool by submit@bugs.x2go.org id=B.14401616434539 (code B); Fri, 21 Aug 2015 12:55:02 +0000 Received: (at submit) by bugs.x2go.org; 21 Aug 2015 12:54:03 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_00,FORM_FRAUD, T_FILL_THIS_FORM_FRAUD_PHISH,T_FILL_THIS_FORM_SHORT,URIBL_BLOCKED,XPRIO autolearn=no version=3.3.2 X-Greylist: delayed 8629 seconds by postgrey-1.34 at ymir.das-netzwerkteam.de; Fri, 21 Aug 2015 14:54:01 CEST Received: from hostingsmtp.register.it (hostingsmtp56.register.it [81.88.56.16]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 9AB1E5DA86 for ; Fri, 21 Aug 2015 14:54:01 +0200 (CEST) Received: from massenet07.register.it ([81.88.51.137]) by paganini34 with id 7Qu01r01A2xcgyx01Qu0pJ; Fri, 21 Aug 2015 14:54:01 +0200 Received: from popuser by massenet07.register.it with local (Exim 4.69) (envelope-from ) id 1ZSlpY-0003gG-UL for submit@bugs.x2go.org; Fri, 21 Aug 2015 14:54:00 +0200 Received: from 195.99.165.130 (SquirrelMail authenticated user sedutom@sduval.com) by webmail-fr.webapps.net with HTTP; Fri, 21 Aug 2015 14:54:00 +0200 (CEST) Message-ID: <475d201b0e4d7905cd375d5f54256c3a.squirrel@webmail-fr.webapps.net> Date: Fri, 21 Aug 2015 14:54:00 +0200 (CEST) From: "Sebastien" To: submit@bugs.x2go.org User-Agent: SquirrelMail/1.4.17 MIME-Version: 1.0 Content-Type: multipart/mixed;boundary="----=_20150821145400_74304" X-Priority: 3 (Normal) Importance: Normal X-RID: bSt06GQjcw==|bStjJyglduhkcw==|MF3gJyz54Cejoycso+A=|TElBTUJFVw== ------=_20150821145400_74304 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Package: x2goclient Version: 4.0.5.0 When I try to connect to a remore session where the password contains some rare special characters (like £). The server reject the password (even if it is the correct one). I've looked at the code and it seems that the problem is the usage of QString::toAsci. I attach a patch where I convert all of them to QString::toUtf8, it seems that it solves the problem. I've managed to build the client with Qt 5.4.2 on Centos 7.1 so the patch also contains some changes that get rid of the obsolete Qt methods and replace them with the new advised ones. This patch is against a snapshot of the master branch of the 12th of August 2015. Best regards, Sebastien ------=_20150821145400_74304 Content-Type: text/x-patch; name="patch.diff" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="patch.diff" diff --git a/x2goclient-HEAD-9dea920/src/SVGFrame.cpp b/x2goclient-HEAD-9dea920-rev1/src/SVGFrame.cpp index 0f78163..796e669 100644 --- a/x2goclient-HEAD-9dea920/src/SVGFrame.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/SVGFrame.cpp @@ -26,7 +26,7 @@ SVGFrame::SVGFrame ( QString fname,bool st,QWidget* parent, - Qt::WFlags f ) :QFrame ( parent,f ) + Qt::WindowFlags f ) :QFrame ( parent,f ) { empty=false; #ifdef Q_OS_WIN @@ -66,7 +66,7 @@ SVGFrame::SVGFrame ( QString fname,bool st,QWidget* parent, } SVGFrame::SVGFrame ( QWidget* parent, - Qt::WFlags f ) :QFrame ( parent,f ) + Qt::WindowFlags f ) :QFrame ( parent,f ) { repaint=false; empty=true; diff --git a/x2goclient-HEAD-9dea920/src/SVGFrame.h b/x2goclient-HEAD-9dea920-rev1/src/SVGFrame.h index 93bac7e..38f3b87 100644 --- a/x2goclient-HEAD-9dea920/src/SVGFrame.h +++ b/x2goclient-HEAD-9dea920-rev1/src/SVGFrame.h @@ -28,8 +28,8 @@ class SVGFrame: public QFrame Q_OBJECT public: - SVGFrame ( QString fname, bool st, QWidget* parent=0, Qt::WFlags f=0 ); - SVGFrame ( QWidget* parent=0, Qt::WFlags f=0 ); + SVGFrame ( QString fname, bool st, QWidget* parent=0, Qt::WindowFlags f=0 ); + SVGFrame ( QWidget* parent=0, Qt::WindowFlags f=0 ); void setRepaintable ( bool val ) { repaint=val; diff --git a/x2goclient-HEAD-9dea920/src/configdialog.cpp b/x2goclient-HEAD-9dea920-rev1/src/configdialog.cpp index c0b2285..1910e41 100644 --- a/x2goclient-HEAD-9dea920/src/configdialog.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/configdialog.cpp @@ -46,7 +46,7 @@ #endif -ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WFlags f ) +ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) : QDialog ( parent,f ) { diff --git a/x2goclient-HEAD-9dea920/src/configdialog.h b/x2goclient-HEAD-9dea920-rev1/src/configdialog.h index 3e1d9a4..ff2f1d6 100644 --- a/x2goclient-HEAD-9dea920/src/configdialog.h +++ b/x2goclient-HEAD-9dea920-rev1/src/configdialog.h @@ -44,7 +44,7 @@ class ConfigDialog : public QDialog Q_OBJECT public: ConfigDialog ( QWidget * parent, - Qt::WFlags f = 0 ); + Qt::WindowFlags f = 0 ); ~ConfigDialog(); #ifdef Q_OS_DARWIN static QString findXDarwin ( QString& version, diff --git a/x2goclient-HEAD-9dea920/src/cupsprint.cpp b/x2goclient-HEAD-9dea920-rev1/src/cupsprint.cpp index 5a14b11..e4ec34e 100644 --- a/x2goclient-HEAD-9dea920/src/cupsprint.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/cupsprint.cpp @@ -53,7 +53,7 @@ QString CUPSPrint::getDefaultUserPrinter() "CUPS/defaultprinter","" ). toString(); if ( defPrint.length() >0 ) { - cups_dest_t *dest = cupsGetDest ( defPrint.toAscii(), + cups_dest_t *dest = cupsGetDest ( defPrint.toUtf8(), 0l, num_dests, dests ); if ( dest ) return defPrint; @@ -77,7 +77,7 @@ bool CUPSPrint::getPrinterInfo ( const QString& printerName, QString& info, QString& model, printState& state, QString& stateReason ) { - cups_dest_t *dest = cupsGetDest ( printerName.toAscii(), 0l, + cups_dest_t *dest = cupsGetDest ( printerName.toUtf8(), 0l, num_dests, dests ); if ( !dest ) @@ -114,15 +114,15 @@ bool CUPSPrint::getPrinterInfo ( const QString& printerName, QString& info, bool CUPSPrint::setCurrentPrinter ( QString prn ) { currentPrinter=prn; - QString fl=cupsGetPPD ( prn.toAscii() ); + QString fl=cupsGetPPD ( prn.toUtf8() ); if ( fl.length() <=0 ) return false; if ( ppd ) ppdClose ( ppd ); ppd=0l; - ppd=ppdOpenFile ( fl.toAscii() ); - unlink ( fl.toAscii() ); + ppd=ppdOpenFile ( fl.toUtf8() ); + unlink ( fl.toUtf8() ); if ( ppd==0l ) return false; ppdMarkDefaults ( ppd ); @@ -141,10 +141,10 @@ bool CUPSPrint::getOptionValue ( const QString& option, { if ( !ppd ) return false; - ppd_choice_t* choice=ppdFindMarkedChoice ( ppd,option.toAscii() ); + ppd_choice_t* choice=ppdFindMarkedChoice ( ppd,option.toUtf8() ); if ( !choice ) { - ppd_option_t* opt=ppdFindOption ( ppd,option.toAscii() ); + ppd_option_t* opt=ppdFindOption ( ppd,option.toUtf8() ); if ( !opt ) return false; choice=ppdFindChoice ( opt,opt->defchoice ); @@ -168,7 +168,7 @@ int CUPSPrint::getOptionValues ( const QString& option, int cur_val=-1; values.clear(); descriptions.clear(); - ppd_option_t* opt=ppdFindOption ( ppd,option.toAscii() ); + ppd_option_t* opt=ppdFindOption ( ppd,option.toUtf8() ); if ( !opt ) return -1; for ( int k=0;knum_choices;++k ) @@ -241,7 +241,7 @@ bool CUPSPrint::setValue ( const QString& option, const QString& value, QString valueBefore, textBefore; if ( !getOptionValue ( option,valueBefore,textBefore ) ) return false; - ppdMarkOption ( ppd,option.toAscii(),value.toAscii() ); + ppdMarkOption ( ppd,option.toUtf8(),value.toUtf8() ); if ( conflictsBefore==ppdConflicts ( ppd ) ) { @@ -281,7 +281,7 @@ bool CUPSPrint::setValue ( const QString& option, const QString& value, //set previous value - ppdMarkOption ( ppd,option.toAscii(),valueBefore.toAscii() ); + ppdMarkOption ( ppd,option.toUtf8(),valueBefore.toUtf8() ); return false; } @@ -290,7 +290,7 @@ bool CUPSPrint::getOptionText ( const QString& option, QString& text ) { if ( !ppd ) return false; - ppd_option_t* opt=ppdFindOption ( ppd,option .toAscii() ); + ppd_option_t* opt=ppdFindOption ( ppd,option .toUtf8() ); if ( !opt ) return false; text=QString::fromLocal8Bit ( opt->text ); @@ -355,7 +355,7 @@ void CUPSPrint::loadUserOptions() for ( int i=0;i #include "sessionexplorer.h" -ExportDialog::ExportDialog ( QString sid,QWidget * par, Qt::WFlags f ) +ExportDialog::ExportDialog ( QString sid,QWidget * par, Qt::WindowFlags f ) : QDialog ( par,f ) { sessionId=sid; diff --git a/x2goclient-HEAD-9dea920/src/exportdialog.h b/x2goclient-HEAD-9dea920-rev1/src/exportdialog.h index f645bfd..bf9c726 100644 --- a/x2goclient-HEAD-9dea920/src/exportdialog.h +++ b/x2goclient-HEAD-9dea920-rev1/src/exportdialog.h @@ -33,7 +33,7 @@ class ExportDialog : public QDialog { Q_OBJECT public: - ExportDialog(QString sid,QWidget * par, Qt::WFlags f = 0); + ExportDialog(QString sid,QWidget * par, Qt::WindowFlags f = 0); ~ExportDialog(); QString getExport(){return directory;} diff --git a/x2goclient-HEAD-9dea920/src/httpbrokerclient.cpp b/x2goclient-HEAD-9dea920-rev1/src/httpbrokerclient.cpp index 4f40191..af5091b 100644 --- a/x2goclient-HEAD-9dea920/src/httpbrokerclient.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/httpbrokerclient.cpp @@ -596,25 +596,25 @@ void HttpBrokerClient::slotSslErrors ( QNetworkReply* netReply, const QList -IMGFrame::IMGFrame(QImage* ,QWidget* parent, Qt::WFlags f) :QFrame(parent,f) +IMGFrame::IMGFrame(QImage* ,QWidget* parent, Qt::WindowFlags f) :QFrame(parent,f) { //setBg(img); } diff --git a/x2goclient-HEAD-9dea920/src/imgframe.h b/x2goclient-HEAD-9dea920-rev1/src/imgframe.h index 7ac700e..5966b8f 100644 --- a/x2goclient-HEAD-9dea920/src/imgframe.h +++ b/x2goclient-HEAD-9dea920-rev1/src/imgframe.h @@ -31,7 +31,7 @@ class IMGFrame : public QFrame { Q_OBJECT public: - IMGFrame(QImage* img,QWidget* parent=0, Qt::WFlags f=0); + IMGFrame(QImage* img,QWidget* parent=0, Qt::WindowFlags f=0); ~IMGFrame(); void setBg(QImage* img); virtual void resizeEvent(QResizeEvent* event); diff --git a/x2goclient-HEAD-9dea920/src/ongetpass.cpp b/x2goclient-HEAD-9dea920-rev1/src/ongetpass.cpp index cb1912e..d2b89ac 100644 --- a/x2goclient-HEAD-9dea920/src/ongetpass.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/ongetpass.cpp @@ -35,7 +35,6 @@ #include #endif -#include #include #include #include @@ -50,9 +49,6 @@ int x2goMain ( int argc, char *argv[] ) QApplication app ( argc,argv ); #ifndef Q_WS_HILDON -#ifdef Q_OS_LINUX - app.setStyle ( new QPlastiqueStyle() ); -#endif #endif QStringList args; if ( argc > 1 ) diff --git a/x2goclient-HEAD-9dea920/src/onmainwindow.cpp b/x2goclient-HEAD-9dea920-rev1/src/onmainwindow.cpp index 35faced..1435dba 100644 --- a/x2goclient-HEAD-9dea920/src/onmainwindow.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/onmainwindow.cpp @@ -493,7 +493,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect( xineramaTimer, SIGNAL(timeout()), this, SLOT(slotConfigXinerama())); x2goInfof(3)<load (load_filename)) { /* Some translation successfully loaded. That's good enough. */ - x2goInfof (4) << tr ("Translator: ") + load_filename.toAscii () + tr (" found."); + x2goInfof (4) << tr ("Translator: ") + load_filename.toUtf8() + tr (" found."); translator_found = true; *translator = tmp_translator; break; } else { - x2goWarningf (1) << tr ("Non-fatal: can't load translator: ") + load_filename.toAscii (); + x2goWarningf (1) << tr ("Non-fatal: can't load translator: ") + load_filename.toUtf8(); x2goWarningf (1) << tr ("Trying to load language with lower preference, if existent."); } } @@ -2762,7 +2762,7 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po #ifndef Q_OS_WIN QStringList args=sshEnv[i].split ( "=" ); x2goDebug<<"Setting ENV " + args[0] + tr(" to ") + args[1]; - setenv ( args[0].toAscii(),args[1].toAscii(),1 ); + setenv ( args[0].toUtf8(),args[1].toUtf8(),1 ); #else x2goDebug<<"Set ENV: "<")==-1) { - pic+=QByteArray::fromBase64(line.toAscii()); + pic+=QByteArray::fromBase64(line.toUtf8()); line=lines[++i]; - if (QString(QByteArray::fromBase64(line.toAscii())).indexOf("",Qt::CaseInsensitive)!=-1) + if (QString(QByteArray::fromBase64(line.toUtf8())).indexOf("",Qt::CaseInsensitive)!=-1) { isSvg=true; } @@ -7872,7 +7872,7 @@ void ONMainWindow::slotCopyKey ( bool result, QString output, int pid) } else { - QString printout = tr( "Connection failed: ") + output.toAscii(); + QString printout = tr( "Connection failed: ") + output.toUtf8(); if ( output.indexOf ( "publickey,password" ) !=-1 ) x2goErrorf(11)<< tr( "Connection failed: ") + output + tr(" - Wrong password."); diff --git a/x2goclient-HEAD-9dea920/src/onmainwindow_privat.h b/x2goclient-HEAD-9dea920-rev1/src/onmainwindow_privat.h index c5f5840..eca0cd5 100644 --- a/x2goclient-HEAD-9dea920/src/onmainwindow_privat.h +++ b/x2goclient-HEAD-9dea920-rev1/src/onmainwindow_privat.h @@ -67,10 +67,8 @@ #include #include #include -#include #include #include -#include #include "imgframe.h" #include #include "clicklineedit.h" diff --git a/x2goclient-HEAD-9dea920/src/sessionbutton.cpp b/x2goclient-HEAD-9dea920-rev1/src/sessionbutton.cpp index 2d51a23..a75efa7 100644 --- a/x2goclient-HEAD-9dea920/src/sessionbutton.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/sessionbutton.cpp @@ -316,13 +316,13 @@ void SessionButton::redraw() sessIcon = expandHome(sessIcon); QPixmap* pix; - x2goDebug << "Creating QPixmap with session icon: " << sessIcon.toAscii () << "."; + x2goDebug << "Creating QPixmap with session icon: " << sessIcon.toUtf8() << "."; if (!par->brokerMode || sessIcon == ":/img/icons/128x128/x2gosession.png") pix=new QPixmap( sessIcon ); else { pix=new QPixmap; - pix->loadFromData(QByteArray::fromBase64(sessIcon.toAscii())); + pix->loadFromData(QByteArray::fromBase64(sessIcon.toUtf8())); } if ( !par->retMiniMode() ) icon->setPixmap ( pix->scaled ( 64,64,Qt::IgnoreAspectRatio, diff --git a/x2goclient-HEAD-9dea920/src/sessionexplorer.cpp b/x2goclient-HEAD-9dea920-rev1/src/sessionexplorer.cpp index 02c5f7e..92ce661 100644 --- a/x2goclient-HEAD-9dea920/src/sessionexplorer.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/sessionexplorer.cpp @@ -189,8 +189,8 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt ) #ifndef Q_OS_WIN QFile file ( - QDesktopServices::storageLocation ( - QDesktopServices::DesktopLocation ) +"/"+name+".desktop" ); + QStandardPaths::writableLocation ( + QStandardPaths::DesktopLocation ) +"/"+name+".desktop" ); if ( !file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) return; diff --git a/x2goclient-HEAD-9dea920/src/sessionmanagedialog.cpp b/x2goclient-HEAD-9dea920-rev1/src/sessionmanagedialog.cpp index 5ec0331..aa2255b 100644 --- a/x2goclient-HEAD-9dea920/src/sessionmanagedialog.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/sessionmanagedialog.cpp @@ -35,7 +35,7 @@ #define SESSIONIDROLE Qt::UserRole+2 SessionManageDialog::SessionManageDialog ( QWidget * parent, - bool onlyCreateIcon, Qt::WFlags f ) + bool onlyCreateIcon, Qt::WindowFlags f ) : QDialog ( parent, f ) { QVBoxLayout* ml=new QVBoxLayout ( this ); diff --git a/x2goclient-HEAD-9dea920/src/sessionmanagedialog.h b/x2goclient-HEAD-9dea920-rev1/src/sessionmanagedialog.h index 84f2992..6052c9f 100644 --- a/x2goclient-HEAD-9dea920/src/sessionmanagedialog.h +++ b/x2goclient-HEAD-9dea920-rev1/src/sessionmanagedialog.h @@ -35,7 +35,7 @@ class SessionManageDialog : public QDialog public: SessionManageDialog ( QWidget * parent, bool onlyCreateIcon=false, - Qt::WFlags f=0 ); + Qt::WindowFlags f=0 ); ~SessionManageDialog(); void loadSessions(); private: diff --git a/x2goclient-HEAD-9dea920/src/sshmasterconnection.cpp b/x2goclient-HEAD-9dea920-rev1/src/sshmasterconnection.cpp index 78d4564..e1ea95b 100644 --- a/x2goclient-HEAD-9dea920/src/sshmasterconnection.cpp +++ b/x2goclient-HEAD-9dea920-rev1/src/sshmasterconnection.cpp @@ -327,7 +327,7 @@ void SshMasterConnection::checkReverseTunnelConnections() x2goDebug<<"Connecting to "<