Move common validation code to new pymin.validation module (refs #20)

[software/pymin.git] / services / proxy / handler.py

diff --git a/services/proxy/handler.py b/services/proxy/handler.py
index 7a5272476bf4f9a0a27fcc2910931b32af2f9cfc..8653c2de6396000e437c888073ddaa92db0cca9f 100644 (file)
--- a/services/proxy/handler.py
+++ b/services/proxy/handler.py
@@ -3,53 +3,14 @@
 from os import path
 import logging ; log = logging.getLogger('pymin.services.proxy')
 
 from os import path
 import logging ; log = logging.getLogger('pymin.services.proxy')
 

-from pymin.seqtools import Sequence
-from pymin.dispatcher import Handler, handler, HandlerError

 from pymin.service.util import Restorable, ConfigWriter, InitdHandler, \
 from pymin.service.util import Restorable, ConfigWriter, InitdHandler, \

-                               TransactionalHandler, ParametersHandler, \
-                               DictSubHandler
+                               TransactionalHandler, ParametersHandler

 
 

-import crypt
+from host import HostHandler
+from user import UserHandler

 
 

+__all__ = ('ProxyHandler',)

 
 

-__all__ = ('ProxyHandler', 'get_service')
-
-
-def get_service(config):
-    return ProxyHandler(config.proxy.pickle_dir, config.proxy.config_dir)
-
-
-class Host(Sequence):
-    def __init__(self,ip):
-        self.ip = ip
-    def as_tuple(self):
-        return (self.ip,)
-
-# TODO convert to a SetSubHandler
-
-class HostHandler(DictSubHandler):
-
-    handler_help = u"Manage proxy hosts"
-
-    _cont_subhandler_attr = 'hosts'
-    _cont_subhandler_class = Host
-
-class User(Sequence):
-    def __init__(self, name, password):
-        self.name = name
-        self.password = crypt.crypt(password,'BA')
-    def as_tuple(self):
-        return (self.name, self.password)
-    def update(self, password=None):
-        if password is not None:
-            self.password = crypt.crypt(password,'BA')
-
-class UserHandler(DictSubHandler):
-
-    handler_help = u"Manage proxy users"
-
-    _cont_subhandler_attr = 'users'
-    _cont_subhandler_class = User

 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):