This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 9fa371e HTTP broker: Add &login=<server_user> support to plain and json broker frontends. new c6d8a32 Ignore SSH broker events for now. Not sure if we will ever support that. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/x2gobroker | 25 +++++++++++++++++++++++++ debian/changelog | 1 + 2 files changed, 26 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit c6d8a3246819dbbcaed0b2c5622051ce47563c78 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 14 16:34:27 2018 +0100 Ignore SSH broker events for now. Not sure if we will ever support that. --- bin/x2gobroker | 25 +++++++++++++++++++++++++ debian/changelog | 1 + 2 files changed, 26 insertions(+) diff --git a/bin/x2gobroker b/bin/x2gobroker index db73176..9a9191f 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -110,6 +110,24 @@ if __name__ == "__main__": import setproctitle setproctitle.setproctitle(os.path.basename(sys.argv[0])) + index = 0 + argv = [] + argv.append(sys.argv[0]) + double_dash_pos = 0 + double_dash_argv = [] + for arg in sys.argv[1:]: + index += 1 + if double_dash_pos == 0 and arg == "--": + double_dash_pos = index + continue + + if double_dash_pos > 0: + double_dash_argv.append(arg) + else: + argv.append(arg) + + sys.argv = argv + general_options = [ {'args':['-M','--mode'], 'default': 'SSH', 'metavar': 'BROKER_MODE', 'help': 'Mode of the X2Go Session Broker to run in (available: SSH, HTTP)', }, {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, @@ -134,6 +152,7 @@ if __name__ == "__main__": {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon)', }, {'args':['--user'], 'default': None, 'metavar': 'USER_NAME', 'help': 'Operate on behalf of this X2Go Broker user name', }, {'args':['--login'], 'default': None, 'metavar': 'LOGIN_NAME', 'help': 'Operate on behalf of this X2Go Server user name', }, + {'args':['--event'], 'default': None, 'metavar': 'EVENT_NAME', 'help': 'not-yet supported feature, we simply ignore this option for now...', }, {'args':['--auth-cookie', '--next-authid', '--authid', ], 'default': None, 'metavar': 'AUTH_ID', 'help': 'Pre-shared (dynamic) authentication ID', }, {'args':['--profile-id', '--sid', ], 'default': None, 'metavar': 'PROFILE_ID', 'help': 'for task: the profile ID selected from the list of available session profiles', }, {'args':['--backend'], 'default': None, 'metavar': 'BROKER_BACKEND', 'help': 'select a non-default broker backend', }, @@ -183,6 +202,12 @@ if __name__ == "__main__": logger_broker.error('Invalid mode selected. Available: SSH or HTTP.') sys.exit(-1) + # ignore EVENTS for now... + if cmdline_args.event and cmdline_args.mode == 'SSH': + logger_broker.warning('X2Go client sent event: {event_name}. Events are not supported, yet. Ignoring that...'.format(event_name=cmdline_args.event)) + logger_broker.warning('X2Go client\'s event info is: {event_info}. Events are not supported, yet. Ignoring that...'.format(event_info=double_dash_argv)) + sys.exit(0) + ### SSH broker elif cmdline_args.mode.upper() == 'SSH' and not PROG_NAME == 'x2gobroker-daemon': if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...') diff --git a/debian/changelog b/debian/changelog index 24d8990..726cd82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium the LOCAL broker agent is executed setuid root, we cannot Popen.terminate() (which is unneeded anyway) the process after its execution. + - Ignore SSH broker events for now. Not sure if we will ever support that. * debian/*: + Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git