Merge ../pymin

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 399eba1bf341b5c9eb37bcad32d9738ff572dd48..2740cc8c8ab0f8d546cf6b8986d19bb37d825b17 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -7,6 +7,8 @@ from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler
 
+import crypt
+
 __ALL__ = ('ProxyHandler', 'Error', 'HostError', 'HostAlreadyExistsError',
             'HostNotFoundError')
 
@@ -92,6 +94,21 @@ class HostHandler(Handler):
         return self.hosts.items()
 
 
+class UserHandler(Handler):
+
+    def __init__(self, users):
+        self.users = users
+
+    def add(self, user, password):
+        if user in self.users:
+            raise UserAlreadyExistsError(user)
+        self.users[user] = crypt.crypt(password,'BA')
+
+    def delete(self, user):
+        if not user in self.users:
+            raise UserNotFound(user)
+        del self.users[user]
+
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 
@@ -99,7 +116,7 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
 
     _initd_name = 'squid'
 
-    _persistent_attrs = ('params', 'hosts')
+    _persistent_attrs = ('params', 'hosts', 'users')
 
     _restorable_defaults = dict(
             hosts = dict(),
@@ -107,9 +124,10 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                 ip   = '192.168.0.1',
                 port = '8080',
             ),
+            users = dict(),
     )
 
-    _config_writer_files = 'squid.conf'
+    _config_writer_files = ('squid.conf','users.conf')
     _config_writer_tpl_dir = path.join(path.dirname(__file__), 'templates')
 
     def __init__(self, pickle_dir='.', config_dir='.'):
@@ -119,9 +137,12 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
         self._config_build_templates()
         self._restore()
         self.host = HostHandler(self.hosts)
+        self.user = UserHandler(self.users)
 
     def _get_config_vars(self, config_file):
-        return dict(hosts=self.hosts.values(), **self.params)
+        if config_file == 'squid.conf':
+            return dict(hosts=self.hosts.values(), **self.params)
+        return dict(users=self.users)
 
 
 if __name__ == '__main__':
@@ -133,4 +154,6 @@ if __name__ == '__main__':
     px.host.add('192.168.0.25.26')
     px.host.add('192.168.0.25.27')
     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