x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-47-ge29fa6e
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, release/4.0.1.x has been updated via e29fa6e3fcb823fde96ed10e6cb27a6ad0d65a12 (commit) from 4c62b385033f4b5e909367596c54b19ee869edb9 (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 e29fa6e3fcb823fde96ed10e6cb27a6ad0d65a12 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 13:42:32 2014 +0100 Allow dots (".") in sanitized session names. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gostartagent | 2 +- x2goserver/lib/x2godbwrapper.pm | 24 ++++++++++++------------ x2goserver/lib/x2gosqlitewrapper.pl | 32 ++++++++++++++++---------------- x2goserver/lib/x2goutils.pm | 6 +++--- 5 files changed, 33 insertions(+), 32 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9012f3f..9d38b8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -178,6 +178,7 @@ x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low - Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. + - Allow dots (".") in sanitized session names. -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index cd82f27..6ad27e2 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -167,7 +167,7 @@ while [ "$OUTPUT" != "inserted" ]; do SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` # sanitize session name - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-\.]//g"` fi OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 259e567..1315575 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -193,7 +193,7 @@ sub dbsys_getmounts my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); @@ -223,7 +223,7 @@ sub db_getmounts my $sid=shift or die "argument \"session_id\" missed"; if($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts_view where session_id='$sid'"); @@ -253,7 +253,7 @@ sub db_deletemount my $path=shift or die "argument \"path\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); $sth->execute(); @@ -275,7 +275,7 @@ sub db_insertmount my $res_ok=0; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); $sth->execute(); @@ -304,7 +304,7 @@ sub db_insertsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $display = x2goutils::sanitizer('num', $display) or die "argument \"display\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); @@ -334,7 +334,7 @@ sub db_createsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $pid = x2goutils::sanitizer('num', $pid) or die "argument \"pid\" malformed"; $gr_port = x2goutils::sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; $snd_port = x2goutils::sanitizer('num', $snd_port) or die "argument \"snd_port\" malformed"; @@ -365,7 +365,7 @@ sub db_insertport my $sshport=shift or die "argument \"port\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); $sth->execute()or die; @@ -408,7 +408,7 @@ sub db_resume my $fs_port=shift or die "argument \"fs_port\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $gr_port = x2goutils::sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; $snd_port = x2goutils::sanitizer('num', $snd_port) or die "argument \"snd_port\" malformed"; $fs_port = x2goutils::sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; @@ -432,7 +432,7 @@ sub db_changestatus my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); $sth->execute()or die; @@ -452,7 +452,7 @@ sub db_getstatus my $status=''; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); $sth->execute($sid) or die; @@ -566,7 +566,7 @@ sub db_getagent my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid from sessions_view where session_id ='$sid'"); @@ -594,7 +594,7 @@ sub db_getdisplay my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select display from sessions_view where session_id ='$sid'"); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 48278fa..c146b3b 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -60,9 +60,9 @@ sub sanitizer { $string = $1; return $string; } else {return 0;} - } elsif ($type eq "anumazcsdaus") { - $string =~ s/[^a-zA-Z0-9\_\-]//g; - if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { + } elsif ($type eq "pnixusername") { + $string =~ s/[^a-zA-Z0-9\_\-\.]//g; + if ($string =~ /^([a-zA-Z0-9\_\-\.]*)$/) { $string = $1; return $string; } else {return 0;} @@ -149,7 +149,7 @@ elsif($cmd eq "listsessionsroot_all") elsif($cmd eq "getmounts") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my @strings; my $sth=$dbh->prepare("select client, path from mounts where session_id=?"); @@ -165,7 +165,7 @@ elsif($cmd eq "getmounts") elsif($cmd eq "deletemount") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?"); @@ -181,7 +181,7 @@ elsif($cmd eq "deletemount") elsif($cmd eq "deletemounts") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=?"); $sth->execute($sid); @@ -196,7 +196,7 @@ elsif($cmd eq "deletemounts") elsif($cmd eq "insertmount") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; my $client=shift or die "argument \"client\" missed"; check_user($sid); @@ -217,7 +217,7 @@ elsif($cmd eq "insertsession") $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))"); @@ -239,7 +239,7 @@ elsif($cmd eq "createsession") my $fs_port=shift or die"argument \"fs_port\" missed"; $fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?, client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?"); @@ -257,7 +257,7 @@ elsif($cmd eq "insertport") { my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values (?, ?, ?)"); check_user($sid); @@ -274,7 +274,7 @@ elsif($cmd eq "rmport") { my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); check_user($sid); @@ -290,7 +290,7 @@ elsif($cmd eq "resume") { my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $gr_port=shift or die "argument \"gr_port\" missed"; $gr_port = sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; my $snd_port=shift or die "argument \"snd_port\" missed"; @@ -313,7 +313,7 @@ elsif($cmd eq "changestatus") { my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), status=? where session_id = ? and uname=?"); @@ -329,7 +329,7 @@ elsif($cmd eq "changestatus") elsif($cmd eq "getstatus") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("select status from sessions where session_id = ?"); $sth->execute($sid); @@ -415,7 +415,7 @@ elsif($cmd eq "getservers") elsif($cmd eq "getagent") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $agent; check_user($sid); my $sth=$dbh->prepare("select agent_pid from sessions @@ -439,7 +439,7 @@ elsif($cmd eq "getagent") elsif($cmd eq "getdisplay") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $display; check_user($sid); my $sth=$dbh->prepare("select display from sessions diff --git a/x2goserver/lib/x2goutils.pm b/x2goserver/lib/x2goutils.pm index 05aa460..a2330ec 100644 --- a/x2goserver/lib/x2goutils.pm +++ b/x2goserver/lib/x2goutils.pm @@ -38,9 +38,9 @@ sub sanitizer { $string = $1; return $string; } else {return 0;} - } elsif ($type eq "anumazcsdaus") { - $string =~ s/[^a-zA-Z0-9\_\-]//g; - if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { + } elsif ($type eq "pnixusername") { + $string =~ s/[^a-zA-Z0-9\_\-\.]//g; + if ($string =~ /^([a-zA-Z0-9\_\-\.]*)$/) { $string = $1; return $string; } else {return 0;} 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-344-g2250c18
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, master has been updated via 2250c18fe510008caa1969ebb54183706c94d53b (commit) from d3976677451cb417c2281944c25950700ef4fd19 (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 2250c18fe510008caa1969ebb54183706c94d53b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 13:49:05 2014 +0100 Allow dots (".") in sanitized session names. ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB/PostgreSQL.pm | 28 ++++++++++++++-------------- X2Go/Server/DB/SQLite3.pm | 28 ++++++++++++++-------------- X2Go/SupeReNicer.pm | 4 ++-- X2Go/Utils.pm | 6 ++++++ debian/changelog | 1 + x2goserver/bin/x2gostartagent | 2 +- 6 files changed, 38 insertions(+), 31 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index 772bfe6..dbe3eaa 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -179,7 +179,7 @@ sub dbsys_getmounts { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @mounts; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); @@ -199,7 +199,7 @@ sub db_getmounts { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @mounts; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts_view where session_id='$sid'"); @@ -219,7 +219,7 @@ sub db_deletemount { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); @@ -232,7 +232,7 @@ sub db_insertmount { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; my $client=shift or die "argument \"client\" missed"; my $res_ok=0; @@ -255,7 +255,7 @@ sub db_insertsession $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); $sth->execute()or die $_; @@ -270,7 +270,7 @@ sub db_insertshadowsession $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $shadreq_user=shift or die "argument \"shadreq_user\" missed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$shadreq_user','$sid')"); @@ -293,7 +293,7 @@ sub db_createsession my $fs_port=shift or die"argument \"fs_port\" missed"; $fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', @@ -308,7 +308,7 @@ sub db_insertport init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); @@ -322,7 +322,7 @@ sub db_rmport init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from used_ports where server='$server' and session_id='$sid' and port='$sshport'"); @@ -336,7 +336,7 @@ sub db_resume init_db(); my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $gr_port=shift or die "argument \"gr_port\" missed"; $gr_port = sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; my $snd_port=shift or die "argument \"sound_port\" missed"; @@ -356,7 +356,7 @@ sub db_changestatus init_db(); my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); $sth->execute()or die; @@ -368,7 +368,7 @@ sub db_getstatus { init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $status=''; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); @@ -446,7 +446,7 @@ sub db_getagent init_db(); my $agent; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid from sessions_view where session_id ='$sid'"); @@ -467,7 +467,7 @@ sub db_getdisplay init_db(); my $display; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select display from sessions_view where session_id ='$sid'"); diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm index 2894bfa..e1d2a50 100644 --- a/X2Go/Server/DB/SQLite3.pm +++ b/X2Go/Server/DB/SQLite3.pm @@ -152,7 +152,7 @@ sub db_getmounts { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my @strings; my $sth=$dbh->prepare("select client, path from mounts where session_id=?"); @@ -172,7 +172,7 @@ sub db_deletemount { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?"); @@ -190,7 +190,7 @@ sub db_insertmount { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; my $client=shift or die "argument \"client\" missed"; check_user($sid); @@ -215,7 +215,7 @@ sub db_insertsession $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))"); @@ -232,7 +232,7 @@ sub db_insertshadowsession $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $shadreq_user = shift or die "argument \"shadreq_user\" missed"; my $fake_sid = $sid; $fake_sid =~ s/$shadreq_user-/$realuser-/; @@ -259,7 +259,7 @@ sub db_createsession my $fs_port=shift or die"argument \"fs_port\" missed"; $fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?, client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?"); @@ -288,7 +288,7 @@ sub db_createshadowsession my $fs_port=shift or die"argument \"fs_port\" missed"; $fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $shadreq_user = shift or die "argument \"shadreq_user\" missed"; my $fake_sid = $sid; $fake_sid =~ s/^$shadreq_user-/$realuser-/; @@ -311,7 +311,7 @@ sub db_insertport my $dbh = init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values (?, ?, ?)"); check_user($sid); @@ -330,7 +330,7 @@ sub db_rmport my $dbh = init_db(); my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); check_user($sid); @@ -348,7 +348,7 @@ sub db_resume my $dbh = init_db(); my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $gr_port=shift or die "argument \"gr_port\" missed"; $gr_port = sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; my $snd_port=shift or die "argument \"snd_port\" missed"; @@ -373,7 +373,7 @@ sub db_changestatus my $dbh = init_db(); my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), status=? where session_id = ? and uname=?"); @@ -391,7 +391,7 @@ sub db_getstatus { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("select status from sessions where session_id = ?"); $sth->execute($sid); @@ -484,7 +484,7 @@ sub db_getagent { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $agent; check_user($sid); my $sth=$dbh->prepare("select agent_pid from sessions @@ -510,7 +510,7 @@ sub db_getdisplay { my $dbh = init_db(); my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $display; check_user($sid); my $sth=$dbh->prepare("select display from sessions diff --git a/X2Go/SupeReNicer.pm b/X2Go/SupeReNicer.pm index 0f8a3cb..afda624 100644 --- a/X2Go/SupeReNicer.pm +++ b/X2Go/SupeReNicer.pm @@ -115,7 +115,7 @@ sub superenice { $agentPid = sanitizer("num",$agentPid); # We're only working with "portable" unix usernames. - $userID = sanitizer("anumazcsdaus",$userID); + $userID = sanitizer("pnixusername",$userID); # So if the sanitizer returns something we'll do this.... if ($userID) { @@ -194,7 +194,7 @@ sub superenice { close(XGOLS); foreach my $nUser (keys %niceUsers) { - $nUser = sanitizer("anumazcsdaus",$nUser); + $nUser = sanitizer("pnixusername",$nUser); # We're only working with "portable" unix usernames.. if ($nUser) { diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm index 021af1b..9da44f4 100644 --- a/X2Go/Utils.pm +++ b/X2Go/Utils.pm @@ -102,6 +102,12 @@ sub sanitizer { if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { $string = $1; return $string; + } else {return 0;} + } elsif ($type eq "pnixusername") { + $string =~ s/[^a-zA-Z0-9\_\-\.]//g; + if ($string =~ /^([a-zA-Z0-9\_\-\.]*)$/) { + $string = $1; + return $string; } else {return 0;} } elsif ($type eq "SOMETHINGELSE") { return 0; diff --git a/debian/changelog b/debian/changelog index 617565d..5e522a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -275,6 +275,7 @@ x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low - Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. + - Allow dots (".") in sanitized session names. -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index cd690c1..17beae7 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -172,7 +172,7 @@ while [ "$OUTPUT" != "inserted" ]; do SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` # sanitize session name - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-\.]//g"` fi if [ -n "$SHADREQ_USER" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "initializing new shadow session with ID $SESSION_NAME" 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).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.7-15-g087d879
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, release/4.0.0.x has been updated via 087d879cf71f6b30a8cad7be2657dd754322e504 (commit) from 78e482fabf51d1e0099951f3191f7cfa6e24e21c (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 087d879cf71f6b30a8cad7be2657dd754322e504 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 13:42:32 2014 +0100 Allow dots (".") in sanitized session names. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gostartagent | 2 +- x2goserver/lib/x2godbwrapper.pm | 24 ++++++++++++------------ x2goserver/lib/x2gosqlitewrapper.pl | 32 ++++++++++++++++---------------- x2goserver/lib/x2goutils.pm | 6 +++--- 5 files changed, 33 insertions(+), 32 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7f70984..b08e070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low - Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. + - Allow dots (".") in sanitized session names. -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 8c5bc21..b54d93f 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -157,7 +157,7 @@ while [ "$OUTPUT" != "inserted" ]; do SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` # sanitize session name - SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-\.]//g"` fi OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index 259e567..1315575 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -193,7 +193,7 @@ sub dbsys_getmounts my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); @@ -223,7 +223,7 @@ sub db_getmounts my $sid=shift or die "argument \"session_id\" missed"; if($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select client, path from mounts_view where session_id='$sid'"); @@ -253,7 +253,7 @@ sub db_deletemount my $path=shift or die "argument \"path\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); $sth->execute(); @@ -275,7 +275,7 @@ sub db_insertmount my $res_ok=0; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); $sth->execute(); @@ -304,7 +304,7 @@ sub db_insertsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $display = x2goutils::sanitizer('num', $display) or die "argument \"display\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); @@ -334,7 +334,7 @@ sub db_createsession my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $pid = x2goutils::sanitizer('num', $pid) or die "argument \"pid\" malformed"; $gr_port = x2goutils::sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; $snd_port = x2goutils::sanitizer('num', $snd_port) or die "argument \"snd_port\" malformed"; @@ -365,7 +365,7 @@ sub db_insertport my $sshport=shift or die "argument \"port\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); $sth->execute()or die; @@ -408,7 +408,7 @@ sub db_resume my $fs_port=shift or die "argument \"fs_port\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; $gr_port = x2goutils::sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; $snd_port = x2goutils::sanitizer('num', $snd_port) or die "argument \"snd_port\" malformed"; $fs_port = x2goutils::sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; @@ -432,7 +432,7 @@ sub db_changestatus my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); $sth->execute()or die; @@ -452,7 +452,7 @@ sub db_getstatus my $status=''; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select status from sessions_view where session_id = '$sid'"); $sth->execute($sid) or die; @@ -566,7 +566,7 @@ sub db_getagent my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid from sessions_view where session_id ='$sid'"); @@ -594,7 +594,7 @@ sub db_getdisplay my $sid=shift or die "argument \"session_id\" missed"; if ($backend eq 'postgres') { - $sid = x2goutils::sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = x2goutils::sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select display from sessions_view where session_id ='$sid'"); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 48278fa..c146b3b 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -60,9 +60,9 @@ sub sanitizer { $string = $1; return $string; } else {return 0;} - } elsif ($type eq "anumazcsdaus") { - $string =~ s/[^a-zA-Z0-9\_\-]//g; - if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { + } elsif ($type eq "pnixusername") { + $string =~ s/[^a-zA-Z0-9\_\-\.]//g; + if ($string =~ /^([a-zA-Z0-9\_\-\.]*)$/) { $string = $1; return $string; } else {return 0;} @@ -149,7 +149,7 @@ elsif($cmd eq "listsessionsroot_all") elsif($cmd eq "getmounts") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my @strings; my $sth=$dbh->prepare("select client, path from mounts where session_id=?"); @@ -165,7 +165,7 @@ elsif($cmd eq "getmounts") elsif($cmd eq "deletemount") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?"); @@ -181,7 +181,7 @@ elsif($cmd eq "deletemount") elsif($cmd eq "deletemounts") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=?"); $sth->execute($sid); @@ -196,7 +196,7 @@ elsif($cmd eq "deletemounts") elsif($cmd eq "insertmount") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $path=shift or die "argument \"path\" missed"; my $client=shift or die "argument \"client\" missed"; check_user($sid); @@ -217,7 +217,7 @@ elsif($cmd eq "insertsession") $display = sanitizer('num', $display) or die "argument \"display\" malformed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))"); @@ -239,7 +239,7 @@ elsif($cmd eq "createsession") my $fs_port=shift or die"argument \"fs_port\" missed"; $fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?, client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?"); @@ -257,7 +257,7 @@ elsif($cmd eq "insertport") { my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values (?, ?, ?)"); check_user($sid); @@ -274,7 +274,7 @@ elsif($cmd eq "rmport") { my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("delete from used_ports where server=? and session_id=? and port=?"); check_user($sid); @@ -290,7 +290,7 @@ elsif($cmd eq "resume") { my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $gr_port=shift or die "argument \"gr_port\" missed"; $gr_port = sanitizer('num', $gr_port) or die "argument \"gr_port\" malformed"; my $snd_port=shift or die "argument \"snd_port\" missed"; @@ -313,7 +313,7 @@ elsif($cmd eq "changestatus") { my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), status=? where session_id = ? and uname=?"); @@ -329,7 +329,7 @@ elsif($cmd eq "changestatus") elsif($cmd eq "getstatus") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; check_user($sid); my $sth=$dbh->prepare("select status from sessions where session_id = ?"); $sth->execute($sid); @@ -415,7 +415,7 @@ elsif($cmd eq "getservers") elsif($cmd eq "getagent") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $agent; check_user($sid); my $sth=$dbh->prepare("select agent_pid from sessions @@ -439,7 +439,7 @@ elsif($cmd eq "getagent") elsif($cmd eq "getdisplay") { my $sid=shift or die "argument \"session_id\" missed"; - $sid = sanitizer('anumazcsdaus', $sid) or die "argument \"session_id\" malformed"; + $sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed"; my $display; check_user($sid); my $sth=$dbh->prepare("select display from sessions diff --git a/x2goserver/lib/x2goutils.pm b/x2goserver/lib/x2goutils.pm index 05aa460..a2330ec 100644 --- a/x2goserver/lib/x2goutils.pm +++ b/x2goserver/lib/x2goutils.pm @@ -38,9 +38,9 @@ sub sanitizer { $string = $1; return $string; } else {return 0;} - } elsif ($type eq "anumazcsdaus") { - $string =~ s/[^a-zA-Z0-9\_\-]//g; - if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) { + } elsif ($type eq "pnixusername") { + $string =~ s/[^a-zA-Z0-9\_\-\.]//g; + if ($string =~ /^([a-zA-Z0-9\_\-\.]*)$/) { $string = $1; return $string; } else {return 0;} 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).

1 0

page changed: wiki:bugs
by wiki-admin＠x2go.org 06 Jan '14

06 Jan '14

A page in your DokuWiki was added or changed. Here are the details: Date : 2014/01/06 12:21 Browser : Mozilla/5.0 (X11; Linux i686; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 134.245.252.114 Hostname : listrac.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:bugs?rev=1366728690 New Revision: http://wiki.x2go.org/doku.php/wiki:bugs Edit Summary: User : sunweaver @@ -55,8 +55,26 @@ <your-not-too-long-description-of-the-discovered-problem> """ Attachment: <your-patch.diff> </code> + + ==== Feature requests / Wishlist bugs ==== + + Feature requests are also handled via the X2Go BTS system. Feature requests are bugs with severity ,,wishlist". See example below. + + <code> + To: submit(a)bugs.x2go.org + Subject: <a-really-good-short-description-of-the-problem> + Body: + """ + Package: <name-of-x2go-component> + Version: <a.b.c.d> + Severity: wishlist + + <your-not-too-long-description-of-the-discovered-problem> + """ + </code> + ===== Controlling Bugs ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-342-gfb8442d
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, master has been updated via fb8442db527e62ba6317a86309e93c810f5f817e (commit) from 416b3d7d94824f7e272e71adbc02911b205d09db (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 fb8442db527e62ba6317a86309e93c810f5f817e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 3 11:31:49 2014 +0100 release 4.0.0.8 (cherry-picked from release/4.0.0.x branch) Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3a0d29c..e7699b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -269,7 +269,7 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.8-0x2go1) unstable; urgency=low * New upstream version (4.0.0.8): - Use mktemp instead of tempfile (because Fedora does not have the tempfile @@ -287,7 +287,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - Sanitize session ID string, port numbers, display numbers and agent PID numbers before writing them as strings to the session DB. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 03 Jan 2014 11:30:54 +0100 x2goserver (4.0.0.7-0x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-46-g4c62b38
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, release/4.0.1.x has been updated via 4c62b385033f4b5e909367596c54b19ee869edb9 (commit) from 0b67dd24d737a1a13d83b9ebe1d429480a754fba (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 4c62b385033f4b5e909367596c54b19ee869edb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 12:37:07 2014 +0100 Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver/bin/x2gostartagent | 2 ++ 2 files changed, 11 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e5869f4..9012f3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,15 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.9): + - Sanitize session name in x2gostartagent, as well. Fixes problems + with custom session commands containing characters that get + sanitized out. + + -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 + x2goserver (4.0.0.8-0x2go1) unstable; urgency=low * New upstream version (4.0.0.8): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 2c2534e..cd82f27 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -166,6 +166,8 @@ while [ "$OUTPUT" != "inserted" ]; do if [ "$COLORDEPTH" != "" ]; then SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` + # sanitize session name + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` fi OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-343-gd397667
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, master has been updated via d3976677451cb417c2281944c25950700ef4fd19 (commit) from fb8442db527e62ba6317a86309e93c810f5f817e (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 d3976677451cb417c2281944c25950700ef4fd19 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 12:37:07 2014 +0100 Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver/bin/x2gostartagent | 2 ++ 2 files changed, 11 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e7699b1..617565d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -269,6 +269,15 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 +x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.9): + - Sanitize session name in x2gostartagent, as well. Fixes problems + with custom session commands containing characters that get + sanitized out. + + -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 + x2goserver (4.0.0.8-0x2go1) unstable; urgency=low * New upstream version (4.0.0.8): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index c04ea2c..cd690c1 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -171,6 +171,8 @@ while [ "$OUTPUT" != "inserted" ]; do if [ "$COLORDEPTH" != "" ]; then SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` + # sanitize session name + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` fi if [ -n "$SHADREQ_USER" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "initializing new shadow session with ID $SESSION_NAME" 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).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.7-14-g78e482f
by git-admin＠x2go.org 06 Jan '14

06 Jan '14

The branch, release/4.0.0.x has been updated via 78e482fabf51d1e0099951f3191f7cfa6e24e21c (commit) from 11e1776012df80891d7a2277dec27ce742329af8 (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 78e482fabf51d1e0099951f3191f7cfa6e24e21c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 6 12:37:07 2014 +0100 Sanitize session name in x2gostartagent, as well. Fixes problems with custom session commands containing characters that get sanitized out. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++++++ x2goserver/bin/x2gostartagent | 2 ++ 2 files changed, 11 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 74c54ae..7f70984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.0.9): + - Sanitize session name in x2gostartagent, as well. Fixes problems + with custom session commands containing characters that get + sanitized out. + + -- Mike Gabriel <mga(a)listrac.informatik.uni-kiel.de> Mon, 06 Jan 2014 12:35:24 +0100 + x2goserver (4.0.0.8-0x2go1) unstable; urgency=low * New upstream version (4.0.0.8): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e137368..8c5bc21 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -156,6 +156,8 @@ while [ "$OUTPUT" != "inserted" ]; do if [ "$COLORDEPTH" != "" ]; then SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}" SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` + # sanitize session name + SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/[^a-zA-Z0-9\_\-]//g"` fi OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"` fi 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).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.22-3-ge8a69d2
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, master has been updated via e8a69d2617ecf8ded869ca1c55ca17fdb781dca6 (commit) from 80d10df8758b55706fa430a1cf4267c542fead36 (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 e8a69d2617ecf8ded869ca1c55ca17fdb781dca6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jan 4 22:03:44 2014 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/VERSION.x2goagent | 2 +- debian/changelog | 6 ++++++ nx-libs.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent index 041d9eb..3c1d69f 100644 --- a/debian/VERSION.x2goagent +++ b/debian/VERSION.x2goagent @@ -1 +1 @@ -3.5.0.22 +3.5.0.23 diff --git a/debian/changelog b/debian/changelog index 1c80199..11ed19a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.23-0x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 04 Jan 2014 22:02:16 +0100 + nx-libs (2:3.5.0.22-0x2go2) unstable; urgency=low * Update version in VERSION.x2goagent. diff --git a/nx-libs.spec b/nx-libs.spec index 34f87c3..860a4a7 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: nx-libs -Version: 3.5.0.22 +Version: 3.5.0.23 Release: 0.0x2go1%{?dist} Summary: NX X11 protocol compression libraries hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.22-1-g0d07f3e
by git-admin＠x2go.org 04 Jan '14

04 Jan '14

The branch, master has been updated via 0d07f3e8b491e3f883218df62c704df6cf8be739 (commit) from 626b5dbae6b7b432d573f88abc8e3e8ae2bdba85 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/VERSION.x2goagent | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent index b0bcc5c..041d9eb 100644 --- a/debian/VERSION.x2goagent +++ b/debian/VERSION.x2goagent @@ -1 +1 @@ -3.5.0.21 +3.5.0.22 diff --git a/debian/changelog b/debian/changelog index 65b8628..fc96352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.22-0x2go2) UNRELEASED; urgency=low + + * Update version in VERSION.x2goagent. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 04 Jan 2014 21:59:36 +0100 + nx-libs (2:3.5.0.22-0x2go1) unstable; urgency=low [ Mirraz Mirraz ] hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits