Changeset 697

Timestamp:

02/05/03 23:02:22 (21 years ago)

Author:

jalet

Message:

import statement didn't work as expected

Location:

pykota/trunk/pykota

Files:

• logger.py (modified) (2 diffs)
• requester.py (modified) (2 diffs)
• storage.py (modified) (2 diffs)

pykota/trunk/pykota/logger.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:02:22  jalet
+# __import__ statement didn't work as expected
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -36 +39 @@
     backend = config.getLoggingBackend()
     try :
-        module = __import__("pykota.loggers." + backend.lower())
+        if not isalpha(backend) :
+            # don't trust user input
+            raise ImportError
+        exec "from pykota.loggers import %s as loggingbackend" % backend.lower()    
     except ImportError :
         raise PyKotaLoggingError, "Unsupported logging subsystem %s" % backend
     else :    
-        return getattr(module, "Logger")()
+        return getattr(loggingbackend, "Logger")()

pykota/trunk/pykota/requester.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:02:22  jalet
+# __import__ statement didn't work as expected
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -34 +37 @@
     backend = config.getRequesterBackend(printername)
     try :
-        module = __import__("pykota.requesters." + backend.lower())
+        if not isalpha(backend) :
+            # don't trust user input
+            raise ImportError
+        exec "from pykota.requesters import %s as requesterbackend" % backend.lower()    
     except ImportError :
         raise PyKotaRequesterError, "Unsupported requester backend %s" % backend
     else :    
-        return getattr(module, "Requester")(config, printername)
+        return getattr(requesterbackend, "Requester")(config, printername)

pykota/trunk/pykota/storage.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:02:22  jalet
+# __import__ statement didn't work as expected
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -34 +37 @@
     (backend, host, database, admin, user) = config.getStorageBackend()
     try :
-        module = __import__("pykota.storages." + backend.lower())
+        if not isalpha(backend) :
+            # don't trust user input
+            raise ImportError
+        exec "from pykota.storages import %s as storagebackend" % backend.lower()    
     except ImportError :
         raise PyKotaStorageError, "Unsupported quota storage backend %s" % backend
     else :    
-        return getattr(module, "Storage")(host, database, (asadmin and admin) or user)
+        return getattr(storagebackend, "Storage")(host, database, (asadmin and admin) or user)