Give a nice error if a VPN key can't be readed (refs #22).

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

diff --git a/pymin/services/nat/__init__.py b/pymin/services/nat/__init__.py
index c22783ff1d4a17a2f723c38e72a05a013adfe770..34d5b0dc231e74a825d0c5be2a2260667cc5abe3 100644 (file)
--- a/pymin/services/nat/__init__.py
+++ b/pymin/services/nat/__init__.py
@@ -1,25 +1,15 @@
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
 from os import path
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
 from os import path

+import logging ; log = logging.getLogger('pymin.services.nat')

 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, RestartHandler, \
                                 ReloadHandler, TransactionalHandler, \
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, RestartHandler, \
                                 ReloadHandler, TransactionalHandler, \

-                                ListSubHandler, call
+                                ServiceHandler, ListSubHandler, call

 
 

-__ALL__ = ('NatHandler', 'Error')
-
-class Error(HandlerError):
-    r"""
-    Error(command) -> Error instance :: Base NatHandler exception class.
-
-    All exceptions raised by the NatHandler inherits from this one, so you can
-    easily catch any NatHandler exception.
-
-    message - A descriptive error message.
-    """
-    pass
+__all__ = ('NatHandler',)

 
 class PortForward(Sequence):
     r"""PortForward(dev, protocol, port, dst[, dst_port[, ...]]) -> PortForward.
 
 class PortForward(Sequence):
     r"""PortForward(dev, protocol, port, dst[, dst_port[, ...]]) -> PortForward.


@@ -191,8 +181,8 @@ class MasqHandler(ListSubHandler):
     _cont_subhandler_attr = 'masqs'
     _cont_subhandler_class = Masq
 
     _cont_subhandler_attr = 'masqs'
     _cont_subhandler_class = Masq
 

-class NatHandler(Restorable, ConfigWriter, RestartHandler, ReloadHandler,
-                      TransactionalHandler):
+class NatHandler(Restorable, ConfigWriter, ReloadHandler, ServiceHandler,
+                        TransactionalHandler):

     r"""NatHandler([pickle_dir[, config_dir]]) -> NatHandler instance.
 
     Handles NAT commands using iptables.
     r"""NatHandler([pickle_dir[, config_dir]]) -> NatHandler instance.
 
     Handles NAT commands using iptables.


@@ -214,23 +204,30 @@ class NatHandler(Restorable, ConfigWriter, RestartHandler, ReloadHandler,
         masqs=list(),
     )
 
         masqs=list(),
     )
 

-    @handler(u'Start the service.')
-    def start(self):
+    def _service_start(self):
+        log.debug(u'NatHandler._service_start(): flushing nat table')
+        call(('iptables', '-t', 'nat', '-F'))

         for (index, port) in enumerate(self.ports):
         for (index, port) in enumerate(self.ports):

+            log.debug(u'NatHandler._service_start: adding port %r', port)

             call(['iptables'] + port.as_call_list(index+1))
         for (index, snat) in enumerate(self.snats):
             call(['iptables'] + port.as_call_list(index+1))
         for (index, snat) in enumerate(self.snats):

+            log.debug(u'NatHandler._service_start: adding snat %r', snat)

             call(['iptables'] + snat.as_call_list(index+1))
         for (index, masq) in enumerate(self.masqs):
             call(['iptables'] + snat.as_call_list(index+1))
         for (index, masq) in enumerate(self.masqs):

+            log.debug(u'NatHandler._service_start: adding masq %r', masq)

             call(['iptables'] + masq.as_call_list(index+1))
 
             call(['iptables'] + masq.as_call_list(index+1))
 

-    @handler(u'Stop the service.')
-    def stop(self):
+    def _service_stop(self):
+        log.debug(u'NatHandler._service_stop(): flushing nat table')

         call(('iptables', '-t', 'nat', '-F'))
 
         call(('iptables', '-t', 'nat', '-F'))
 

+    _service_restart = _service_start
+

     def __init__(self, pickle_dir='.'):
         r"Initialize the object, see class documentation for details."
     def __init__(self, pickle_dir='.'):
         r"Initialize the object, see class documentation for details."

+        log.debug(u'NatHandler(%r)', pickle_dir)

         self._persistent_dir = pickle_dir
         self._persistent_dir = pickle_dir

-        self._restore()
+        ServiceHandler.__init__(self)

         self.forward = PortForwardHandler(self)
         self.snat = SNatHandler(self)
         self.masq = MasqHandler(self)
         self.forward = PortForwardHandler(self)
         self.snat = SNatHandler(self)
         self.masq = MasqHandler(self)


@@ -238,6 +235,12 @@ class NatHandler(Restorable, ConfigWriter, RestartHandler, ReloadHandler,
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':
 

+    logging.basicConfig(
+        level   = logging.DEBUG,
+        format  = '%(asctime)s %(levelname)-8s %(message)s',
+        datefmt = '%H:%M:%S',
+    )
+

     import os
 
     handler = NatHandler()
     import os
 
     handler = NatHandler()