[X2Go-Commits] [x2goserver] 01/01: Allow usernames in session IDs of length 48 chars.
git-admin at x2go.org
git-admin at x2go.org
Mon Dec 8 13:07:31 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 896b4c64ba4cddb547f1885841bfda94f84147df
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Dec 8 12:59:38 2014 +0100
Allow usernames in session IDs of length 48 chars.
---
debian/changelog | 1 +
x2goserver/lib/x2gosqlitewrapper.pl | 2 +-
x2goserver/lib/x2goutils.pm | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9b8fcba..d8161d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
backend. (Fixes: #664).
- Improve sanitizer, use 'x2gosid' sanitizer for session IDs everywhere.
Drop unused 'pnixusername' sanitizer in 4.0.1.x release of X2Go Server.
+ - Allow usernames in session IDs of length 48 chars.
* debian/control:
+ Add D (x2goserver): libfile-which-perl.
+ Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2).
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index c51b7f7..6609d19 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -64,7 +64,7 @@ sub sanitizer {
$string =~ s/[^a-zA-Z0-9\_\-\$\.\@]//g;
if ($string =~ /^([a-zA-Z0-9\_\-\$\.\@]*)$/) {
$string = $1;
- if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,31}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-\.]*\_dp[\d]{1,2}$/) {
+ if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,47}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-\.]*\_dp[\d]{1,2}$/) {
if ((length($1) > 0) and (length($1) < 48)){
return $string;
} else {return 0;}
diff --git a/x2goserver/lib/x2goutils.pm b/x2goserver/lib/x2goutils.pm
index 0982df2..14f8d1a 100644
--- a/x2goserver/lib/x2goutils.pm
+++ b/x2goserver/lib/x2goutils.pm
@@ -43,7 +43,7 @@ sub sanitizer {
$string =~ s/[^a-zA-Z0-9\_\-\$\.\@]//g;
if ($string =~ /^([a-zA-Z0-9\_\-\$\.\@]*)$/) {
$string = $1;
- if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,31}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-\.]*\_dp[\d]{1,2}$/) {
+ if ($string =~ /^([a-zA-Z\_][a-zA-Z0-9\_\-\.\@]{0,47}[\$]?)\-([\d]{2,4})\-([\d]{9,12})\_[a-zA-Z0-9\_\-\.]*\_dp[\d]{1,2}$/) {
if ((length($1) > 0) and (length($1) < 48)){
return $string;
} else {return 0;}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list