[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-29-ge298bd1

[X2go dev team]

The branch, master has been updated
       via  e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd (commit)
       via  b4684ddfafa899ff10de734b9b0957dcd38909c2 (commit)
      from  305f7e897420aa9b0e151ffd37b7e1dd62def9e8 (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 e298bd19efb2fc0b1e7d1ec256332f8d9871d2fd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 22 00:23:50 2012 +0100

    Tolerate user names containing "-" characters (SQLite DB backend).

commit b4684ddfafa899ff10de734b9b0957dcd38909c2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 21 23:39:17 2012 +0100

    Revert "Tolerate user names containing "-" characters (SQLite DB backend)."
    
    This reverts commit 305f7e897420aa9b0e151ffd37b7e1dd62def9e8.

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

Summary of changes:
 x2goserver/lib/x2gosqlitewrapper.pl |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index c09f3fc..2f6512e 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -322,24 +322,11 @@ sub checkroot
 sub check_user
 {
 	my $sid=shift or die "argument \"session_id\" missed";
-	# session id looks like someuser-51-1304005895_stDgnome-session_dp24
-	$sid = standardize_sid($sid);
 	return if $realuser eq "root";
-	# pass $sid backwards so that we can tolerate "-" chars in user names
-	my ($f4, $f3, $f2, @user) = reverse(split('-', $sid,));
-	my $user = join('-', reverse(@user));
-	$user eq $realuser or die "$realuser is not authorized (should be $user)";
-}
-
-sub standardize_sid
-{
-	my $sid=shift;
-	my @sid_fields = split('-', $sid);
-	while (@sid_fields <= 4)
-	{
-		push(@sid_fields, ('DUMMY'));
-	}
-	return join('-', @sid_fields);
+	# session id looks like someuser-51-1304005895_stDgnome-session_dp24
+	my $user = "$sid";
+	$user =~ s/$realuser-[0-9]+-[0-9]+.*/$realuser/;
+	$user eq $realuser or die "$realuser is not authorized";
 }
 
 sub fetchrow_printall_array


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).