[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.5-22-gef21a2c

[X2Go dev team]

The branch, master has been updated
       via  ef21a2cdd0fdba3efcd769c93f63d69a2bb377da (commit)
      from  5c50b38d3bba839076228f8aec49823092c3c0f6 (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 ef21a2cdd0fdba3efcd769c93f63d69a2bb377da
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 1 23:28:08 2013 +0100

    change parameter names of genkeypair(): reflect the actual situation better

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

Summary of changes:
 x2gobroker/agent.py               |    8 ++++----
 x2gobroker/brokers/base_broker.py |    4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index ba746bd..3075d44 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -219,12 +219,12 @@ def get_servers(username, query_mode='LOCAL', remote_agent=None):
     else:
         return call_local_broker_agent(username, mode='getservers', remote_agent=remote_agent)
 
-def genkeypair(username, client_address, key_type='RSA'):
+def genkeypair(local_username, client_address, key_type='RSA'):
     """\
     Generate an SSH pub/priv key pair without writing the private key to file.
 
-    @param username: the key is for this user
-    @type username: C{unicode}
+    @param local_username: the key is for this user
+    @type local_username: C{unicode}
     @param client_address: the key is only valid for this client
     @type client_address: C{unicode}
     @param key_type: either of: RSA, DSA
@@ -248,7 +248,7 @@ def genkeypair(username, client_address, key_type='RSA'):
             pubkey_type = 'ssh-rsa'
         elif key_type == "DSA":
             pubkey_type = 'ssh-dss'
-        pubkey = "from={hostname},no-X11-forwarding,no-pty,no-user-rc {pubkey_type} {pubkey} {username}@{hostname}".format(pubkey=key.get_base64(), pubkey_type=pubkey_type, username=username, hostname=client_address)
+        pubkey = "from={client_address},no-X11-forwarding,no-pty,no-user-rc {pubkey_type} {pubkey} {local_username}@{client_address}".format(pubkey=key.get_base64(), pubkey_type=pubkey_type, local_username=local_username, client_address=client_address)
 
         # assemble the private key
         privkey_obj = cStringIO.StringIO()
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 717113c..7bde5a3 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -849,7 +849,9 @@ class X2GoBroker(object):
         # session auto-start feature
         if self.use_session_autostart(profile_id):
 
-            pubkey, privkey = x2gobroker.agent.genkeypair(username=username, client_address=self.get_client_address())
+            # FIXME: we somehow have to find out about the username of the person at the broker client-side...
+            # using the username used for broker login for now...
+            pubkey, privkey = x2gobroker.agent.genkeypair(local_username=username, client_address=self.get_client_address())
             x2gobroker.agent.add_authorized_key(username=username,
                                                 pubkey_hash=pubkey,
                                                 authorized_keys_file=self.get_authorized_keys_file(profile_id),


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