Changeset 730 for pycherokeeconf

Timestamp:

04/28/07 02:13:04 (1 year ago)

Author:

alo

Message:

--

Files:

• pycherokeeconf/qa/011-Validator.py (added)
• pycherokeeconf/src/cherokeeconf/__init__.py (modified) (1 diff)
• pycherokeeconf/src/cherokeeconf/config.py (modified) (2 diffs)
• pycherokeeconf/src/cherokeeconf/generic_entry.py (modified) (2 diffs)
• pycherokeeconf/src/cherokeeconf/util.py (modified) (1 diff)

pycherokeeconf/src/cherokeeconf/__init__.py

@@ -7 +7 @@
-from server import Server
-from virtual_server import VirtualServer
+from generic_entry import GenericEntry, GenericEntryAuth

pycherokeeconf/src/cherokeeconf/config.py

@@ -88 +88 @@
-
-    # Serialize
-
+
+
-        if self._val is not None:
-            if type(self._val) == types.BooleanType:
@@ -94 +95 @@
-            else:
-                val = str(self._val)
-
-
-
+
+
-        for name in self._child:
-            node = self._child[name]

pycherokeeconf/src/cherokeeconf/generic_entry.py

@@ -1 +1 @@
-from util import *
-from config import *
+
+
+class GenericEntryAuth (object):
+    def __init__ (self, conf):
+        assert (isinstance(conf, ConfigNode))
+        self._conf = conf
+
+    # Validator
+    def _get_validator (self):
+        tmp = self._conf.value
+        if tmp: return tmp.value
+    def _set_validator (self, val):
+        self._conf.value = val
+    validator = property (_get_validator, _set_validator)
+
+    # Methods
+    def _get_methods (self):
+        tmp = self._conf['methods']
+        if tmp: return tmp.value
+    def _set_methods (self, val):
+        self._conf['methods'] = ensure_method_list(val)
+    methods = property (_get_methods, _set_methods)
+
+    # Realm
+    def _get_realm (self):
+        tmp = self._conf['realm']
+        if tmp: return tmp.value
+    def _set_realm (self, val):
+        self._conf['realm'] = val
+    realm = property (_get_realm, _set_realm)
+
+    # Users
+    def _get_users (self):
+        tmp = self._conf['users']
+        if tmp: return tmp.value
+    def _set_users (self, val):
+        self._conf['users'] = ensure_user_list(val)
+    users = property (_get_users, _set_users)
-
-
@@ -42 +80 @@
-    
-    # Auth
+    def auth_new (self):
+        self._conf['auth'] = ConfigNode()
+        subconf = self._conf['auth']
+
+        auth = GenericEntryAuth (subconf)
+        return auth
+    
-    def _get_auth (self):
-        return self._conf['auth']
-    def _set_auth (self, auth):
-
-
+
-    auth = property (_get_auth, _set_auth)
-

pycherokeeconf/src/cherokeeconf/util.py

@@ -83 +83 @@
-        ensure_network (net)
-    return ips
+
+def ensure_method_list (methods):
+    for method in methods.split(','):
+        if method not in ['basic', 'digest']:
+            raise "Invalid validation method: " + method
+    return methods
+
+def ensure_user (user):
+    return user
+
+def ensure_user_list (users):
+    for user in users.split(','):
+        ensure_user (user)
+    return users