Changeset 2729e48 for fedd/fedd.py

Timestamp:

Nov 29, 2008 11:31:03 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

2dd442f

Parents:

0a20ef8

Message:

Move things around to make a python module encapsulation easier. More to do,
but this mostly works.

File:

• fedd/fedd.py (modified) (3 diffs)

fedd/fedd.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-import sys
+import os,sys
 
 from optparse import OptionParser
 
-from fedd_server import fedd_server, fedd_xmlrpc_handler, fedd_soap_handler
-from fedd_config_parser import fedd_config_parser
-from fedd_util import fedd_ssl_context
-from fedd_deter_impl import new_feddservice
+from fedd.fedd_server import fedd_server, fedd_xmlrpc_handler, fedd_soap_handler
+from fedd.fedd_config_parser import fedd_config_parser
+from fedd.fedd_util import fedd_ssl_context
+from fedd.fedd_deter_impl import new_feddservice
 
 from threading import *
@@ -115 +115 @@
     sys.exit("Error configuring fedd: %s" % str)
 
-if impl.cert_file == None:
+if impl.cert_file:
+    if not os.access(impl.cert_file, os.R_OK):
+        sys.exit("Cannot read certificate file: %s" % impl.cert_file)
+else:
     sys.exit("Must supply certificate file (probably in config)")
+
+if impl.trusted_certs:
+    if not os.access(impl.trusted_certs, os.R_OK):
+        sys.exit("Cannot read trusted certificate file: %s" % \
+                impl.trusted_certs)
 
 # Create the SSL credentials
@@ -124 +132 @@
         ctx = fedd_ssl_context(impl.cert_file, impl.trusted_certs, 
                 password=impl.cert_pwd)
-    except SSL.SSLError, e:
+    except Exception, e:
         if str(e) != "bad decrypt" or impl.cert_pwd != None:
             raise