[X2Go-Commits] [x2goserver] 01/01: Handle AD domain users gracefully when X2Go is used with SQLite DB backend. (Fixes: #664).

git-admin at x2go.org git-admin at x2go.org
Sat Dec 6 22:46:56 CET 2014


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 5c11f3c67f14db5f0e751f491017ab9f17c152d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 6 22:46:08 2014 +0100

    Handle AD domain users gracefully when X2Go is used with SQLite DB backend. (Fixes: #664).
---
 X2Go/Server/DB/SQLite3.pm |    8 ++++++++
 debian/changelog          |    2 ++
 2 files changed, 10 insertions(+)

diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm
index d693809..bff7343 100644
--- a/X2Go/Server/DB/SQLite3.pm
+++ b/X2Go/Server/DB/SQLite3.pm
@@ -653,9 +653,17 @@ sub check_user
 {
 	my $sid=shift or die "argument \"session_id\" missed";
 	return if $realuser eq "root";
+
 	# session id looks like someuser-51-1304005895_stDgnome-session_dp24
 	# during DB insertsession it only looks like someuser-51-1304005895
+
+	# derive the session's user from the session name/id
 	my $user = "$sid";
+
+	# handle ActiveDirectory Domain user accounts gracefully
+	$realuser =~ s/\\//;
+
+	# perform the user check
 	$user =~ s/($realuser-[0-9]{2,}-[0-9]{10,}_st(D|R).*|.*-[0-9]{2,}-[0-9]{10,}_stS(0|1)XSHAD$realuser.*)/$realuser/;
 	$user eq $realuser or die "$realuser is not authorized";
 }
diff --git a/debian/changelog b/debian/changelog
index 739e1f4..90c7911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -191,6 +191,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
       clipboard mode feature (and probably other code changes).
     - Document session startup / resumption failures (and their reasons) in
       server-side log output.
+    - Handle AD domain users gracefully when X2Go is used with SQLite DB
+      backend. (Fixes: #664).
   * debian/control:
     + Add D (x2goserver): libfile-which-perl.
     + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2).

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


More information about the x2go-commits mailing list