[X2Go-Commits] [x2goserver] 02/02: x2goserver/sbin/x2godbadmin: revoke all PRIVILEGES before trying to delete a user on postgres.

git-admin at x2go.org git-admin at x2go.org
Sat Jun 20 11:13:05 CEST 2015


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 126b18d1b9be1324edeefe21f9b95841b5901eef
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 20 11:11:46 2015 +0200

    x2goserver/sbin/x2godbadmin: revoke all PRIVILEGES before trying to delete a user on postgres.
    
    Fixes: #889.
---
 debian/changelog            |    2 ++
 x2goserver/sbin/x2godbadmin |   16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 39d38d6..125de2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -205,6 +205,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
   [ Henning Heinold ]
   * New upstream version (4.0.1.20):
     - x2goserver/sbin/x2godbadmin: remove trailing whitespace.
+    - x2goserver/sbin/x2godbadmin: revoke all PRIVILEGES before trying to
+      delete a user on postgres. Fixes: #889.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 24 Feb 2015 22:11:49 +0100
 
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index e634ada..d4f3972 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -432,6 +432,12 @@ sub rm_user()
 
 	print ("rm DB user \"x2gouser_$user\"\n");
 
+	my $sth=$dbh->prepare("REVOKE ALL PRIVILEGES ON sessions, used_ports, mounts FROM \"x2gouser_$user\"");
+	$sth->execute();
+
+	my $sth=$dbh->prepare("REVOKE ALL PRIVILEGES ON sessions_view, mounts_view, servers_view, ports_view FROM \"x2gouser_$user\"");
+	$sth->execute();
+
 	my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\"");
 	$sth->execute();
 
@@ -465,6 +471,16 @@ sub add_user()
 	$pass=`pwgen 8 1`;
 	chomp($pass);
 
+	my $sth=$dbh->prepare("REVOKE ALL PRIVILEGES ON sessions, used_ports, mounts FROM \"x2gouser_$user\"");
+	$sth->{Warn}=0;
+	$sth->{PrintError}=0;
+	$sth->execute();
+
+	my $sth=$dbh->prepare("REVOKE ALL PRIVILEGES ON sessions_view, mounts_view, servers_view, ports_view FROM \"x2gouser_$user\"");
+	$sth->{Warn}=0;
+	$sth->{PrintError}=0;
+	$sth->execute();
+
 	my $sth=$dbh->prepare("DROP OWNED BY \"x2gouser_$user\"");
 	$sth->{Warn}=0;
 	$sth->{PrintError}=0;

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


More information about the x2go-commits mailing list