x2go-dev December 2018

x2go-dev@lists.x2go.org

10 participants
97 discussions

Bug#125: Bug with Alt Gr keyboard
by IBITEK : Support IT 08 Nov '19

08 Nov '19

Package: <x2goclient> Version: <4.0.0.3> I have a problem with "Alt Gr" tab doesn't work. I can't do an backslash "\" for enter my username on a domain mydomain\user it's impossible Do you have any solution ? A topic is open of your X2GO-Community but no response on this topic : http://x2go-community.org/main-menu/forum/?tx_mmforum_pi1%5Baction%5D=list _post <http://x2go-community.org/main-menu/forum/?tx_mmforum_pi1%5Baction%5D=lis t_post&tx_mmforum_pi1%5Btid%5D=24&tx_mmforum_pi1%5Bfid%5D=13&tx_mmforum_pi 1%5Bpid%5D=page#pid59> &tx_mmforum_pi1%5Btid%5D=24&tx_mmforum_pi1%5Bfid%5D=13&tx_mmforum_pi1%5Bpi d%5D=page#pid59 -- Cordialement, IBITEK-GROUP SUPPORT ------------------------------------------------------------ Tel : +33 491 058 350 Fax : +33 491 509 910 Mail : <mailto:support@ibitek-group.com> support(a)ibitek-group.com Web : <http://www.ibitek-group.com> http://www.ibitek-group.com ------------------------------------------------------------ SOLUTIONS FOR INDUSTRY Electricity & Automation + Business Intelligence ------------------------------------------------------------

4 3

Bug#1325: GLX error solved with workaround
by Thierry Kauffmann 23 Jul '19

23 Jul '19

Hi, Following this workaround : https://wiki.x2go.org/doku.php/wiki:development:glx-xlib-workaround did the trick ! The workaround also works for ubuntu 18.04. I just replaced "aptitude" by "apt". I had to chown -R <me>:<me> mesa-18.0.5/ to be able to compile. Now modifying nextcloud client launch sequence ! Cheers, Thierry

6 29

Bug#340: x2go fails under Ubuntu 13.10
by Dick Kniep 18 Jun '19

18 Jun '19

package: x2goclient Although filed against x2goclient, the same error occurs with pyhoca-cli The session fails to start and the logs contains the following messages: NXPROXY - Version 3.5.0 Copyright (C) 2001, 2011 NoMachine. See http://www.nomachine.com/ for more information. Info: Proxy running in client mode with pid '6253'. Session: Starting session at 'Thu Nov 14 17:05:08 2013'. Loop: PANIC! Can't determine the location of the X display socket. Error: Can't determine the location of the X display socket. Loop: PANIC! Error 2 'No such file or directory' checking '/tmp/.X11-unix'. Error: Error 2 'No such file or directory' checking '/tmp/.X11-unix'. Session: Session terminated at 'Thu Nov 14 17:05:08 2013'. Met vriendelijke groet, Dick Kniep Lindix BV tel. 036-5215580 mob. 06-50991858

3 2

Bug#773: DirectRDP: X2Go Client reveals user password in process list if xfreerdp is used
by Mike Gabriel 26 Mar '19

26 Mar '19

Package: x2goclient Severity: grave When a users uses X2Go Client for directly accessing an RDP Server, then one can use the DirectRDP feature. The DirectRDP features allows wrapping around the rdesktop command or the xfreerdp command. With both wrapper modes, the password is given to the RDP client application on the command line. With rdesktop, the command line ($@) gets rewritten for the process list and the password is replaced by XXXXXXXX. With xfreerdp, the command line stays as is and reveals the RDP user's password on the process list of the machine that X2Go Client runs on. The FreeRDP people have added a command line option --from-stdin to xfreerdp 1.0.x for this purpose, that may be an option using in X2Go Client. However, I am not sure, if this option survived in xfreerdp 1.1.x or later (it is not on the xfreerdp man page for 1.1.0~git<sometime-in-2014> as shipped with Debian jessie. Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#58: x2goplugin: after session startup whole local desktop unusable
by Mike Gabriel 26 Mar '19

26 Mar '19

Package: x2goplugin Severity: grave Version: 3.99.3.0 Hi Alex, more tests with x2goplugin + x2goplugin-provider as release with x2goclient src:package 3.99.3.0. Try this: o install x2goplugin-provider and x2goserver locally on the same machine o visit http://localhost/x2goplugin.html o launch the pre-configured session o ... till here, everything works fine now... On my machine: after the session has come up (actually already while it is comming up) my whole desktop shell (awesome) refuse to accept almost any import from keyboard or mouse. I can neither click any of the x2goplugin controls nor can I click around in the started up X2Go session. The X2Go session is embedded in the x2goplugin frame, just in case this information is relevant. Ggreets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

3 2

Bug#1126: Info received ( Bug#1126: Bug#1126: Bug#1126: x2go session disconnects causing an issue with a program or caused by an issue with a program)
by Ulrich Langenbach 21 Mar '19

21 Mar '19

Hi, some time passed, but finally I found the time to do a testrun on a dedicated setup based on upstream arctica libraries my colleague compiled to deb packages and installed on a VM. The currently tested version is a bit outdated from branch 3.6.x: ---- snip ---- nx-libs$ git log -1 commit 9acd13e50c3bde9105f6143922028f0de0d4ae50 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 19 15:03:09 2016 +0100 release 3.5.99.3 nx-libs$ git remote -v origin git://github.com/ArcticaProject/nx-libs.git (fetch) origin git://github.com/ArcticaProject/nx-libs.git (push) ---- snip ---- The behavior is the same as before, the session dies at some time during some interaction with the tools window. I tried 64k-png and 15m-jpeg-9 modes with the same outcome, see attached logs for details. Ulrich -- Ulrich Langenbach ulrich.langenbach(a)missinglinkelectronics.com Skype: ulangenbach Missing Link Electronics http://www.missinglinkelectronics.com Skype: missing.link.electronics Office DE: +49 (731) 141 149-0 Office US: +1 (408) 475-1490 Am Mittwoch, 4. Januar 2017, 18:05:02 CET schrieb X2Go Bug Tracking System: > Thank you for the additional information you have supplied regarding > this Bug report. > > This is an automatically generated reply to let you know your message > has been received. > > Your message is being forwarded to the package maintainers and other > interested parties for their attention; they will reply in due course. > > Your message has been sent to the package maintainer(s): > X2Go Developers <x2go-dev(a)lists.x2go.org> > > If you wish to submit further information on this problem, please > send it to 1126(a)bugs.x2go.org. > > Please do not send mail to owner(a)bugs.x2go.org unless you wish > to report a problem with the Bug-tracking system.

2 3

x2go on Windows 10 - crashes on connect - problem libssh version
by Gerhard Wiesinger 15 Jan '19

15 Jan '19

Hello, The following versions crash on connect from Windows 10 to a Fedora 28 server: x2goclient-4.1.0.0-2017.03.11-setup.exe x2goclient-4.1.1.1-2018.03.01-setup.exe x2goclient-4.1.2.0-2018.06.22-setup.exe x2goclient-4.1.2.2-2018.11.30-6596556-setup.exe The last good known version is: x2goclient-4.0.5.2-2016.09.20-setup.exe UAC is disabled on this computer When I copy libssh.dll from x2goclient-4.0.5.2-2016.09.20 to the newer version, everything works well. Solution and summary: x2goclient-4.1.2.2-2018.11.30-6596556-setup.exe with libssh.dll from x2goclient-4.0.5.2-2016.09.20-setup.exe is OK!!!!!!!! OK: libssh 0.7.0 NOK: libssh 0.7.4 Can you please update libssh to https://www.libssh.org/files/0.8/libssh-0.8.6.tar.xz (and include Pageant support, fixes also some security leaks) OpenSSL upgrade to 1.1.1a would also be fine (currently 1.0.2n is installed, one year old). If I should test something let me know. Thank you. Ciao, Gerhard

1 1

Bug#1349: x2goclient not connecting after upgrade
by Javier Almasoft 03 Jan '19

03 Jan '19

Package: x2goclient Version: 4.1.2.1-3 x2goclient fails to connect to a working xgoserver, no matter the server version. The client machine is Archlinux 64, upgraded to the latest version (as of yesterday). I have downloaded and compiled from git the x2goclient sourcecode, but this compiled version don't work either. This is the log generated by x2goclient: --------------------------------------------------------------------------------------------- Copyright (c) 2014-2016 Mihai Moldovan <ionic(a)ionic.de> Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) NXCOMP, NX protocol compression and NX extensions to this software are copyright of the aforementioned persons and companies. Redistribution and use of the present software is allowed according to terms specified in the file LICENSE.nxcomp which comes in the source distribution. All rights reserved. NOTE: This software has received contributions from various other contributors, only the core maintainers and supporters are listed as copyright holders. Please contact us, if you feel you should be listed as copyright holder, as well. NX protocol compression is derived from DXPC project. Copyright (c) 1995,1996 Brian Pane Copyright (c) 1996,1997 Zachary Vonler and Brian Pane Copyright (c) 1999 Kevin Vigor and Brian Pane Copyright (c) 2000,2003 Gian Filippo Pinzari and Brian Pane All rights reserved. See https://github.com/ArcticaProject/nx-libs for more information. Info: Proxy running in server mode with pid '14626'. Session: Starting session at 'Fri Nov 23 13:26:45 2018'. Info: Using errors file '/home/xxxxx/.x2go/S-xxxxxxx-50-1542975996_stDLXDE_dp24/sessions'. Info: Using stats file '/home/xxxxx/.x2go/S-50/stats'. Loop: WARNING! Overriding auxiliary X11 port with new value '1'. Warning: Overriding auxiliary X11 port with new value '1'. Info: Using abstract X11 socket in kernel namespace for accessing DISPLAY=:0. Info: Connecting to remote host 'localhost:31001'. Info: Connected to remote proxy on FD#5. Loop: PANIC! Parse error in remote options string 'SSH-2.0-OpenSSH_6.7p1 '. Error: Parse error in remote options string 'SSH-2.0-OpenSSH_6.7p1 '. Loop: PANIC! Failure negotiating the session in stage '7'. Error: Failure negotiating the session in stage '7'. Loop: PANIC! Wrong version or invalid session authentication cookie. Error: Wrong version or invalid session authentication cookie. Session: Terminating session at 'Fri Nov 23 13:26:45 2018'. Versions of the relevant packages: nx3-all 3.5.0-4 nxproxy 3.5.99.16-2 x2goclient 4.1.2.1-3 libssh 0.8.5-1 libssh2 1.8.0-3 openssh 7.9p1-1 qt4 4.8.7-26 I can ssh the remote machines without problem, and pyhoca-cli also works correctly. Greetings, Javier Martínez

2 1

Re: [X2Go-Dev] [X2Go-Commits] [x2goclient] 01/01: Client now sends "login" parameter to the broker when executing task "selectsession". Before client just sent a username on the broker and it was imposiible to find out user name on X2Go server, which is not always the same as broker username. This won't break a compatibility with previous broker as they just will ignore this parameter.
by Mike Gabriel 21 Dec '18

21 Dec '18

Hi Alex, please explain the reasoning behind this API change in the SSH broker call. This commit currently breaks SSH brokerage in X2Go Session Broker and I would like to fix it. So, what do you intend with the additional --login option? How is the broker supposed to react? Mike On Mi 05 Sep 2018 14:25:44 CEST, git-admin wrote: > This is an automated email from the git hooks/post-receive script. > > x2go pushed a commit to branch master > in repository x2goclient. > > commit e7e74df029a1bd7d86a03c7f72f5b555eb6c5b0e > Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> > Date: Wed Sep 5 14:25:33 2018 +0200 > > Client now sends "login" parameter to the broker when executing > task "selectsession". Before client just sent a username on the > broker and it was imposiible to find out user name on X2Go server, > which is not always the same as broker username. This won't break a > compatibility with previous broker as they just will ignore this > parameter. > --- > debian/changelog | 5 +++++ > src/httpbrokerclient.cpp | 23 +++++++++++++++-------- > src/httpbrokerclient.h | 2 +- > src/onmainwindow.cpp | 2 +- > 4 files changed, 22 insertions(+), 10 deletions(-) > > diff --git a/debian/changelog b/debian/changelog > index dc01147..0a43c2d 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -17,6 +17,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium > - Broker can send to client command to suspend or terminate the > session as an > answer to the client event message. For this broker should > send to client > SUSPEND ID or TERMINATE ID. > + - Client now sends "login" parameter to the broker when executing task > + "selectsession". Before client just sent a username on the > broker and it was > + imposiible to find out user name on X2Go server, which is not > always the > + same as broker username. This won't break a compatibility > with previous > + broker as they just will ignore this parameter. > > [ Mihai Moldovan ] > * New upstream version (4.1.2.2): > diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp > index 6110866..02a69c9 100644 > --- a/src/httpbrokerclient.cpp > +++ b/src/httpbrokerclient.cpp > @@ -313,9 +313,9 @@ void HttpBrokerClient::getUserSessions() > } > } > > -void HttpBrokerClient::selectUserSession(const QString& session) > +void HttpBrokerClient::selectUserSession(const QString& session, > const QString& loginName) > { > - x2goDebug<<"Called selectUserSession for session "<<session<<"."; > + x2goDebug<<"Called selectUserSession for session "<<session<<", > "<<"loginName "<<loginName; > QString brokerUser=config->brokerUser; > if(mainWindow->getUsePGPCard()) > brokerUser=mainWindow->getCardLogin(); > @@ -329,6 +329,10 @@ void HttpBrokerClient::selectUserSession(const > QString& session) > > "user="<<QUrl::toPercentEncoding(brokerUser)<<"&"<< > > "password="<<QUrl::toPercentEncoding(config->brokerPass)<<"&"<< > "authid="<<nextAuthId; > + if(loginName.length()>0) > + { > + QTextStream ( &req ) > <<"&login="<<QUrl::toPercentEncoding(loginName); > + } > x2goDebug << "Sending request: "<< req.toUtf8(); > QNetworkRequest request(QUrl(config->brokerurl)); > request.setHeader(QNetworkRequest::ContentTypeHeader, > "application/x-www-form-urlencoded"); > @@ -337,13 +341,16 @@ void HttpBrokerClient::selectUserSession(const > QString& session) > } > else > { > - if (nextAuthId.length() > 0) { > - sshConnection->executeCommand ( config->sshBrokerBin+" > --user "+ brokerUser +" --authid "+nextAuthId+ " --task > selectsession --sid \""+session+"\"", > - this,SLOT ( > slotSelectSession(bool,QString,int))); > - } else { > - sshConnection->executeCommand ( config->sshBrokerBin+" > --user "+ brokerUser +" --task selectsession --sid \""+session+"\"", > - this,SLOT ( > slotSelectSession(bool,QString,int))); > + QString sshCmd=config->sshBrokerBin+" --user "+ brokerUser > + " --task selectsession --sid \""+session+"\""; > + if(nextAuthId.length() > 0) > + { > + sshCmd+=" --authid "+nextAuthId; > + } > + if(loginName.length() > 0) > + { > + sshCmd+=" --login " + loginName; > } > + sshConnection->executeCommand (sshCmd, this,SLOT ( > slotSelectSession(bool,QString,int))); > } > > } > diff --git a/src/httpbrokerclient.h b/src/httpbrokerclient.h > index 24f52f3..73ae2ef 100644 > --- a/src/httpbrokerclient.h > +++ b/src/httpbrokerclient.h > @@ -41,7 +41,7 @@ class HttpBrokerClient: public QObject > public: > HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ); > ~HttpBrokerClient(); > - void selectUserSession(const QString& session ); > + void selectUserSession(const QString& session, const QString& > loginName); > void changePassword(QString newPass); > void testConnection(); > void closeSSHInteractionDialog(); > diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp > index 8aa5078..52e765c 100644 > --- a/src/onmainwindow.cpp > +++ b/src/onmainwindow.cpp > @@ -3325,7 +3325,7 @@ void ONMainWindow::slotSessEnter() > return; > } > #endif > - broker->selectUserSession(sessionExplorer->getLastSession()->id()); > + > broker->selectUserSession(sessionExplorer->getLastSession()->id(),login->text()); > config.session=sessionExplorer->getLastSession()->id(); > setStatStatus ( tr ( "Connecting to broker" ) ); > stInfo->insertPlainText ( "broker url: "+config.brokerurl ); > > -- > Alioth's > /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on > /srv/git/code.x2go.org/x2goclient.git > _______________________________________________ > x2go-commits mailing list > x2go-commits(a)lists.x2go.org > https://lists.x2go.org/listinfo/x2go-commits -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de

2 5

Re: [X2Go-Dev] [X2Go-Commits] [x2goclient] 01/01: Add new brocker feature. Broker can send to client some configuration in the section START_CLIENT_CONFIG - END_CLIENT_CONFIG. For the moment is supported option events=bool. If true, client sending to broker events: CONNECTING, CONNECTED, SUSPENDING, TERMINATING, FINISHED. It's not a real session state, but rather the state of X2Go Client.
by Mike Gabriel 21 Dec '18

21 Dec '18

Hi Alex, how well is the below feature tested with current x2gobroker that does not yet understand this feature? I guess this patch is part of a paid project. Do you have budget for adapting x2gobroker on git.x2go.org, too? Otherwise, I'd much prefer this commit on an extra branch for now, until the x2gobroker is adapted to this, too. Ideally, your patch supports legacy brokers, which I assume it does... Greets, Mike On Di 21 Aug 2018 15:43:05 CEST, git-admin wrote: > This is an automated email from the git hooks/post-receive script. > > x2go pushed a commit to branch master > in repository x2goclient. > > commit 539e0a4268df3d78f88f6908506c18222743d84f > Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> > Date: Tue Aug 21 15:42:52 2018 +0200 > > Add new brocker feature. Broker can send to client some > configuration in the section START_CLIENT_CONFIG - > END_CLIENT_CONFIG. For the moment is supported option events=bool. > If true, client sending to broker events: CONNECTING, CONNECTED, > SUSPENDING, TERMINATING, FINISHED. It's not a real session state, > but rather the state of X2Go Client. > --- > debian/changelog | 5 +++ > src/httpbrokerclient.cpp | 86 > ++++++++++++++++++++++++++++++++++++++++++++++++ > src/httpbrokerclient.h | 5 +++ > src/onmainwindow.cpp | 86 > +++++++++++++++++++++++++++++++++++++++++++----- > src/onmainwindow.h | 15 ++++++++- > 5 files changed, 187 insertions(+), 10 deletions(-) > > diff --git a/debian/changelog b/debian/changelog > index 5e22cd3..b0c0449 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -3,6 +3,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium > [ Oleksandr Shneyder ] > * New upstream version (4.1.2.2): > - Add SSH instruction to list of errors if keyboard-interactive > auth has failed. > + - Add new brocker feature. Broker can send to client some > configuration in > + the section START_CLIENT_CONFIG - END_CLIENT_CONFIG. For the > moment is supported > + option events=bool. If true, client sending to broker events: > CONNECTING, > + CONNECTED, SUSPENDING, TERMINATING, FINISHED. It's not a real > session state, > + but rather the state of X2Go Client. > > [ Mihai Moldovan ] > * New upstream version (4.1.2.2): > diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp > index f7fbaf1..ea5158e 100644 > --- a/src/httpbrokerclient.cpp > +++ b/src/httpbrokerclient.cpp > @@ -270,6 +270,7 @@ void > HttpBrokerClient::slotSshUserAuthError(QString error) > return; > } > > + > void HttpBrokerClient::getUserSessions() > { > QString brokerUser=config->brokerUser; > @@ -347,6 +348,66 @@ void HttpBrokerClient::selectUserSession(const > QString& session) > > } > > +void HttpBrokerClient::sendEvent(const QString& ev, const QString& > id, const QString& server, const QString& client, const QString& > login, const QString& cmd, const QString& display, const QString& > start) > +{ > + x2goDebug<<"Called sendEvent."; > + QString brokerUser=config->brokerUser; > + if(mainWindow->getUsePGPCard()) > + brokerUser=mainWindow->getCardLogin(); > + > + if(!sshBroker) > + { > + QString req; > + QTextStream ( &req ) << > + "task=clientevent&"<< > + > "user="<<QUrl::toPercentEncoding(brokerUser)<<"&"<< > + "sid="<<id<<"&"<< > + "event="<<ev<<"&"<< > + > "server="<<QUrl::toPercentEncoding(server)<<"&"<< > + > "client="<<QUrl::toPercentEncoding(client)<<"&"<< > + "login="<<QUrl::toPercentEncoding(login)<<"&"<< > + "cmd="<<QUrl::toPercentEncoding(cmd)<<"&"<< > + > "display="<<QUrl::toPercentEncoding(display)<<"&"<< > + "start="<<QUrl::toPercentEncoding(start)<<"&"<< > + "authid="<<nextAuthId; > + x2goDebug << "Sending request: "<< req.toUtf8(); > + QNetworkRequest request(QUrl(config->brokerurl)); > + request.setHeader(QNetworkRequest::ContentTypeHeader, > "application/x-www-form-urlencoded"); > + eventRequest=http->post (request, req.toUtf8() ); > + > + } > + else > + { > + if (nextAuthId.length() > 0) { > + sshConnection->executeCommand ( config->sshBrokerBin+" > --user "+ brokerUser +" --authid "+nextAuthId+ > + " --task clientevent --sid \""+id+"\" --event "+ev+" > --server \""+server+"\" --client \""+client+"\" --login "+"\""+ > + login+"\" --cmd \""+cmd+"\" --display \""+display+"\" > --start \""+start+"\"", > + this,SLOT ( slotEventSent(bool,QString,int))); > + } else { > + sshConnection->executeCommand ( config->sshBrokerBin+" > --user "+ brokerUser + > + " --task clientevent --sid \""+id+"\" --event "+ev+" > --server \""+server+"\" --client \""+client+"\" --login "+"\""+ > + login+"\" --cmd \""+cmd+"\" --display\" "+display+" \" > --start \""+start+"\"", > + this,SLOT ( slotEventSent(bool,QString,int))); > + } > + } > +} > + > + > +void HttpBrokerClient::slotEventSent(bool success, QString answer, int) > +{ > + if(!success) > + { > + x2goDebug<<answer; > + QMessageBox::critical(0,tr("Error"),answer); > + emit fatalHttpError(); > + return; > + } > + if(!checkAccess(answer)) > + return; > + x2goDebug<<"event sent:"<<answer; > +} > + > + > void HttpBrokerClient::changePassword(QString newPass) > { > newBrokerPass=newPass; > @@ -405,6 +466,16 @@ void HttpBrokerClient::testConnection() > } > } > > +void HttpBrokerClient::processClientConfig(const QString& raw_content) > +{ > + X2goSettings st(raw_content, QSettings::IniFormat); > + > mainWindow->config.brokerEvents=st.setting()->value("events",false).toBool(); > + if(mainWindow->config.brokerEvents) > + { > + x2goDebug<<"sending client events to broker"; > + } > +} > + > > void HttpBrokerClient::createIniFile(const QString& raw_content) > { > @@ -420,6 +491,17 @@ void HttpBrokerClient::createIniFile(const > QString& raw_content) > cont=cont.split("END_USER_SESSIONS\n")[0]; > } > mainWindow->config.iniFile=cont; > + lines=content.split("START_CLIENT_CONFIG\n"); > + if (lines.count()>1) > + { > + cont=lines[1]; > + cont=cont.split("END_CLIENT_CONFIG\n")[0]; > + processClientConfig(cont); > + } > + else > + { > + x2goDebug<<"no client config from broker"; > + } > } > > > @@ -540,6 +622,10 @@ void HttpBrokerClient::slotRequestFinished ( > QNetworkReply* reply ) > { > slotPassChanged(true,answer,0); > } > + if (reply == eventRequest) > + { > + slotEventSent(true,answer,0); > + } > > // We receive ownership of the reply object > // and therefore need to handle deletion. > diff --git a/src/httpbrokerclient.h b/src/httpbrokerclient.h > index 0a307e1..4e0098e 100644 > --- a/src/httpbrokerclient.h > +++ b/src/httpbrokerclient.h > @@ -45,6 +45,8 @@ public: > void changePassword(QString newPass); > void testConnection(); > void closeSSHInteractionDialog(); > + void sendEvent(const QString& ev, const QString& id, const > QString& server, const QString& client, > + const QString& login, const QString& cmd, const > QString& display, const QString& start); > private: > QNetworkAccessManager* http; > QNetworkRequest* netRequest; > @@ -53,6 +55,7 @@ private: > QNetworkReply* selSessRequest; > QNetworkReply* chPassRequest; > QNetworkReply* testConRequest; > + QNetworkReply* eventRequest; > QString nextAuthId; > QString newBrokerPass; > ConfigFile* config; > @@ -62,6 +65,7 @@ private: > SshMasterConnection* sshConnection; > private: > void createIniFile(const QString& raw_content); > + void processClientConfig(const QString& raw_content); > void parseSession(QString sInfo); > void createSshConnection(); > bool checkAccess(QString answer); > @@ -78,6 +82,7 @@ private slots: > void slotListSessions ( bool success, QString answer, int pid); > void slotSelectSession ( bool success, QString answer, int pid); > void slotPassChanged ( bool success, QString answer, int pid); > + void slotEventSent ( bool success, QString answer, int pid); > void slotConnectionTest( bool success, QString answer, int pid); > void slotSshIoErr(SshProcess* caller, QString error, QString > lastSessionError); > > diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp > index 405b124..d547248 100644 > --- a/src/onmainwindow.cpp > +++ b/src/onmainwindow.cpp > @@ -3548,6 +3548,12 @@ void ONMainWindow::startDirectRDP() > resumingSession.sessionId=sessionExplorer->getLastSession()->name(); > > resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy > HH:mm:ss"); > showSessionStatus(); > + if(brokerMode) > + { > + > sendEventToBroker(CONNECTING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > + > // QTimer::singleShot ( 30000,this,SLOT ( slotRestartProxy() ) ); > proxyRunning=true; > delete st; > @@ -3991,6 +3997,31 @@ x2goSession > ONMainWindow::getSessionFromString ( const QString& string ) > } > > > +void ONMainWindow::sendEventToBroker(ONMainWindow::client_events > ev, const QString& id, const QString& server, const QString& client, > const QString& login, const QString& cmd, const QString& display, > const QString& start) > +{ > + if(!config.brokerEvents) > + { > + return; > + } > + if(ev <= lastBrokerEvent && id == lastBrokerEventSession ) > + { > + return; > + } > + lastBrokerEvent=ev; > + lastBrokerEventSession=id; > + QString event; > + switch(ev) > + { > + case CONNECTING: event="CONNECTING";break; > + case CONNECTED: event="CONNECTED";break; > + case SUSPENDING: event="SUSPENDING";break; > + case TERMINATING: event="TERMINATING";break; > + case FINISHED: event="FINISHED";break; > + } > + broker->sendEvent(event, id, server, client, login, cmd, > display, start); > +} > + > + > void ONMainWindow::startNewSession() > { > newSession=true; > @@ -5025,6 +5056,11 @@ void ONMainWindow::slotSuspendSess() > void ONMainWindow::slotSuspendSessFromSt() > { > > + if(brokerMode) > + { > + > sendEventToBroker(SUSPENDING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > #ifdef Q_OS_LINUX > if (directRDP) > { > @@ -5053,6 +5089,11 @@ void ONMainWindow::slotTermSessFromSt() > if (directRDP) > { > > + if(brokerMode) > + { > + > sendEventToBroker(TERMINATING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > x2goDebug<<"Terminating direct RDP session."; > > nxproxy->terminate(); > @@ -5061,20 +5102,30 @@ void ONMainWindow::slotTermSessFromSt() > } > #endif > > - x2goDebug<<"Disconnect export."; > - > - /* > - disconnect ( sbExp,SIGNAL ( clicked() ),this, > - SLOT ( slot_exportDirectory() ) );*/ > - sbExp->setEnabled ( false ); > > if ( !shadowSession ) > { > if ( termSession ( resumingSession.sessionId ) ) > + { > + sbExp->setEnabled ( false ); > + if(brokerMode) > + { > + > sendEventToBroker(TERMINATING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > setStatStatus ( tr ( "terminating" ) ); > + } > } > else > + { > + sbExp->setEnabled ( false ); > + if(brokerMode) > + { > + > sendEventToBroker(TERMINATING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > termSession ( resumingSession.sessionId,false ); > + } > } > > > @@ -5812,6 +5863,12 @@ void ONMainWindow::slotTunnelOk(int) > > nxproxy->start ( proxyCmd ); > proxyRunning=true; > + if(brokerMode) > + { > + > sendEventToBroker(CONNECTING,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > + > // always search for proxy window on linux. On Windows only in window mode > #ifdef Q_OS_WIN > if (xorgMode==WIN) { > @@ -6087,7 +6144,11 @@ void ONMainWindow::slotProxyError ( > QProcess::ProcessError err ) > > void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) > { > - > + if(brokerMode) > + { > + > sendEventToBroker(FINISHED,resumingSession.sessionId,resumingSession.server, > resumingSession.clientIp, getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > #ifdef Q_OS_DARWIN > if (modMapTimer) { > disconnect (modMapTimer, SIGNAL (timeout ()), this, SLOT > (slotSetModMap ())); > @@ -6288,9 +6349,11 @@ void ONMainWindow::slotProxyStderr() > stInfo->insertPlainText ( reserr ); > stInfo->ensureCursorVisible(); > if ( stInfo->toPlainText().indexOf ( > - "Connecting to remote host 'localhost:"+ > - /*resumingSession.grPort*/ localGraphicPort ) !=-1 ) > + "Connecting to remote host 'localhost:"+ > + /*resumingSession.grPort*/ localGraphicPort ) !=-1 ) > + { > setStatStatus ( tr ( "connecting" ) ); > + } > > if ( stInfo->toPlainText().indexOf ( > "Connection to remote proxy 'localhost:"+ > @@ -6310,6 +6373,11 @@ void ONMainWindow::slotProxyStderr() > if ( stInfo->toPlainText().indexOf ( > "Established X server connection" ) !=-1 ) > { > + if(brokerMode) > + { > + > sendEventToBroker(CONNECTED,resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, > getCurrentUname(), > + resumingSession.command, > resumingSession.display, resumingSession.crTime); > + } > setStatStatus ( tr ( "running" ) ); > if (trayEnabled) > { > diff --git a/src/onmainwindow.h b/src/onmainwindow.h > index 47eaa5e..a1fab35 100644 > --- a/src/onmainwindow.h > +++ b/src/onmainwindow.h > @@ -169,6 +169,7 @@ struct ConfigFile > bool brokerAutologin; > bool brokerAutologoff; > bool brokerKrbLogin; > + bool brokerEvents; //Send events to broker and get control commands > QString brokerSshKey; > QString brokerCaCertFile; > QString iniFile; > @@ -300,6 +301,14 @@ public: > UNKNOWN_KEY_TYPE > }; > > + enum client_events { > + CONNECTING, > + CONNECTED, > + SUSPENDING, > + TERMINATING, > + FINISHED > + }; > + > static bool debugging; > > static bool portable; > @@ -859,6 +868,8 @@ private: > int lastUid; > bool cardReady; > HttpBrokerClient* broker; > + client_events lastBrokerEvent; > + QString lastBrokerEventSession; > > > #if defined ( Q_OS_WIN) //&& defined (CFGCLIENT ) > @@ -899,7 +910,9 @@ private: > bool trayMinCon; > bool trayMaxDiscon; > bool trayAutoHidden; > - > + void sendEventToBroker(client_events ev, const QString& id, > const QString& server, const QString& client, > + const QString& login, const QString& cmd, > + const QString& display, const QString& start); > QString findSshKeyForServer(QString user, QString server, QString port); > void loadSettings(); > void showPass ( UserButton* user ); > > -- > Alioth's > /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on > /srv/git/code.x2go.org/x2goclient.git > _______________________________________________ > x2go-commits mailing list > x2go-commits(a)lists.x2go.org > https://lists.x2go.org/listinfo/x2go-commits -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de

2 4

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

x2go-dev December 2018