[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-15-geeb50c1

[X2Go dev team]

The branch, master has been updated
       via  eeb50c1fbd89bae051e3a4f7cdc85de8f55dc976 (commit)
      from  96e694c2c28c08352c3f070c90e183f66bd1b509 (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 eeb50c1fbd89bae051e3a4f7cdc85de8f55dc976
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 18 21:32:09 2013 +0200

    SSH broker: Only allow context change to another user for the magic user (default: x2gobroker).

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker   |    3 +++
 debian/changelog |    2 ++
 2 files changed, 5 insertions(+)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index 3c1426d..cb6062b 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -117,6 +117,9 @@ if __name__ == "__main__":
             logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'')
         if cmdline_args.user is None:
             cmdline_args.user = os.environ['LOGNAME']
+        elif cmdline_args.user != x2gobroker.defaults.X2GOBROKER_DAEMON_USER:
+            logger_broker.warn('denying context change to user `{user}\', only allowed for magic user `{magic_user}\''.format(user=cmdline_args.user, magic_user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
+            cmdline_args.user = os.environ['LOGNAME']
         if cmdline_args.task is None:
             print("")
             p.print_usage()
diff --git a/debian/changelog b/debian/changelog
index 74167b8..94431cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - Add SSH support to X2Go Session Broker. (Fixes: #153).
     - Move x2gobroker executable to /usr/bin.
     - Update x2gobroker man page.
+    - SSH broker: Only allow context change to another user for the
+      magic user (default: x2gobroker).
     - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275).
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.


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