Add logging to pymin.services.ip module.

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 2740cc8c8ab0f8d546cf6b8986d19bb37d825b17..a02e6c58df2e7c69a8d8508f2029c84c23f461c6 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -5,109 +5,44 @@ from os import path
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \

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

 
 import crypt
 
 
 import crypt
 

-__ALL__ = ('ProxyHandler', 'Error', 'HostError', 'HostAlreadyExistsError',
-            'HostNotFoundError')
-
-class Error(HandlerError):
-    r"""
-    Error(command) -> Error instance :: Base DnsHandler exception class.
-
-    All exceptions raised by the DnsHandler inherits from this one, so you can
-    easily catch any DnsHandler exception.
-
-    message - A descriptive error message.
-    """
-    pass
-
-class HostError(Error, KeyError):
-    r"""
-    HostError(hostname) -> HostError instance
-
-    This is the base exception for all host related errors.
-    """
-
-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host error: "%s"' % hostname
-
-class HostAlreadyExistsError(HostError):
-    r"""
-    HostAlreadyExistsError(hostname) -> HostAlreadyExistsError instance
-
-    This exception is raised when trying to add a hostname that already exists.
-    """
-
-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host already exists: "%s"' % hostname
-
-class HostNotFoundError(HostError):
-    r"""
-    HostNotFoundError(hostname) -> HostNotFoundError instance
-
-    This exception is raised when trying to operate on a hostname that doesn't
-    exists.
-    """
-
-    def __init__(self, hostname):
-        r"Initialize the object. See class documentation for more info."
-        self.message = u'Host not found: "%s"' % hostname
-
+__ALL__ = ('ProxyHandler',)

 
 class Host(Sequence):
 
 class Host(Sequence):

-

     def __init__(self,ip):
         self.ip = ip
     def __init__(self,ip):
         self.ip = ip

-

     def as_tuple(self):
     def as_tuple(self):

-        return (self.ip)
-
-class HostHandler(Handler):
+        return (self.ip,)

 
 

-    handler_help = u"Manage proxy hosts"
+# TODO convert to a SetSubHandler

 
 

-    def __init__(self, hosts):
-        self.hosts = hosts
+class HostHandler(DictSubHandler):

 
 

-    @handler(u'Adds a host')
-    def add(self, ip):
-        if ip in self.hosts:
-            raise HostAlreadyExistsError(ip)
-        self.hosts[ip] = Host(ip)
-
-    @handler(u'Deletes a host')
-    def delete(self, ip):
-        if not ip in self.hosts:
-            raise HostNotFoundError(ip)
-        del self.hosts[ip]
-
-    @handler(u'Shows all hosts')
-    def list(self):
-        return self.hosts.keys()
-
-    @handler(u'Get information about all hosts')
-    def show(self):
-        return self.hosts.items()
+    handler_help = u"Manage proxy hosts"

 
 

+    _cont_subhandler_attr = 'hosts'
+    _cont_subhandler_class = Host

 
 

-class UserHandler(Handler):
+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')

 
 

-    def __init__(self, users):
-        self.users = users
+class UserHandler(DictSubHandler):

 
 

-    def add(self, user, password):
-        if user in self.users:
-            raise UserAlreadyExistsError(user)
-        self.users[user] = crypt.crypt(password,'BA')
+    handler_help = u"Manage proxy users"

 
 

-    def delete(self, user):
-        if not user in self.users:
-            raise UserNotFound(user)
-        del self.users[user]
+    _cont_subhandler_attr = 'users'
+    _cont_subhandler_class = User

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


@@ -135,9 +70,9 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()

-        self._restore()
-        self.host = HostHandler(self.hosts)
-        self.user = UserHandler(self.users)
+        InitdHandler.__init__(self)
+        self.host = HostHandler(self)
+        self.user = UserHandler(self)

 
     def _get_config_vars(self, config_file):
         if config_file == 'squid.conf':
 
     def _get_config_vars(self, config_file):
         if config_file == 'squid.conf':


@@ -156,4 +91,4 @@ if __name__ == '__main__':
     px.host.delete('192.168.0.25.27')
     px.user.add('lala','soronga')
     px.user.add('culo','sarasa')
     px.host.delete('192.168.0.25.27')
     px.user.add('lala','soronga')
     px.user.add('culo','sarasa')

-    px.commit()
\ No newline at end of file
+    px.commit()