This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/x2goplugin-patch in repository x2goclient. discards da3ca16 src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. adds 9dc4db3 {x2goutils,non_modal_messagebox}.cpp: include the correct headers. adds b59e5d9 x2goutils.{h,cpp}: split up show_RichText_WarningMsgBox() into the aforementioned function and a new convert_to_rich_text() helper function. adds 27354ff non_modal_messagebox.{h,cpp}: add new Non_Modal_MessageBox::critical() overloaded functions to be able to use informative text and a (forceful, if requested) conversion to rich text. adds 63873a1 onmainwindow.cpp: prettify non-running sshd error message. adds c99b741 onmainwindow.cpp: prettify non-available host key error message. adds 5fc3301 onmainwindow.cpp: fix typos and augment sshd startup failure message. adds fdbe9e0 onmainwindow.cpp: also use usermode sshd on OS X, if no global daemon is running. adds 42f2045 onmainwindow.cpp: on OS X, specify sshd's PID file location in its server config. adds ef033df onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up. adds 2c0687a onmainwindow.cpp: adapt SSH host key warning message to new usermode sshd possibilities. adds 26c86b7 configdialog.cpp: make XQuartz detection algorithm QStringList-based and add MacPorts location. adds 3d4c38e onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797. new 9b302fe src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (da3ca16) \ N -- N -- N refs/heads/bugfix/x2goplugin-patch (9b302fe) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 22 +++++ src/configdialog.cpp | 66 ++++++++----- src/non_modal_messagebox.cpp | 28 +++++- src/non_modal_messagebox.h | 14 +++ src/onmainwindow.cpp | 212 +++++++++++++++++++++++++++++++++--------- src/onmainwindow.h | 2 +- src/x2goutils.cpp | 29 ++++-- src/x2goutils.h | 1 + 8 files changed, 293 insertions(+), 81 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2goplugin-patch in repository x2goclient. commit 9b302fe1e5816f9a741f8b823d4a6253dea37061 Author: Nicolas Husson <nicolas.husson@tactualities.com> Date: Tue Mar 10 06:03:28 2015 +0100 src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. v2: refactor patch, fix whitespace issues. (Mihai Moldovan) --- debian/changelog | 6 ++ src/onmainwindow.cpp | 149 +++++++++++++++++++++++++++++-------------- src/sshmasterconnection.cpp | 5 +- 3 files changed, 112 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6301aa0..2a150c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,12 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797. + [ Nicolas Husson ] + * New upstream release (4.0.4.0): + - src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy + configuration with x2goplugin. Fixes: #798. + + v2: refactor patch, fix whitespace issues. (Mihai Moldovan) + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 50db7b5..43a6378 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3300,50 +3300,53 @@ bool ONMainWindow::startSession ( const QString& sid ) currentKey=findSshKeyForServer(user, host, sshPort); } - useproxy=(st->setting()->value ( - sid+"/usesshproxy", - false - ).toBool() ); + if (!embedMode) { + useproxy = (st->setting ()->value (sid + "/usesshproxy", + false).toBool ()); - QString prtype= st->setting()->value ( - sid+"/sshproxytype", - "SSH" - ).toString() ; + QString prtype = (st->setting ()->value (sid + "/sshproxytype", + "SSH").toString ()); + if (prtype.toLower () == "http") { + proxyType = SshMasterConnection::PROXYHTTP; + } + else { + proxyType = SshMasterConnection::PROXYSSH; + } - if(prtype=="HTTP") - { - proxyType=SshMasterConnection::PROXYHTTP; - } - else - { - proxyType=SshMasterConnection::PROXYSSH; - } + proxylogin = (st->setting ()->value (sid + "/sshproxyuser", + QString ()).toString ()); - proxylogin=(st->setting()->value ( - sid+"/sshproxyuser", - QString() - ).toString() ); + proxyKey = (st->setting ()->value (sid + "/sshproxykeyfile", + QString ()).toString ()); + proxyKey = expandHome (proxyKey); - proxyKey=(st->setting()->value ( - sid+"/sshproxykeyfile", - QString() - ).toString() ); - proxyKey=expandHome(proxyKey); + proxyserver = (st->setting ()->value (sid + "/sshproxyhost", + QString ()).toString ()); - proxyserver=(st->setting()->value ( - sid+"/sshproxyhost", - QString() - ).toString() ); + proxyport = (st->setting ()->value (sid + "/sshproxyport", + 22).toInt ()); - proxyport=(st->setting()->value ( - sid+"/sshproxyport", - 22 - ).toInt() ); - if(proxyserver.indexOf(":")!=-1) - { - QStringList parts=proxyserver.split(":"); - proxyserver=parts[0]; - proxyport=parts[1].toInt(); + proxyAutologin = (st->setting ()->value (sid + "/sshproxyautologin", + false).toBool ()); + + proxyKrbLogin = (st->setting ()->value (sid + "/sshproxykrblogin", + false).toBool ()); + } + else { + useproxy = config.useproxy; + proxyType = config.proxyType; + proxylogin = config.proxylogin; + proxyKey = config.proxyKey; + proxyserver = config.proxyserver; + proxyport = config.proxyport; + proxyAutologin = config.proxyAutologin; + proxyKrbLogin = config.proxyKrbLogin; + } + + if (proxyserver.indexOf (":") != -1) { + QStringList parts = proxyserver.split (":"); + proxyserver = parts[0]; + proxyport = parts[1].toInt (); } bool proxySamePass=(st->setting()->value ( @@ -3354,15 +3357,6 @@ bool ONMainWindow::startSession ( const QString& sid ) sid+"/sshproxysameuser", false ).toBool() ); - proxyAutologin=(st->setting()->value ( - sid+"/sshproxyautologin", - false - ).toBool() ); - - proxyKrbLogin=(st->setting()->value ( - sid+"/sshproxykrblogin", - false - ).toBool() ); if(proxyKey.length()<=0 && proxyType==SshMasterConnection::PROXYSSH) { @@ -10747,6 +10741,67 @@ void ONMainWindow::processCfgLine ( QString line ) config.connectionts=lst[1]; return; } + if (lst[0] == "usesshproxy") + { + config.useproxy = true; + if (lst[1].toLower () == "true") { + config.useproxy = true; + } + else { + config.useproxy = false; + } + return; + } + if (lst[0] == "sshproxytype") + { + if (lst[1].toLower () == "http") { + config.proxyType = SshMasterConnection::PROXYHTTP; + } + else { + config.proxyType = SshMasterConnection::PROXYSSH; + } + return; + } + if (lst[0] == "sshproxyuser") + { + config.proxylogin = lst[1]; + return; + } + if (lst[0] == "sshproxyhost") + { + config.proxyserver = lst[1]; + return; + } + if (lst[0] == "sshproxyport") + { + config.proxyport = lst[1].toInt (); + return; + } + if (lst[0] == "sshproxyautologin") + { + if (lst[1].toLower () == "true") { + config.proxyAutologin = true; + } + else { + config.proxyAutologin = false; + } + return; + } + if (lst[0] == "sshproxykrblogin") + { + if (lst[1].toLower () == "true") { + config.proxyKrbLogin = true; + } + else { + config.proxyKrbLogin = false; + } + return; + } + if (lst[0] == "sshproxykeyfile") + { + config.proxyKey = lst[1]; + return; + } } void ONMainWindow::slotChangeKbdLayout(const QString& layout) diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index e9a7008..1e11c62 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -165,6 +165,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por breakLoop=false; kerberosDelegation=false; + x2goDebug << "SshMasterConnection, host " << host << "port " << port << "user " << user + << "useproxy " << useproxy << "proxyserver " << proxyserver + << "proxyport " << proxyport; this->host=host; this->port=port; this->user=user; @@ -443,7 +446,7 @@ void SshMasterConnection::run() #endif if(useproxy && proxytype==PROXYSSH) { - + x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << proxyport << "proxylogin: " << proxylogin; sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers, proxylogin, proxypassword, proxykey, proxyautologin, proxyKrbLogin, false); connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org