x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

page changed: doc:professional-support
by wiki-admin＠x2go.org 07 Oct '13

07 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/07 14:03 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/doc:professional-support?rev=1363307275 New Revision: http://wiki.x2go.org/doku.php/doc:professional-support Edit Summary: User : sunweaver @@ -9,8 +9,10 @@ * Feature development of X2Go Thin Client Environment * Integration of X2Go into Ubuntu * General code maintenance via regularly paid support contracts * ... + + Support X2Go Development performed by DAS-NETZWERKTEAM: {{paypal>S2Q9DHP5HSZLW}} * [[http://phoca-gmbh.de|Phoca GmbH]] (Oleksandr Shneyder) * Feature development of X2Go Client * Feature development of X2Go Server -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-20-g97d719a
by git-admin＠x2go.org 04 Oct '13

04 Oct '13

The branch, twofactorauth has been updated via 97d719a9381976c7878ecb95b9292b78366e2608 (commit) from 81ed5e7d2886aa67e03655d3669011096b4c944e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 97d719a9381976c7878ecb95b9292b78366e2608 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 4 16:12:22 2013 +0200 No Unicode chars in log messages. Eliminated one more in checkhosts.py. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/checkhosts.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ea4e5c4..017ae15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Implement two-factor authentication. - Compat fix in _paramiko monkey patch module to also work with early Paramiko versions. + - No Unicode chars in log messages. Eliminated one more in checkhosts.py. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 192850a..abebdd9 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -216,7 +216,7 @@ class X2GoInteractiveAddPolicy(X2GoMissingHostKeyPolicy): if self.session_instance.control_session.unique_hostkey_aliases: our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None) if our_server_key is not None: - self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile ,,%s\'\'.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) return else: our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.4.0.8-13-g058bc7b
by git-admin＠x2go.org 04 Oct '13

04 Oct '13

The branch, master has been updated via 058bc7b3d319e91a07c39804aaa9e118dc116334 (commit) from 0ed9ba982fd0bb59d1a6c9a529004fcbe0c84387 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 058bc7b3d319e91a07c39804aaa9e118dc116334 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 4 16:12:22 2013 +0200 No Unicode chars in log messages. Eliminated one more in checkhosts.py. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/checkhosts.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e364be..8c6ee9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low control session's connect() method. - Fix parameter handling in X2GoSession.connect(). - Rewrite passwords that are not string/unicode to an empty string. + - No Unicode chars in log messages. Eliminated one more in checkhosts.py. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 192850a..abebdd9 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -216,7 +216,7 @@ class X2GoInteractiveAddPolicy(X2GoMissingHostKeyPolicy): if self.session_instance.control_session.unique_hostkey_aliases: our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None) if our_server_key is not None: - self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile ,,%s\'\'.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) return else: our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-10-g8cade0e
by git-admin＠x2go.org 04 Oct '13

04 Oct '13

The branch, master has been updated via 8cade0ed5bc2e7595d394857f56308c55138f862 (commit) from a0e76cf105a0a44705b53c9ddf5bf0b4483f15b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8cade0ed5bc2e7595d394857f56308c55138f862 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 4 11:59:19 2013 +0200 Add NSIS packaging files for win32 builds to source tree. (Files provided by Oleksandr Shneyder, thanks!!!). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + COPYING => nsis/gpl.txt | 6 +- nsis/icons/win-install.ico | Bin 0 -> 1078 bytes nsis/icons/win-uninstall.ico | Bin 0 -> 1078 bytes nsis/make_installer.sh | 4 + nsis/x2goclient.nsi | 167 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 176 insertions(+), 3 deletions(-) copy COPYING => nsis/gpl.txt (98%) mode change 100644 => 100755 create mode 100755 nsis/icons/win-install.ico create mode 100755 nsis/icons/win-uninstall.ico create mode 100755 nsis/make_installer.sh create mode 100755 nsis/x2goclient.nsi The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e3c3c9..05b5189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.1.2): + Provide Keywords: key in .desktop file. + + Add NSIS packaging files for win32 builds to source tree. + (Files provided by Oleksandr Shneyder, thanks!!!). * Pull-in packaging changes from Debian. [ Ricardo Díaz Martín ] diff --git a/COPYING b/nsis/gpl.txt old mode 100644 new mode 100755 similarity index 98% copy from COPYING copy to nsis/gpl.txt index 57f4943..7a8e8ab --- a/COPYING +++ b/nsis/gpl.txt @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Also add information on how to contact you by electronic and paper mail. @@ -336,5 +336,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/nsis/icons/win-install.ico b/nsis/icons/win-install.ico new file mode 100755 index 0000000..c0a5a00 Binary files /dev/null and b/nsis/icons/win-install.ico differ diff --git a/nsis/icons/win-uninstall.ico b/nsis/icons/win-uninstall.ico new file mode 100755 index 0000000..9329176 Binary files /dev/null and b/nsis/icons/win-uninstall.ico differ diff --git a/nsis/make_installer.sh b/nsis/make_installer.sh new file mode 100755 index 0000000..3e0ee88 --- /dev/null +++ b/nsis/make_installer.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +upx x2goclient/x2goclient.exe +makensis x2goclient.nsi diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi new file mode 100755 index 0000000..e429895 --- /dev/null +++ b/nsis/x2goclient.nsi @@ -0,0 +1,167 @@ +;NSIS Modern User Interface +;Multilingual Example Script +;Written by Joost Verburg + + +!include "MUI.nsh" +!include "FileFunc.nsh" +!insertmacro Locate +;-------------------------------- +;General + + RequestExecutionLevel admin + !define VERSION "4.0.1.0-pre02" + Name "x2goclient-${VERSION}" + Caption "x2goclient-${VERSION}" + OutFile "x2goclient-${VERSION}-setup.exe" + !define MUI_ICON icons\win-install.ico + !define MUI_UNICON icons\win-uninstall.ico + ;Default installation folder + InstallDir "$PROGRAMFILES\x2goclient" + + ;Get installation folder from registry if available + InstallDirRegKey HKLM "Software\x2goclient" "" + +;-------------------------------- +;Check if user is admin +Section + userInfo::getAccountType + pop $0 + strCmp $0 "Admin" +3 + messageBox MB_OK $(ADM_RIGHT) + abort +SectionEnd + +;-------------------------------- +;Interface Settings + + !define MUI_ABORTWARNING + +;-------------------------------- +;Language Selection Dialog Settings + + ;Remember the installer language + !define MUI_LANGDLL_REGISTRY_ROOT "HKLM" + !define MUI_LANGDLL_REGISTRY_KEY "Software\x2goclient" + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + +;------------------------------ +;Variables + + Var STARTMENU_FOLDER + Var MUI_TEMP + +;-------------------------------- +;Pages + + !insertmacro MUI_PAGE_LICENSE "gpl.txt" + !insertmacro MUI_PAGE_DIRECTORY + !define MUI_STARTMENUPAGE_DEFAULTFOLDER "X2Go Client for Windows" + !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" + !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\x2goclient" + !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + !insertmacro MUI_PAGE_STARTMENU "Application" $STARTMENU_FOLDER + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Russian" + +;-------------------------------- +;Reserve Files + + ;If you are using solid compression, files that are required before + ;the actual installation should be stored first in the data block, + ;because this will make your installer start faster. + + !insertmacro MUI_RESERVEFILE_LANGDLL + + +;-------------------------------- +;Installer Sections +Section "x2goclient" Section1 + + SetShellVarContext all + SectionIn RO + + SetOutPath "$INSTDIR" + File /a "x2goclient\*.*" + File /r "x2goclient\pulse" + File /r "x2goclient\VcXsrv" + + ;Store installation folder + WriteRegStr HKLM "Software\x2goclient" "" $INSTDIR + + ;Create uninstaller + WriteUninstaller "$INSTDIR\Uninstall.exe" + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + CreateShortCut "$INSTDIR\X2goClient.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe" + + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +;------------------------------------------- +;Descriptions + + +LangString ADM_RIGHT ${LANG_ENGLISH} "You have to be Administrator on this computer to install X2Go Client" +LangString ADM_RIGHT ${LANG_GERMAN} "Sie brauchen Administratorenrechte um X2go Client zu installieren" +LangString ADM_RIGHT ${LANG_RUSSIAN} "�� , �� X2Go Client, �� " + + +!Insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!Insertmacro MUI_FUNCTION_DESCRIPTION_END + +;-------------------------------- +;Installer Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +;-------------------------------- +;Uninstaller Section + +Section "Uninstall" + + SetShellVarContext all + + !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP + Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" + Delete "$SMPROGRAMS\$MUI_TEMP\X2goClient.lnk" + Delete "$DESKTOP\X2goClient.lnk" + StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" + startMenuDeleteLoop: + ClearErrors + RMDir $MUI_TEMP + GetFullPathName $MUI_TEMP "$MUI_TEMP\.." + IfErrors startMenuDeleteLoopDone + StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop + startMenuDeleteLoopDone: + + RMDir /r "$INSTDIR" + + DeleteRegKey HKLM "Software\x2goclient" + +SectionEnd + +;-------------------------------- +;Uninstaller Functions + +Function un.onInit + + !insertmacro MUI_UNGETLANGUAGE + +FunctionEnd hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-9-ga0e76cf
by git-admin＠x2go.org 04 Oct '13

04 Oct '13

The branch, master has been updated via a0e76cf105a0a44705b53c9ddf5bf0b4483f15b5 (commit) from f376e1c9e9e1b145b4ed1f2cb8a32b64ffe5f4bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0e76cf105a0a44705b53c9ddf5bf0b4483f15b5 Author: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com> Date: Fri Oct 4 11:19:46 2013 +0200 Strip whitespaces off of user name, host name and other strings when loading / saving session profiles.(Fixes: #315). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ httpbrokerclient.cpp | 5 +++++ sessionwidget.cpp | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 34 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6360efe..5e3c3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low + Provide Keywords: key in .desktop file. * Pull-in packaging changes from Debian. + [ Ricardo Díaz Martín ] + * New upstream versino (4.0.1.2): + + Strip whitespaces off of user name, host name and other + strings when loading / saving session profiles.(Fixes: #315). + [ Oleksandr Shneyder ] * New upstream version (4.0.1.2): - Support for keys "shadowuser" "shadowdisplay" and "shadowmode" in diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 35f87d0..603aadd 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -41,6 +41,11 @@ HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) QUrl lurl ( config->brokerurl ); if(lurl.userName().length()>0) config->brokerUser=lurl.userName(); + /* + * load self-signed / custome (root-)CA certificate + * see. http://www.thomaskeller.biz/blog/2009/01/03/ssl-verification-with-qt-and-a-… + */ + if(config->brokerurl.indexOf("ssh://")==0) { sshBroker=true; diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 62b7ea4..0f6ec06 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -503,21 +503,21 @@ void SessionWidget::readConfig() sessName->setText ( st.setting()->value ( sessionId+"/name", - ( QVariant ) tr ( "New session" ) ).toString() ); + ( QVariant ) tr ( "New session" ) ).toString().trimmed() ); sessIcon=st.setting()->value ( sessionId+"/icon", - ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); + ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed(); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( sessionId+"/host", - ( QVariant ) QString::null ).toString() ); + ( QVariant ) QString::null ).toString().trimmed() ); uname->setText ( st.setting()->value ( sessionId+"/user", - ( QVariant ) QString::null ).toString() ); + ( QVariant ) QString::null ).toString().trimmed() ); key->setText ( st.setting()->value ( sessionId+"/key", - ( QVariant ) QString::null ).toString() ); + ( QVariant ) QString::null ).toString().trimmed() ); cbAutoLogin->setChecked(st.setting()->value ( sessionId+"/autologin", ( QVariant ) false ).toBool()); @@ -545,7 +545,7 @@ void SessionWidget::readConfig() QString prtype= st.setting()->value ( sessionId+"/sshproxytype", "SSH" - ).toString() ; + ).toString().trimmed() ; if(prtype=="HTTP") { @@ -559,17 +559,17 @@ void SessionWidget::readConfig() proxyLogin->setText(st.setting()->value ( sessionId+"/sshproxyuser", QString() - ).toString() ); + ).toString().trimmed() ); proxyKey->setText(st.setting()->value ( sessionId+"/sshproxykeyfile", QString() - ).toString() ); + ).toString().trimmed() ); proxyHost->setText(st.setting()->value ( sessionId+"/sshproxyhost", QString() - ).toString() ); + ).toString().trimmed() ); proxyPort->setValue(st.setting()->value ( sessionId+"/sshproxyport", @@ -612,14 +612,14 @@ void SessionWidget::readConfig() QString command=st.setting()->value ( sessionId+"/command", - ( QVariant ) mainWindow->getDefaultCmd() ).toString(); + ( QVariant ) mainWindow->getDefaultCmd() ).toString().trimmed(); rdpOptions=st.setting()->value ( sessionId+"/rdpoptions", - ( QVariant ) "" ).toString(); + ( QVariant ) "" ).toString().trimmed(); rdpServer=st.setting()->value ( sessionId+"/rdpserver", - ( QVariant ) "" ).toString(); + ( QVariant ) "" ).toString().trimmed(); xdmcpServer=st.setting()->value ( sessionId+"/xdmcpserver", - ( QVariant ) "localhost" ).toString(); + ( QVariant ) "localhost" ).toString().trimmed(); #ifdef Q_OS_LINUX cbDirectRDP->setChecked(st.setting()->value ( sessionId+"/directrdp",false ).toBool()); @@ -763,16 +763,16 @@ void SessionWidget::saveSettings() X2goSettings st ( "sessions" ); st.setting()->setValue ( sessionId+"/name", - ( QVariant ) sessName->text() ); + ( QVariant ) sessName->text().trimmed() ); st.setting()->setValue ( sessionId+"/icon", ( QVariant ) sessIcon ); st.setting()->setValue ( sessionId+"/host", - ( QVariant ) server->text() ); + ( QVariant ) server->text().trimmed() ); st.setting()->setValue ( sessionId+"/user", - ( QVariant ) uname->text() ); + ( QVariant ) uname->text().trimmed() ); st.setting()->setValue ( sessionId+"/key", - ( QVariant ) key->text() ); + ( QVariant ) key->text().trimmed() ); #ifdef Q_OS_LINUX st.setting()->setValue ( sessionId+"/rdpport", ( QVariant ) rdpPort->value() ); @@ -792,16 +792,16 @@ void SessionWidget::saveSettings() if ( sessBox->currentIndex() < OTHER ) command=sessBox->currentText(); else - command=cmd->text(); + command=cmd->text().trimmed(); if ( sessBox->currentIndex() == RDP ) { command="RDP"; - rdpServer=cmd->text(); + rdpServer=cmd->text().trimmed(); } if ( sessBox->currentIndex() == XDMCP ) { command="XDMCP"; - xdmcpServer=cmd->text(); + xdmcpServer=cmd->text().trimmed(); } if ( sessBox->currentIndex() == SHADOW ) { @@ -826,7 +826,7 @@ void SessionWidget::saveSettings() if ( sessBox->currentIndex() ==APPLICATION ) { rootless=true; - command=mainWindow->internAppName ( cmdCombo->lineEdit()->text() ); + command=mainWindow->internAppName ( cmdCombo->lineEdit()->text().trimmed() ); } if ( sessBox->currentIndex() == PUBLISHED) published=true; @@ -857,9 +857,9 @@ void SessionWidget::saveSettings() { st.setting()->setValue ( sessionId+"/sshproxytype","SSH"); } - st.setting()->setValue (sessionId+"/sshproxyuser",proxyLogin->text()); - st.setting()->setValue (sessionId+"/sshproxykeyfile",proxyKey->text()); - st.setting()->setValue (sessionId+"/sshproxyhost",proxyHost->text()); + st.setting()->setValue (sessionId+"/sshproxyuser",proxyLogin->text().trimmed()); + st.setting()->setValue (sessionId+"/sshproxykeyfile",proxyKey->text().trimmed()); + st.setting()->setValue (sessionId+"/sshproxyhost",proxyHost->text().trimmed()); st.setting()->setValue (sessionId+"/sshproxyport",proxyPort->value()); st.setting()->setValue (sessionId+"/sshproxysamepass",cbProxySamePass->isChecked()); st.setting()->setValue (sessionId+"/sshproxysameuser",cbProxySameUser->isChecked()); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-52-g014e9a5
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 014e9a5c9b1535aa2a53114654f17f61d01cdf8c (commit) from 6f11897f570fdea9e1c1353ac2a614b253183a7e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 014e9a5c9b1535aa2a53114654f17f61d01cdf8c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 16:50:36 2013 +0200 Add utils function: matching_hostnames(): test hostname lists for matching hostnames (with/without domain name). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/tests/test_utils.py | 37 +++++++++++++++++++++++++++++++++++++ x2gobroker/utils.py | 21 +++++++++++++++++++++ 3 files changed, 60 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8a05da2..bb2cb50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Fix the ping task in x2gobroker-agent.pl, process it without checking the given username. - Fix remote agent detection in case of some agents being down. + - Add utils function: matching_hostnames(): test hostname lists for + matching hostnames (with/without domain name). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/tests/test_utils.py b/x2gobroker/tests/test_utils.py index 2480ffb..96ce51e 100644 --- a/x2gobroker/tests/test_utils.py +++ b/x2gobroker/tests/test_utils.py @@ -94,6 +94,43 @@ class TestX2GoBrokerUtils(unittest.TestCase): self.assertEqual(esl_keys, sln_keys) self.assertEqual(['extern', 'intern'], subdomains) + def test_matching_hostnames(self): + + server_list_a = ['server1', 'server2', 'server3'] + server_list_b = ['server2', 'server3', 'server4'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, ['server2', 'server3']) + + server_list_a = ['server1.domain1', 'server2.domain1', 'server3.domain1'] + server_list_b = ['server2', 'server3', 'server4'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, ['server2', 'server3']) + + server_list_a = ['server1', 'server2', 'server3'] + server_list_b = ['server2.domain2', 'server3.domain2', 'server4.domain2'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, ['server2', 'server3']) + + server_list_a = ['server1.domain1', 'server2.domain1', 'server3.domain1'] + server_list_b = ['server2.domain2', 'server3.domain2', 'server4.domain2'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, []) + + server_list_a = ['server1.domain1', 'server2.domain2', 'server3.domain1'] + server_list_b = ['server2.domain2', 'server3.domain2', 'server4.domain2'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, ['server2.domain2']) + + server_list_a = ['server1.domain1', 'server2', 'server3.domain1'] + server_list_b = ['server2.domain2', 'server3.domain2', 'server4.domain2'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, []) + + server_list_a = ['server1.domain1', 'server2', 'server3.domain1'] + server_list_b = ['server2', 'server3.domain2', 'server4.domain2'] + matching_hostnames = x2gobroker.utils.matching_hostnames(server_list_a, server_list_b) + self.assertEqual(matching_hostnames, ['server2']) + def test_suite(): from unittest import TestSuite, makeSuite diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py index 83656ec..cc01eae 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -148,3 +148,24 @@ def normalize_hostnames(servers): servers_normalized = servers return servers_normalized, subdomains + +def matching_hostnames(server_list_a, server_list_b): + + matching_hosts = [] + + ### NORMALIZE (=reduce to hostname only) server names (list A) if possible + server_list_a_normalized, subdomains_a = normalize_hostnames(server_list_a) + + ### NORMALIZE server names (in list B), only if we have a unique domain match in list A + if len(subdomains_a) <= 1: + + server_list_b_normalized, subdomains_b = normalize_hostnames(server_list_b) + if len(subdomains_b) <= 1: + + if len(subdomains_a) == 0 or len(subdomains_b) == 0: + matching_hosts = list(set(server_list_a_normalized).intersection(set(server_list_b_normalized))) + + if not matching_hosts: + matching_hosts = list(set(server_list_a).intersection(set(server_list_b))) + + return matching_hosts hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-49-g8fdd01b
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 8fdd01bba121b8947da6dd2da8208bc7e9804026 (commit) from 84eb4bbf57ac2221c05a1c8284c7490e9231ad81 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8fdd01bba121b8947da6dd2da8208bc7e9804026 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 16:46:08 2013 +0200 Fix the ping task in x2gobroker-agent.pl, process it without checking the given username. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ lib/x2gobroker-agent.pl | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1e9ddfb..fb7a240 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Report stderr results to the broker log channel (broker.log). This allows debugging of X2Go Session Broker Agent via the X2Go Session Broker logging instance. (Fixes: #217). + - Fix the ping task in x2gobroker-agent.pl, process it without checking the + given username. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 7c80ae4..8c06f96 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -98,6 +98,12 @@ $ENV{'PATH'} = '/bin:/usr/bin'; my $username=shift or die; my $mode=shift or die; +if($mode eq 'ping') +{ + print "OK\n"; + exit; +} + my ($uid, $passwd, $uidNumber, $gidNumber, $quota, $comment, $gcos, $home, $shell, $expire) = getpwnam($username); if($uidNumber < 1000) @@ -198,7 +204,3 @@ if($mode eq 'terminatesession') exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus T $sid\""); } -if($mode eq 'ping') -{ - print "OK\n"; -} hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-50-g632a954
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 632a954598d35de61d9e77d2bc716ccb52763622 (commit) from 8fdd01bba121b8947da6dd2da8208bc7e9804026 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 632a954598d35de61d9e77d2bc716ccb52763622 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 16:46:53 2013 +0200 promote agent calls to loglevel INFO ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index a334382..914dd9d 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -91,7 +91,7 @@ def call_local_broker_agent(username, mode, cmdline_args=[]): for cmdline_arg in cmdline_args: cmd_line.append('\'{arg}\''.format(arg=cmdline_arg)) - logger_broker.debug('Executing agent command locally: {cmd}'.format(cmd=" ".join(cmd_line))) + logger_broker.info('Executing agent command locally: {cmd}'.format(cmd=" ".join(cmd_line))) result = ['FAILED'] try: agent_process = subprocess.Popen(cmd_line, @@ -153,7 +153,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) if ssh_transport and ssh_transport.is_authenticated(): cmd = ' '.join(cmd_line) cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd) - logger_broker.debug('Executing agent command on remote host ({remote_agent}): {cmd}'.format(remote_agent=remote_agent['hostname'], cmd=cmd)) + logger_broker.info('Executing agent command on remote host ({remote_agent}): {cmd}'.format(remote_agent=remote_agent['hostname'], cmd=cmd)) (stdin, stdout, stderr) = client.exec_command(cmd) result = stdout.read().split('\n') err = stderr.read().replace('\n', ' ') hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-53-g76e6299
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 76e62996558b33a95028ffac3173db51f178ebdc (commit) from 014e9a5c9b1535aa2a53114654f17f61d01cdf8c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 76e62996558b33a95028ffac3173db51f178ebdc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 16:58:06 2013 +0200 Add fuzzy tolerance when comparing host name lists as found in session profile configuration and as reported by broker agent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bb2cb50..9dab16a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Fix remote agent detection in case of some agents being down. - Add utils function: matching_hostnames(): test hostname lists for matching hostnames (with/without domain name). + - Add fuzzy tolerance when comparing host name lists as found in session + profile configuration and as reported by broker agent. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 8736c78..6db07ed 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -879,8 +879,15 @@ class X2GoBroker(object): if remote_agent: try: running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) - if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' - if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' + if running_sessions: + logger_broker.debug('base_broker.X2GoBroker.list_profiles(): found running sessions on host(s): {hosts}'.format(hosts=', '.join(running_sessions))) + if suspended_sessions: + logger_broker.debug('base_broker.X2GoBroker.list_profiles(): found running sessions on host(s): {hosts}'.format(hosts=', '.join(suspended_sessions))) + if x2gobroker.utils.matching_hostnames(profile['host'], running_sessions): profile['status'] = u'R' + if x2gobroker.utils.matching_hostnames(profile['host'], suspended_sessions): profile['status'] = u'S' + if profile['status']: + logger_broker.debug('base_broker.X2GoBroker.list_profiles(): marking session profile {name} as {status}'.format(name=profile['name'], status=profile['status'])) + except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: pass @@ -945,7 +952,6 @@ class X2GoBroker(object): busy_servers_normalized, subdomains_agent = x2gobroker.utils.normalize_hostnames(busy_servers) if len(subdomains_agent) <= 1: - # all X2Go servers in the multi-node server farm are in the same DNS subdomain # we can operate on hostname-only hostnames server_list = server_list_normalized hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-51-g6f11897
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 6f11897f570fdea9e1c1353ac2a614b253183a7e (commit) from 632a954598d35de61d9e77d2bc716ccb52763622 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6f11897f570fdea9e1c1353ac2a614b253183a7e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 16:49:09 2013 +0200 Fix remote agent detection in case of some agents being down. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fb7a240..8a05da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low Broker logging instance. (Fixes: #217). - Fix the ping task in x2gobroker-agent.pl, process it without checking the given username. + - Fix remote agent detection in case of some agents being down. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 0cfd81c..8736c78 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -830,11 +830,11 @@ class X2GoBroker(object): if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): break except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: - pass + remote_agent = None server_list = server_list[0:-1] - else: + if remote_agent is None: logger_broker.warning('base_broker.X2GoBroker.get_remote_agent(): failed to allocate any broker agent (query-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent)) elif agent_query_mode == u'LOCAL': hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits