extras-buildsys/server ArchJob.py, 1.1, 1.2 Builder.py, 1.1, 1.2 CONFIG.py, 1.15, 1.16 Repo.py, 1.5, 1.6 main.py, 1.1, 1.2

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	ArchJob.py Builder.py CONFIG.py Repo.py main.py 
Log Message:
2005-07-06  Dan Williams <dcbw at redhat.com>

    * Convert M2Crypto code to pyOpenSSL so that stuff actually works




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchJob.py	5 Jul 2005 21:08:03 -0000	1.1
+++ ArchJob.py	6 Jul 2005 21:21:00 -0000	1.2
@@ -24,7 +24,6 @@
 import urllib
 from plague import FileDownloader
 from plague import CommonErrors
-from M2Crypto import SSL
 
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Builder.py	5 Jul 2005 21:08:03 -0000	1.1
+++ Builder.py	6 Jul 2005 21:21:00 -0000	1.2
@@ -23,7 +23,6 @@
 import threading
 from plague import XMLRPCServerProxy
 from plague import CommonErrors
-from M2Crypto import SSL
 import ArchJob
 
 # Load in the config
@@ -53,7 +52,7 @@
         self._arches = []
         try:
             self._arches = self._server.supported_arches()
-        except (socket.error, SSL.SSLError):
+        except socket.error:
             raise RuntimeError
         self._alive = True
         self._arches.append('noarch')
@@ -86,7 +85,7 @@
         self._server_lock.acquire()
         try:
             jobid = self._server.start(target, arch, srpm_url)
-        except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError):
+        except (socket.error, xmlrpclib.ProtocolError):
             jobid = 0
         self._server_lock.release()
 
@@ -105,7 +104,7 @@
         self._server_lock.acquire()
         try:
             (jobid, status) = self._server.get_cur_job()
-        except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError):
+        except (socket.error, xmlrpclib.ProtocolError):
             self._unavail_count = self._unavail_count + 1
         else:
             self._unavail_count = 0


Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CONFIG.py	5 Jul 2005 21:08:03 -0000	1.15
+++ CONFIG.py	6 Jul 2005 21:21:00 -0000	1.16
@@ -16,7 +16,7 @@
 config_opts['ssl_frontend'] = True
 # ssl_buildclients: True = all communication between server & build client
 # be over an SSL connecction
-config_opts['ssl_builders'] = False
+config_opts['ssl_builders'] = True
 
 
 SERVER_BASE_DIR = "/etc/plague/server"


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Repo.py	5 Jul 2005 21:08:03 -0000	1.5
+++ Repo.py	6 Jul 2005 21:21:00 -0000	1.6
@@ -31,6 +31,9 @@
     def __init__(self, target, builder_manager):
         self._builder_manager = builder_manager
         self._target = target
+        if not os.path.exists(config_opts['repo_dir']):
+            print "Error: Repository directory '%s' does not exist." % config_opts['repodir']
+            os._exit(1)
         self._repodir = os.path.join(config_opts['repo_dir'], target)
         if not os.path.exists(self._repodir):
             os.makedirs(self._repodir)


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.py	5 Jul 2005 21:08:03 -0000	1.1
+++ main.py	6 Jul 2005 21:21:01 -0000	1.2
@@ -22,7 +22,6 @@
 from plague import lighttpdManager
 from plague import HTTPServer
 import SimpleXMLRPCServer
-from M2Crypto import threading as m2thread
 
 sys.path.append('/usr/share/plague/server')
 
@@ -49,24 +48,12 @@
         self.authenticator = User.Authenticator()
 
     def auth_cb(self, request, client_address):
-        """
-        Authenticate the user and determine user's privs.
-        TODO: pull user privs from a DB
-        """
-        peer_cert = request.get_peer_cert()
-
-        # m2crypto 0.9 only supports 'Email' so fall through
-        # to that if emailAddress doesn't work
-        try:
-            email = peer_cert.get_subject().emailAddress
-        except AttributeError:
-            email = peer_cert.get_subject().Email
-
-        user = None
+        peer_cert = request.get_peer_certificate()
+        email = peer_cert.get_subject().emailAddress
         try:
             user = self.authenticator.new_authed_user(email, client_address)
         except Exception:
-            pass
+            user = None
         return user
 
 
@@ -80,8 +67,6 @@
 
     hostname = sys.argv[1]
 
-    m2thread.init()
-
     builder_manager = BuilderManager.BuilderManager()
 
     # Create the BuildMaster thread
@@ -119,9 +104,9 @@
             srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
             srpm_server_certs['ca_cert'] = config_opts['ca_cert']
             srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
-            srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
+            srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
         else:
-            srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None)
+            srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None)
     srpm_server.start()
 
     print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT)
@@ -135,7 +120,6 @@
         del bm
 
     print "Done."
-    m2thread.cleanup()
     os._exit(0)