From owner-svn-src-projects@FreeBSD.ORG Sun Dec 30 00:05:42 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 181C9FB4; Sun, 30 Dec 2012 00:05:42 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EFE868FC0C; Sun, 30 Dec 2012 00:05:41 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBU05fJC077471; Sun, 30 Dec 2012 00:05:41 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBU05fvN077470; Sun, 30 Dec 2012 00:05:41 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201212300005.qBU05fvN077470@svn.freebsd.org> From: Mark Linimon Date: Sun, 30 Dec 2012 00:05:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244840 - projects/portbuild/qmanager X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 00:05:42 -0000 Author: linimon (doc,ports committer) Date: Sun Dec 30 00:05:41 2012 New Revision: 244840 URL: http://svnweb.freebsd.org/changeset/base/244840 Log: Try to wean qmanager off its dependence on root. Modified: projects/portbuild/qmanager/qmanager.py Modified: projects/portbuild/qmanager/qmanager.py ============================================================================== --- projects/portbuild/qmanager/qmanager.py Sat Dec 29 22:26:01 2012 (r244839) +++ projects/portbuild/qmanager/qmanager.py Sun Dec 30 00:05:41 2012 (r244840) @@ -72,6 +72,12 @@ CONFIG_FILENAME="server.conf" config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME ) QMANAGER_SOCKET_FILE = config.get( 'QMANAGER_SOCKET_FILE' ) +PORTBUILD_USER = config.get( 'PORTBUILD_USER' ) + +# added 20121229 as a fallback. no longer recommended! +portbuild_uid = 0 +if PORTBUILD_USER: + portbuild_uid = getuidbyname( PORTBUILD_USER ) DEBUG = False VERBOSE = False @@ -132,7 +138,7 @@ class Worker(object): def do_add(self, conn): """ Add a machine """ - if conn.uid != 0: + if conn.uid != portbuild_uid: conn.send(408) return @@ -161,7 +167,7 @@ class Worker(object): def do_delete(self, conn): """ Delete a machine """ - if conn.uid != 0: + if conn.uid != portbuild_uid: conn.send(408) return @@ -187,7 +193,7 @@ class Worker(object): def do_update(self, conn): """ Update a machine """ - if conn.uid != 0: + if conn.uid != portbuild_uid: conn.send(408) return @@ -233,7 +239,8 @@ class Worker(object): def do_add_acl(self, conn): """ Add an ACL """ - if conn.uid != 0: + print conn.uid + if conn.uid != portbuild_uid: conn.send(408) return @@ -260,7 +267,7 @@ class Worker(object): def do_update_acl(self, conn): """ Update an ACL """ - if conn.uid != 0: + if conn.uid != portbuild_uid: conn.send(408) return @@ -306,7 +313,7 @@ class Worker(object): def do_del_acl(self, conn): """ Delete an ACL """ - if conn.uid != 0: + if conn.uid != portbuild_uid: conn.send(408) return @@ -388,11 +395,11 @@ class Worker(object): return try: - if job.owner != conn.uid and conn.uid != 0: + if job.owner != conn.uid and conn.uid != portbuild_uid: conn.send(408) return except Exception, e: - print "would have failed at 'if job.owner != conn.uid and conn.uid != 0'" + print "would have failed at 'if job.owner != conn.uid and conn.uid != portbuild_uid'" print e try: print job