[X2Go-Commits] [x2gobroker] 01/01: X2Go Broker Agent: Test if queried username exists on the system before performing the query.

git-admin at x2go.org git-admin at x2go.org
Thu Sep 11 12:13:31 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 248efd1ad9e7fc936e91843d13c1b1798900f1c6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 11 12:13:22 2014 +0200

    X2Go Broker Agent: Test if queried username exists on the system before performing the query.
---
 debian/changelog        |    2 ++
 lib/x2gobroker-agent.pl |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3c9000..91ef098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -146,6 +146,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       is given via the cmdline, obtain it from other means (via
       x2gobroker.defaults).
     - Rename LICENSE file to COPYING.
+    - X2Go Broker Agent: Test if queried username exists on the system before
+      performing the query.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 1ecab8e..dcc18a7 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -146,9 +146,13 @@ if($mode eq 'availabletasks')
 
 my  ($uid, $passwd, $uidNumber, $gidNumber, $quota, $comment, $gcos, $home, $shell, $expire) = getpwnam($username);
 
-if($uidNumber < 1000)
+if(!defined $uidNumber)
 {
-	die "operation on system user $uidNumber";
+	die "no such user: $username";
+}
+elsif($uidNumber < 1000)
+{
+	die "operation on system user: $username (with UID number: $uidNumber");
 }
 
 if($mode eq 'listsessions' && which('x2golistsessions'))

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list