x2go-commits October 2013

x2go-commits@lists.x2go.org

2 participants
100 discussions

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-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-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

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-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-48-g84eb4bb
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 84eb4bbf57ac2221c05a1c8284c7490e9231ad81 (commit) from 96a80ded18ff40b118ea265a59f61239010f823b (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 84eb4bbf57ac2221c05a1c8284c7490e9231ad81 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 15:56:23 2013 +0200 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). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2gobroker/agent.py | 3 +++ 2 files changed, 6 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7cb7c77..1e9ddfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,9 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Catch RequestHandler errors and write them to the error log channel. - Raised verbosity level to INFO for session broker utilities. - Add sanity checks to x2gobroker-pubkeyauthorizer. + - 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). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index be7b0e5..a334382 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -156,6 +156,9 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) logger_broker.debug('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', ' ') + if err: + logger_broker.warning('Remote agent command (host: {remote_agent}) reported an error: {err}'.format(remote_agent=remote_agent['hostname'], err=err)) client.close() if result and result[0].startswith('OK'): return [ r for r in result[1:] if r ] 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-47-g96a80de
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 96a80ded18ff40b118ea265a59f61239010f823b (commit) from 12e0e180bbfe0a10924edbb950bb859f2c576757 (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 96a80ded18ff40b118ea265a59f61239010f823b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 15:24:36 2013 +0200 Add sanity checks to x2gobroker-pubkeyauthorizer. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + sbin/x2gobroker-pubkeyauthorizer | 44 +++++++++++++++++++++++++++----------- 2 files changed, 32 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0a39a49..7cb7c77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low is down). - Catch RequestHandler errors and write them to the error log channel. - Raised verbosity level to INFO for session broker utilities. + - Add sanity checks to x2gobroker-pubkeyauthorizer. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 9588af0..d507cd8 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -27,11 +27,11 @@ import setproctitle import argparse import logging import binascii -import paramiko import urllib import getpass import logging import logging.config +import re from pwd import getpwnam from grp import getgrnam @@ -130,7 +130,7 @@ if __name__ == '__main__': sys.exit(-2) logger_broker.info('Authorizing access to this X2Go server for X2Go Session Broker') - logger_broker.info(' at URL {url}'.format(url=cmdline_args.broker_url)) + logger_broker.info('at URL {url}'.format(url=cmdline_args.broker_url)) if not os.path.exists('{home}/.ssh'.format(home=broker_home)): os.mkdir('{home}/.ssh'.format(home=broker_home)) @@ -138,9 +138,7 @@ if __name__ == '__main__': os.chmod('{home}/.ssh'.format(home=broker_home), 0750) logger_broker.info(' Created {home}/.ssh'.format(home=broker_home)) - # FIXME: this probably needs some sanity checks(?) tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url) - tmpfile = open(tmpfile_name, 'rb') new_pubkeys = [ k for k in tmpfile.read().split('\n') if k ] logger_broker.info(' Found {i} public keys at URL {url}'.format(i=len(new_pubkeys), url=cmdline_args.broker_url)) @@ -157,17 +155,37 @@ if __name__ == '__main__': i = 0 for new_pubkey in new_pubkeys: - i += 1 - if new_pubkey not in already_authorized_keys: - append_authorized_keys.write('{k}\n'.format(k=new_pubkey)) - logger_broker.info(' Adding new public key (counter={i}) to {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) + + # ignore empty lines + if not new_pubkey: + continue + + # check key integrity! + is_key = False + if re.match(r'ssh-dss AAAAB3NzaC1kc3MA', new_pubkey): + is_key = True + elif re.match(r'ssh-rsa AAAAB3NzaC1yc2EA', new_pubkey): + is_key = True + + if is_key is False: + continue else: - logger_broker.warning(' Skipping new public key (counter={i}), already in {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) + i += 1 + if new_pubkey not in already_authorized_keys: + append_authorized_keys.write('{k}\n'.format(k=new_pubkey)) + logger_broker.info(' Adding new public key (counter={i}) to {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) + else: + logger_broker.warning(' Skipping new public key (counter={i}), already in {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) append_authorized_keys.close() - # set proper file permissions - os.chown('{home}/.ssh/authorized_keys'.format(home=broker_home), broker_uidnumber, broker_gidnumber) - os.chmod('{home}/.ssh/authorized_keys'.format(home=broker_home), 0644) + if i == 0: + logger_broker.error('No public SSH key was processed.') + logger_broker.error('Check the URL {url}'.format(url=cmdline_args.broker_url)) + logger_broker.error('manually from a webbrowser.') + else: + # set proper file permissions + os.chown('{home}/.ssh/authorized_keys'.format(home=broker_home), broker_uidnumber, broker_gidnumber) + os.chmod('{home}/.ssh/authorized_keys'.format(home=broker_home), 0644) - logger_broker.info('Completed successfully: X2Go Session Broker\'s PubKey Authorizer.'.format(url=cmdline_args.broker_url)) + logger_broker.info('Completed successfully: X2Go Session Broker\'s PubKey Authorizer.'.format(url=cmdline_args.broker_url)) 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-46-g12e0e18
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 12e0e180bbfe0a10924edbb950bb859f2c576757 (commit) from 50a8252b21cdca1ddfd64a6ff2f0991717de9cb7 (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 12e0e180bbfe0a10924edbb950bb859f2c576757 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 14:19:15 2013 +0200 Raised verbosity level to INFO for session broker utilities. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + sbin/x2gobroker-keygen | 4 +++- sbin/x2gobroker-pubkeyauthorizer | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f999f4c..0a39a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low reduces timeout duration if the host running the queried broker agent is down). - Catch RequestHandler errors and write them to the error log channel. + - Raised verbosity level to INFO for session broker utilities. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 6c1d723..93c93a6 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -57,8 +57,10 @@ if os.geteuid() == 0: logger_error.propagate = 1 # raise log level to DEBUG if requested... -if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: +if x2gobroker.defaults.X2GOBROKER_DEBUG: logger_broker.setLevel(logging.DEBUG) +else: + logger_broker.setLevel(logging.INFO) logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) logger_broker.info('Setting up the key generator\'s environment...') diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 7596207..9588af0 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -80,6 +80,8 @@ logger_error.propagate = 0 # raise log level to DEBUG if requested... if X2GOBROKER_DEBUG: logger_broker.setLevel(logging.DEBUG) +else: + logger_broker.setLevel(logging.INFO) logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) logger_broker.info('Setting up the »PubKey Authorizer«\'s environment...') 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-43-gf5b9abf
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via f5b9abf8162a1d05791533844f0b8bddc4678dfe (commit) from d149ad7c51dcedacf68fea315ef281b0a543ffa4 (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 f5b9abf8162a1d05791533844f0b8bddc4678dfe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 12:57:30 2013 +0200 fix session profile based agent-query-mode settings ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 6196f4d..0cfd81c 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -478,7 +478,7 @@ class X2GoBroker(object): _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: _agent_query_mode = _profile[u'broker-agent-query-mode'] - logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) + logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_agent_query_mode)) elif self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): _backend_agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() 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

← 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

x2go-commits October 2013