Merge or3st3s@azazel:/home/luca/repos/pymin

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 399eba1bf341b5c9eb37bcad32d9738ff572dd48..2aa521db5583335d5fddf5d4b52c1817e96ea96a 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
 
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler
 

+import crypt
+

 __ALL__ = ('ProxyHandler', 'Error', 'HostError', 'HostAlreadyExistsError',
             'HostNotFoundError')
 
 __ALL__ = ('ProxyHandler', 'Error', 'HostError', 'HostAlreadyExistsError',
             'HostNotFoundError')
 


@@ -68,29 +70,46 @@ class HostHandler(Handler):
 
     handler_help = u"Manage proxy hosts"
 
 
     handler_help = u"Manage proxy hosts"
 

-    def __init__(self, hosts):
-        self.hosts = hosts
+    def __init__(self, parent):
+        self.parent = parent

 
     @handler(u'Adds a host')
     def add(self, ip):
 
     @handler(u'Adds a host')
     def add(self, ip):

-        if ip in self.hosts:
+        if ip in self.parent.hosts:

             raise HostAlreadyExistsError(ip)
             raise HostAlreadyExistsError(ip)

-        self.hosts[ip] = Host(ip)
+        self.parent.hosts[ip] = Host(ip)

 
     @handler(u'Deletes a host')
     def delete(self, ip):
 
     @handler(u'Deletes a host')
     def delete(self, ip):

-        if not ip in self.hosts:
+        if not ip in self.parent.hosts:

             raise HostNotFoundError(ip)
             raise HostNotFoundError(ip)

-        del self.hosts[ip]
+        del self.parent.hosts[ip]

 
     @handler(u'Shows all hosts')
     def list(self):
 
     @handler(u'Shows all hosts')
     def list(self):

-        return self.hosts.keys()
+        return self.parent.hosts.keys()

 
     @handler(u'Get information about all hosts')
     def show(self):
 
     @handler(u'Get information about all hosts')
     def show(self):

-        return self.hosts.items()
-
+        return self.parent.hosts.items()
+
+
+class UserHandler(Handler):
+
+    def __init__(self, parent):
+        self.parent = parent
+       
+    @handler('Adds a user')
+    def add(self, user, password):
+        if user in self.parent.users:
+            raise UserAlreadyExistsError(user)
+        self.parent.users[user] = crypt.crypt(password,'BA')
+    
+    @handler('Deletes a user')
+    def delete(self, user):
+        if not user in self.parent.users:
+            raise UserNotFound(user)
+        del self.parent.users[user]

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


@@ -99,7 +118,7 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
 
     _initd_name = 'squid'
 
 
     _initd_name = 'squid'
 

-    _persistent_attrs = ('params', 'hosts')
+    _persistent_attrs = ('params', 'hosts', 'users')

 
     _restorable_defaults = dict(
             hosts = dict(),
 
     _restorable_defaults = dict(
             hosts = dict(),


@@ -107,9 +126,10 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                 ip   = '192.168.0.1',
                 port = '8080',
             ),
                 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='.'):
     _config_writer_tpl_dir = path.join(path.dirname(__file__), 'templates')
 
     def __init__(self, pickle_dir='.', config_dir='.'):


@@ -118,10 +138,13 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()

-        self.host = HostHandler(self.hosts)
+        self.host = HostHandler(self)
+        self.user = UserHandler(self)

 
     def _get_config_vars(self, config_file):
 
     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__':
 
 
 if __name__ == '__main__':


@@ -133,4 +156,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.host.add('192.168.0.25.26')
     px.host.add('192.168.0.25.27')
     px.host.delete('192.168.0.25.27')

-    px.commit()
\ No newline at end of file
+    px.user.add('lala','soronga')
+    px.user.add('culo','sarasa')
+    px.commit()