x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - tornado (branch) created: 0.0.0.5-50-gb6a0588
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, tornado has been created at b6a0588c151b322dfcf2418b6d6df289946710d1 (commit) - Log ----------------------------------------------------------------- commit b6a0588c151b322dfcf2418b6d6df289946710d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 18:06:31 2013 +0100 Switch from webpy to using tornado as http engine. commit 9fcd2186c96f07d41302fae68112e9b3dd7fb66e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 17:46:20 2013 +0100 If X2Go Session Broker's PAM Auth Service is not available, try to fallback to direct PAM authentication (only works if x2gobroker runs as super-user root). ----------------------------------------------------------------------- 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.0.5-48-g838bdf9
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, master has been updated via 838bdf9fccfd43bae4b23ccc141d75fccaeaa7de (commit) from e468013decdfd46a467b5dc7f66757f5a91fdd1b (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 838bdf9fccfd43bae4b23ccc141d75fccaeaa7de Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 02:22:25 2013 +0100 comment out authkey removal for now ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 3 ++- x2gobroker/brokers/base_broker.py | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 04e379c..fb6d052 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -26,6 +26,7 @@ import sys import argparse import socket import logging +import thread import web from web.wsgiserver import CherryPyWSGIServer @@ -130,6 +131,6 @@ application = app.wsgifunc() # run the web.py standalone daemon... if __name__ == "__main__": try: - app.run() + thread.start_new_thread(app.run(), ()) except socket.error, e: print (e) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index a19f6d9..6062815 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -871,13 +871,13 @@ class X2GoBroker(object): selected_session.update({ 'authentication_privkey': privkey, }) - x2gobroker.agent.delete_authorized_key(username=username, - pubkey_hash=pubkey, - authorized_keys_file=self.get_authorized_keys_file(profile_id), - query_mode=agent_query_mode, - remote_agent=remote_agent, - delay_deletion=60, - ), + #x2gobroker.agent.delete_authorized_key(username=username, + # pubkey_hash=pubkey, + # authorized_keys_file=self.get_authorized_keys_file(profile_id), + # query_mode=agent_query_mode, + # remote_agent=remote_agent, + # delay_deletion=60, + #), return selected_session 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.0.5-47-ge468013
by git-admin＠x2go.org 05 Mar '13

05 Mar '13

The branch, master has been updated via e468013decdfd46a467b5dc7f66757f5a91fdd1b (commit) from 20c45b24317270cad9d201b307f2a2041bf8b57d (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 e468013decdfd46a467b5dc7f66757f5a91fdd1b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 5 01:18:04 2013 +0100 make sure no empty lines remain in authorized_keys files ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 9511858..52a26d5 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -88,7 +88,7 @@ sub DelAuthKey { $authkeyfile = "$home/$authkeyfile"; } - system("su - $uid -c \"sed -e s\!'$pubkey'\!''\! -i $authkeyfile\" 1>/dev/null 2>/dev/null"); + system("su - $uid -c \"sed -e s\!'$pubkey\\n'\!''\! -e '/^\$/d' -i $authkeyfile\" 1>/dev/null 2>/dev/null"); } $< = $>; 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.0.5-46-g20c45b2
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, master has been updated via 20c45b24317270cad9d201b307f2a2041bf8b57d (commit) from fee39f5a3c8de2ab8ac1d3c32e534a568aa50f74 (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 20c45b24317270cad9d201b307f2a2041bf8b57d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 23:51:06 2013 +0100 simplify sanity checks in addauthkey/delauthkey function of x2gobroker agent ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 1e98d9d..9511858 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -61,16 +61,14 @@ sub AddAuthKey $authkeyfile =~ s/%%/%/; my $authkeydir = dirname($authkeyfile); - - # make sure dir and file for authorized_keys do exist - if ( ! -d $authkeydir ) + if ( ! $authkeyfile =~ m/\/.*/ ) { - system ("su - $uid -c \"mkdir -p $authkeydir\""); - } - if( ! -e $authkeyfile ) - { - system ("su - $uid -c \"touch $authkeyfile\""); + $authkeyfile = "$home/$authkeyfile"; } + + # make sure dir and file for authorized_keys do exist + system ("su - $uid -c \"mkdir -p $authkeydir\""); + system ("su - $uid -c \"touch $authkeyfile\""); my $authorized_keys = `su - $uid -c \"cat $authkeyfile\"`; if ( ! ( $authorized_keys =~ m/$pubkey/ ) ) { @@ -86,17 +84,11 @@ sub DelAuthKey $authkeyfile =~ s/%u/$uid/; $authkeyfile =~ s/%h/$home/; $authkeyfile =~ s/%%/%/; - - my $authkeydir = dirname($authkeyfile); - - if( -e $authkeyfile ) + if ( ! $authkeyfile =~ m/\/.*/ ) { - my $authorized_keys = `su - $uid -c \"cat $authkeyfile\"`; - if ( ! ( $authorized_keys =~ m/$pubkey/ ) ) - { - system("su - $uid -c \"sed -e s/'$pubkey'// -i $authkeyfile\""); - } + $authkeyfile = "$home/$authkeyfile"; } + system("su - $uid -c \"sed -e s\!'$pubkey'\!''\! -i $authkeyfile\" 1>/dev/null 2>/dev/null"); } $< = $>; 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.0.5-45-gfee39f5
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, master has been updated via fee39f5a3c8de2ab8ac1d3c32e534a568aa50f74 (commit) from fa1b06962977c3c10d90af3544e2d1aa8a7ac4e4 (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 fee39f5a3c8de2ab8ac1d3c32e534a568aa50f74 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 23:08:30 2013 +0100 parially undo fdfc849b6c698e4008356fc4b35c206d7fceb73c ----------------------------------------------------------------------- Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index 016f31b..38cfc6b 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), cdbs (>= 0.4.90~), - dpkg-dev (>= 1.15.5.6~), + dpkg-dev (>= 1.16.1~), python (>= 2.6.5-0~), python-setuptools, Standards-Version: 3.9.3 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.0.5-44-gfa1b069
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, master has been updated via fa1b06962977c3c10d90af3544e2d1aa8a7ac4e4 (commit) via f74dbc86da2fee649b2c8e75104e7b45885742d4 (commit) via fdfc849b6c698e4008356fc4b35c206d7fceb73c (commit) from a72d1e92b9dfdde11637cf1a10022a8685e16075 (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 fa1b06962977c3c10d90af3544e2d1aa8a7ac4e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 23:06:34 2013 +0100 fix missing function call args commit f74dbc86da2fee649b2c8e75104e7b45885742d4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 23:06:18 2013 +0100 daemonized delayed_execution thread commit fdfc849b6c698e4008356fc4b35c206d7fceb73c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 23:05:56 2013 +0100 be less strict with python and dpkg-dev build-dependencies to allow building against Ubuntu lucid ----------------------------------------------------------------------- Summary of changes: debian/control | 4 ++-- lib/x2gobroker-agent.pl | 2 +- x2gobroker/agent.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 3190f5c..016f31b 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), cdbs (>= 0.4.90~), - dpkg-dev (>= 1.16.1~), - python (>= 2.6.6-3~), + dpkg-dev (>= 1.15.5.6~), + python (>= 2.6.5-0~), python-setuptools, Standards-Version: 3.9.3 XS-Python-Version: >= 2.4 diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 9b20e40..1e98d9d 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -187,7 +187,7 @@ if($mode eq 'delauthkey') my $authkeyfile = shift or die; InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; - DelAuthKey($uidNumber, $gidNumber, $home); + DelAuthKey($uid, $uidNumber, $gidNumber, $home, $pubkey, $authkeyfile); } if($mode eq 'suspend') diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 23ea1bc..b32489a 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -40,6 +40,7 @@ class delayed_execution(threading.Thread): self.agent_func = agent_func self.delay = delay self.kwargs = kwargs + self.daemon = True self.start() def run(self): 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

python-pampy.git - lucid-backports (branch) updated: debian/0.1.4-1-6-g6fc8b50
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, lucid-backports has been updated via 6fc8b50aa8018aaafaf9a5b6b581044118f41572 (commit) from 0b9b96e06e13d168845ba64f1704ad8412bad6d9 (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 6fc8b50aa8018aaafaf9a5b6b581044118f41572 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 22:27:32 2013 +0100 release of 0.1.4-0~bpo-lucid ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f264d67..7a53e30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ python-pampy (0.1.4-0~bpo-lucid) unstable; urgency=low * Initial release. (Closes: #694666) - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 28 Nov 2012 22:52:46 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Mar 2013 22:26:50 +0100 hooks/post-receive -- python-pampy.git (providing Launchpad import (for Ubuntu packages), related to X2Go project) 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-pampy.git" (providing Launchpad import (for Ubuntu packages), related to X2Go project).

1 0

python-pampy.git - lucid-backports (branch) updated: debian/0.1.4-1-5-g0b9b96e
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, lucid-backports has been updated via 0b9b96e06e13d168845ba64f1704ad8412bad6d9 (commit) from 72af31e12a41a6d3609eb921a280378a2335ccd9 (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 0b9b96e06e13d168845ba64f1704ad8412bad6d9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 22:26:32 2013 +0100 provide python-pampy for Ubuntu lucid without using cdbs ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 1 - debian/rules | 9 +++++++-- debian/source/format | 2 +- pam.egg-info/SOURCES.txt | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d8ab59d..f264d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-pampy (0.1.4-0~x2go1) unstable; urgency=low +python-pampy (0.1.4-0~bpo-lucid) unstable; urgency=low * Initial release. (Closes: #694666) diff --git a/debian/control b/debian/control index 93186da..e605c79 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian Python Modules Team <python-modules-team(a)lists.alioth.debian. Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: - cdbs (>= 0.4.90~), debhelper (>= 7.50~), python (>= 2.6.5-0~), python-setuptools, diff --git a/debian/rules b/debian/rules index b466065..6803567 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,9 @@ #!/usr/bin/make -f +# debian/rules file - for python-pampy +# Based on sample debian/rules file - for GNU Hello (1.3). +# Copyright 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk \ No newline at end of file +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + +%: + dh ${@} ${WITH_PYTHON2} diff --git a/debian/source/format b/debian/source/format index 46ebe02..9f67427 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (native) \ No newline at end of file diff --git a/pam.egg-info/SOURCES.txt b/pam.egg-info/SOURCES.txt index 54cd8af..a1c574e 100644 --- a/pam.egg-info/SOURCES.txt +++ b/pam.egg-info/SOURCES.txt @@ -1,4 +1,5 @@ pam.py +setup.cfg setup.py pam.egg-info/PKG-INFO pam.egg-info/SOURCES.txt hooks/post-receive -- python-pampy.git (providing Launchpad import (for Ubuntu packages), related to X2Go project) 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-pampy.git" (providing Launchpad import (for Ubuntu packages), related to X2Go project).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.5-41-ga72d1e9
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, master has been updated via a72d1e92b9dfdde11637cf1a10022a8685e16075 (commit) from 1cd026fbcc45b4688fcc88ea7be6dcc52e6488a7 (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 a72d1e92b9dfdde11637cf1a10022a8685e16075 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 16:26:50 2013 +0100 add missing import, fix typo in debug message ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 1c83908..23ea1bc 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -23,6 +23,7 @@ import subprocess import paramiko import cStringIO import time +import threading import x2gobroker._paramiko x2gobroker._paramiko.monkey_patch_paramiko() @@ -224,7 +225,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ if delay_deletion > 0: delayed_execution(delete_authorized_key, delay=60, username=username, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, ) - logger_broker.debug('Scheduled deletion of authorized key in {delay}: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname)) + logger_broker.debug('Scheduled deletion of authorized key in {delay}s: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname)) else: if query_mode.upper() == u'LOCAL': return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ]) 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.0.5-40-g1cd026f
by git-admin＠x2go.org 04 Mar '13

04 Mar '13

The branch, master has been updated via 1cd026fbcc45b4688fcc88ea7be6dcc52e6488a7 (commit) from 41fd2fad0c72117701608c83ced9b6e35221e9fd (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 1cd026fbcc45b4688fcc88ea7be6dcc52e6488a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 4 16:24:51 2013 +0100 replace time with gevent in import section ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 037450b..1c83908 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -22,7 +22,7 @@ import subprocess import paramiko import cStringIO -import gevent +import time import x2gobroker._paramiko x2gobroker._paramiko.monkey_patch_paramiko() 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