extras-buildsys/server Builder.py, 1.3, 1.4 User.py, 1.3, 1.4 UserInterface.py, 1.16, 1.17 main.py, 1.4, 1.5

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/server

Modified Files:
	Builder.py User.py UserInterface.py main.py 
Log Message:
2005-07-09  Dan Williams <dcbw at redhat.com>

    * Rework the authorization framework so we don't need to
        subclass/override subclass so much stuff

    * Make the specfile Python version independent




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Builder.py	7 Jul 2005 16:21:12 -0000	1.3
+++ Builder.py	10 Jul 2005 03:44:37 -0000	1.4
@@ -46,9 +46,9 @@
         self._jobs = {}
         self._address = address
         if config_opts['ssl_builders']:
-            self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, certs)
+            self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
         else:
-            self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, None)
+            self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None)
         self._unavail_count = 0
         self._arches = []
         try:


Index: User.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/User.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- User.py	26 Jun 2005 14:52:30 -0000	1.3
+++ User.py	10 Jul 2005 03:44:37 -0000	1.4
@@ -34,7 +34,6 @@
         self.server_admin = False
 
 
-
 class Authenticator:
     """
     Talks to a database of users & capabilities


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- UserInterface.py	8 Jul 2005 18:12:31 -0000	1.16
+++ UserInterface.py	10 Jul 2005 03:44:37 -0000	1.17
@@ -24,6 +24,7 @@
 import copy
 import BuildMaster
 import PackageJob
+from plague import AuthedXMLRPCServer
 
 # Load in the config
 CONFIG_LOCATION = "/etc/plague/server/"
@@ -212,20 +213,23 @@
     Allow/Deny operations based on user privileges
     """
 
-    def enqueue(self, user, package, cvs_tag, target, buildreq=None):
-        if not user.own_jobs:
+    def enqueue(self, package, cvs_tag, target, buildreq=None):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.own_jobs:
             return (-1, "Insufficient privileges.")
         return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq)
 
 
-    def enqueue_srpm(self, user, package, srpm_file, target, buildreq=None):
-        if not user.own_jobs:
+    def enqueue_srpm(self, package, srpm_file, target, buildreq=None):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.own_jobs:
             return (-1, "Insufficient privileges.")
         return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq)
 
 
-    def kill_job(self, user, email, jobid):
-        if not user.own_jobs:
+    def kill_job(self, email, jobid):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.own_jobs:
             return (-1, "Insufficient privileges.")
         if user.email != email:
             return (-1, "Insufficient privileges.")
@@ -236,17 +240,21 @@
         return self._kill_job(user.email, job, jobid)
 
 
-    def list_jobs(self, user, args_dict):
+    def list_jobs(self, args_dict):
+        user = AuthedXMLRPCServer.get_authinfo()
         return UserInterface.list_jobs(self, args_dict)
 
 
-    def update_builders(self, user):
-        if not user.server_admin:
+    def update_builders(self):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.server_admin:
             return (-1, "Insufficient privileges.")
         return UserInterface.update_builders(self)
 
-    def list_builders(self, user):
-        if not user.server_admin:
+
+    def list_builders(self):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.server_admin:
             return (-1, "Insufficient privileges.")
         return UserInterface.list_builders(self)
 


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- main.py	7 Jul 2005 17:45:08 -0000	1.4
+++ main.py	10 Jul 2005 03:44:37 -0000	1.5
@@ -12,8 +12,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# copyright 2005 Duke University
-# written by Seth Vidal
+#
+# Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
 
 import sys