/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2010-09-23 20:14:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100923201408-4vcvjmml000fr8y5
* Makefile (DOCS): Added "plymouth.8mandos".
  (install-server): Also install "mandos-monitor.8" and
                    "mandos-ctl.8".
  (install-client-nokey): Also install "plymouth.8mandos".
  (uninstall-server): Also remove "mandos-monitor.8" and
                      "mandos-ctl.8".
  (uninstall-client): Also remove "plymouth.8mandos".
* plugins.d/plymouth.xml: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
55
55
import logging
56
56
import logging.handlers
57
57
import pwd
58
 
from contextlib import closing
 
58
import contextlib
59
59
import struct
60
60
import fcntl
61
61
import functools
 
62
import cPickle as pickle
 
63
import multiprocessing
62
64
 
63
65
import dbus
64
66
import dbus.service
79
81
        SO_BINDTODEVICE = None
80
82
 
81
83
 
82
 
version = "1.0.12"
 
84
version = "1.0.14"
83
85
 
 
86
#logger = logging.getLogger(u'mandos')
84
87
logger = logging.Logger(u'mandos')
85
88
syslogger = (logging.handlers.SysLogHandler
86
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
154
157
                            u" after %i retries, exiting.",
155
158
                            self.rename_count)
156
159
            raise AvahiServiceError(u"Too many renames")
157
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
158
161
        logger.info(u"Changing Zeroconf service name to %r ...",
159
 
                    unicode(self.name))
 
162
                    self.name)
160
163
        syslogger.setFormatter(logging.Formatter
161
164
                               (u'Mandos (%s) [%%(process)d]:'
162
165
                                u' %%(levelname)s: %%(message)s'
163
166
                                % self.name))
164
167
        self.remove()
165
 
        self.add()
 
168
        try:
 
169
            self.add()
 
170
        except dbus.exceptions.DBusException, error:
 
171
            logger.critical(u"DBusException: %s", error)
 
172
            self.cleanup()
 
173
            os._exit(1)
166
174
        self.rename_count += 1
167
175
    def remove(self):
168
176
        """Derived from the Avahi example code"""
191
199
        self.group.Commit()
192
200
    def entry_group_state_changed(self, state, error):
193
201
        """Derived from the Avahi example code"""
194
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
195
203
        
196
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
205
            logger.debug(u"Zeroconf service established.")
210
218
            self.group = None
211
219
    def server_state_changed(self, state):
212
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
213
222
        if state == avahi.SERVER_COLLISION:
214
223
            logger.error(u"Zeroconf server name collision")
215
224
            self.remove()
242
251
    enabled:    bool()
243
252
    last_checked_ok: datetime.datetime(); (UTC) or None
244
253
    timeout:    datetime.timedelta(); How long from last_checked_ok
245
 
                                      until this client is invalid
 
254
                                      until this client is disabled
246
255
    interval:   datetime.timedelta(); How often to start a new checker
247
256
    disable_hook:  If set, called by disable() as disable_hook(self)
248
257
    checker:    subprocess.Popen(); a running checker process used
256
265
                     runtime with vars(self) as dict, so that for
257
266
                     instance %(name)s can be used in the command.
258
267
    current_checker_command: string; current running checker_command
 
268
    approval_delay: datetime.timedelta(); Time to wait for approval
 
269
    _approved:   bool(); 'None' if not yet approved/disapproved
 
270
    approval_duration: datetime.timedelta(); Duration of one approval
259
271
    """
260
272
    
261
273
    @staticmethod
272
284
    def interval_milliseconds(self):
273
285
        "Return the 'interval' attribute in milliseconds"
274
286
        return self._timedelta_to_milliseconds(self.interval)
 
287
 
 
288
    def approval_delay_milliseconds(self):
 
289
        return self._timedelta_to_milliseconds(self.approval_delay)
275
290
    
276
291
    def __init__(self, name = None, disable_hook=None, config=None):
277
292
        """Note: the 'checker' key in 'config' sets the
290
305
        if u"secret" in config:
291
306
            self.secret = config[u"secret"].decode(u"base64")
292
307
        elif u"secfile" in config:
293
 
            with closing(open(os.path.expanduser
294
 
                              (os.path.expandvars
295
 
                               (config[u"secfile"])))) as secfile:
 
308
            with open(os.path.expanduser(os.path.expandvars
 
309
                                         (config[u"secfile"])),
 
310
                      "rb") as secfile:
296
311
                self.secret = secfile.read()
297
312
        else:
298
313
            raise TypeError(u"No secret or secfile for client %s"
312
327
        self.checker_command = config[u"checker"]
313
328
        self.current_checker_command = None
314
329
        self.last_connect = None
 
330
        self._approved = None
 
331
        self.approved_by_default = config.get(u"approved_by_default",
 
332
                                              True)
 
333
        self.approvals_pending = 0
 
334
        self.approval_delay = string_to_delta(
 
335
            config[u"approval_delay"])
 
336
        self.approval_duration = string_to_delta(
 
337
            config[u"approval_duration"])
 
338
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
315
339
    
 
340
    def send_changedstate(self):
 
341
        self.changedstate.acquire()
 
342
        self.changedstate.notify_all()
 
343
        self.changedstate.release()
 
344
        
316
345
    def enable(self):
317
346
        """Start this client's checker and timeout hooks"""
318
347
        if getattr(self, u"enabled", False):
319
348
            # Already enabled
320
349
            return
 
350
        self.send_changedstate()
321
351
        self.last_enabled = datetime.datetime.utcnow()
322
352
        # Schedule a new checker to be started an 'interval' from now,
323
353
        # and every interval from then on.
324
354
        self.checker_initiator_tag = (gobject.timeout_add
325
355
                                      (self.interval_milliseconds(),
326
356
                                       self.start_checker))
327
 
        # Also start a new checker *right now*.
328
 
        self.start_checker()
329
357
        # Schedule a disable() when 'timeout' has passed
330
358
        self.disable_initiator_tag = (gobject.timeout_add
331
359
                                   (self.timeout_milliseconds(),
332
360
                                    self.disable))
333
361
        self.enabled = True
 
362
        # Also start a new checker *right now*.
 
363
        self.start_checker()
334
364
    
335
 
    def disable(self):
 
365
    def disable(self, quiet=True):
336
366
        """Disable this client."""
337
367
        if not getattr(self, "enabled", False):
338
368
            return False
339
 
        logger.info(u"Disabling client %s", self.name)
 
369
        if not quiet:
 
370
            self.send_changedstate()
 
371
        if not quiet:
 
372
            logger.info(u"Disabling client %s", self.name)
340
373
        if getattr(self, u"disable_initiator_tag", False):
341
374
            gobject.source_remove(self.disable_initiator_tag)
342
375
            self.disable_initiator_tag = None
394
427
        # client would inevitably timeout, since no checker would get
395
428
        # a chance to run to completion.  If we instead leave running
396
429
        # checkers alone, the checker would have to take more time
397
 
        # than 'timeout' for the client to be declared invalid, which
398
 
        # is as it should be.
 
430
        # than 'timeout' for the client to be disabled, which is as it
 
431
        # should be.
399
432
        
400
433
        # If a checker exists, make sure it is not a zombie
401
434
        try:
466
499
        logger.debug(u"Stopping checker for %(name)s", vars(self))
467
500
        try:
468
501
            os.kill(self.checker.pid, signal.SIGTERM)
469
 
            #os.sleep(0.5)
 
502
            #time.sleep(0.5)
470
503
            #if self.checker.poll() is None:
471
504
            #    os.kill(self.checker.pid, signal.SIGKILL)
472
505
        except OSError, error:
473
506
            if error.errno != errno.ESRCH: # No such process
474
507
                raise
475
508
        self.checker = None
476
 
    
477
 
    def still_valid(self):
478
 
        """Has the timeout not yet passed for this client?"""
479
 
        if not getattr(self, u"enabled", False):
480
 
            return False
481
 
        now = datetime.datetime.utcnow()
482
 
        if self.last_checked_ok is None:
483
 
            return now < (self.created + self.timeout)
484
 
        else:
485
 
            return now < (self.last_checked_ok + self.timeout)
486
 
 
487
509
 
488
510
def dbus_service_property(dbus_interface, signature=u"v",
489
511
                          access=u"readwrite", byte_arrays=False):
497
519
    dbus.service.method, except there is only "signature", since the
498
520
    type from Get() and the type sent to Set() is the same.
499
521
    """
 
522
    # Encoding deeply encoded byte arrays is not supported yet by the
 
523
    # "Set" method, so we fail early here:
 
524
    if byte_arrays and signature != u"ay":
 
525
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
526
                         u" signature %r" % signature)
500
527
    def decorator(func):
501
528
        func._dbus_is_property = True
502
529
        func._dbus_interface = dbus_interface
588
615
        if prop._dbus_access == u"read":
589
616
            raise DBusPropertyAccessException(property_name)
590
617
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
618
            # The byte_arrays option is not supported yet on
 
619
            # signatures other than "ay".
 
620
            if prop._dbus_signature != u"ay":
 
621
                raise ValueError
591
622
            value = dbus.ByteArray(''.join(unichr(byte)
592
623
                                           for byte in value))
593
624
        prop(value)
625
656
        """Standard D-Bus method, overloaded to insert property tags.
626
657
        """
627
658
        xmlstring = dbus.service.Object.Introspect(self, object_path,
628
 
                                           connection)
629
 
        document = xml.dom.minidom.parseString(xmlstring)
630
 
        del xmlstring
631
 
        def make_tag(document, name, prop):
632
 
            e = document.createElement(u"property")
633
 
            e.setAttribute(u"name", name)
634
 
            e.setAttribute(u"type", prop._dbus_signature)
635
 
            e.setAttribute(u"access", prop._dbus_access)
636
 
            return e
637
 
        for if_tag in document.getElementsByTagName(u"interface"):
638
 
            for tag in (make_tag(document, name, prop)
639
 
                        for name, prop
640
 
                        in self._get_all_dbus_properties()
641
 
                        if prop._dbus_interface
642
 
                        == if_tag.getAttribute(u"name")):
643
 
                if_tag.appendChild(tag)
644
 
        xmlstring = document.toxml(u"utf-8")
645
 
        document.unlink()
 
659
                                                   connection)
 
660
        try:
 
661
            document = xml.dom.minidom.parseString(xmlstring)
 
662
            def make_tag(document, name, prop):
 
663
                e = document.createElement(u"property")
 
664
                e.setAttribute(u"name", name)
 
665
                e.setAttribute(u"type", prop._dbus_signature)
 
666
                e.setAttribute(u"access", prop._dbus_access)
 
667
                return e
 
668
            for if_tag in document.getElementsByTagName(u"interface"):
 
669
                for tag in (make_tag(document, name, prop)
 
670
                            for name, prop
 
671
                            in self._get_all_dbus_properties()
 
672
                            if prop._dbus_interface
 
673
                            == if_tag.getAttribute(u"name")):
 
674
                    if_tag.appendChild(tag)
 
675
                # Add the names to the return values for the
 
676
                # "org.freedesktop.DBus.Properties" methods
 
677
                if (if_tag.getAttribute(u"name")
 
678
                    == u"org.freedesktop.DBus.Properties"):
 
679
                    for cn in if_tag.getElementsByTagName(u"method"):
 
680
                        if cn.getAttribute(u"name") == u"Get":
 
681
                            for arg in cn.getElementsByTagName(u"arg"):
 
682
                                if (arg.getAttribute(u"direction")
 
683
                                    == u"out"):
 
684
                                    arg.setAttribute(u"name", u"value")
 
685
                        elif cn.getAttribute(u"name") == u"GetAll":
 
686
                            for arg in cn.getElementsByTagName(u"arg"):
 
687
                                if (arg.getAttribute(u"direction")
 
688
                                    == u"out"):
 
689
                                    arg.setAttribute(u"name", u"props")
 
690
            xmlstring = document.toxml(u"utf-8")
 
691
            document.unlink()
 
692
        except (AttributeError, xml.dom.DOMException,
 
693
                xml.parsers.expat.ExpatError), error:
 
694
            logger.error(u"Failed to override Introspection method",
 
695
                         error)
646
696
        return xmlstring
647
697
 
648
698
 
656
706
    # dbus.service.Object doesn't use super(), so we can't either.
657
707
    
658
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
659
710
        self.bus = bus
660
711
        Client.__init__(self, *args, **kwargs)
661
712
        # Only now, when this client is initialized, can it show up on
665
716
                                  + self.name.replace(u".", u"_")))
666
717
        DBusObjectWithProperties.__init__(self, self.bus,
667
718
                                          self.dbus_object_path)
 
719
        
 
720
    def _get_approvals_pending(self):
 
721
        return self._approvals_pending
 
722
    def _set_approvals_pending(self, value):
 
723
        old_value = self._approvals_pending
 
724
        self._approvals_pending = value
 
725
        bval = bool(value)
 
726
        if (hasattr(self, "dbus_object_path")
 
727
            and bval is not bool(old_value)):
 
728
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
729
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
730
                                 dbus_bool)
 
731
 
 
732
    approvals_pending = property(_get_approvals_pending,
 
733
                                 _set_approvals_pending)
 
734
    del _get_approvals_pending, _set_approvals_pending
668
735
    
669
736
    @staticmethod
670
737
    def _datetime_to_dbus(dt, variant_level=0):
677
744
        r = Client.enable(self)
678
745
        if oldstate != self.enabled:
679
746
            # Emit D-Bus signals
680
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
681
748
                                 dbus.Boolean(True, variant_level=1))
682
749
            self.PropertyChanged(
683
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
684
751
                self._datetime_to_dbus(self.last_enabled,
685
752
                                       variant_level=1))
686
753
        return r
687
754
    
688
 
    def disable(self, signal = True):
 
755
    def disable(self, quiet = False):
689
756
        oldstate = getattr(self, u"enabled", False)
690
 
        r = Client.disable(self)
691
 
        if signal and oldstate != self.enabled:
 
757
        r = Client.disable(self, quiet=quiet)
 
758
        if not quiet and oldstate != self.enabled:
692
759
            # Emit D-Bus signal
693
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
694
761
                                 dbus.Boolean(False, variant_level=1))
695
762
        return r
696
763
    
708
775
        self.checker_callback_tag = None
709
776
        self.checker = None
710
777
        # Emit D-Bus signal
711
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
712
779
                             dbus.Boolean(False, variant_level=1))
713
780
        if os.WIFEXITED(condition):
714
781
            exitstatus = os.WEXITSTATUS(condition)
729
796
        r = Client.checked_ok(self, *args, **kwargs)
730
797
        # Emit D-Bus signal
731
798
        self.PropertyChanged(
732
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
733
800
            (self._datetime_to_dbus(self.last_checked_ok,
734
801
                                    variant_level=1)))
735
802
        return r
747
814
            # Emit D-Bus signal
748
815
            self.CheckerStarted(self.current_checker_command)
749
816
            self.PropertyChanged(
750
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
751
818
                dbus.Boolean(True, variant_level=1))
752
819
        return r
753
820
    
756
823
        r = Client.stop_checker(self, *args, **kwargs)
757
824
        if (old_checker is not None
758
825
            and getattr(self, u"checker", None) is None):
759
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
760
827
                                 dbus.Boolean(False, variant_level=1))
761
828
        return r
762
 
    
763
 
    ## D-Bus methods & signals
 
829
 
 
830
    def _reset_approved(self):
 
831
        self._approved = None
 
832
        return False
 
833
    
 
834
    def approve(self, value=True):
 
835
        self.send_changedstate()
 
836
        self._approved = value
 
837
        gobject.timeout_add(self._timedelta_to_milliseconds
 
838
                            (self.approval_duration),
 
839
                            self._reset_approved)
 
840
    
 
841
    
 
842
    ## D-Bus methods, signals & properties
764
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
765
844
    
766
 
    # CheckedOK - method
767
 
    @dbus.service.method(_interface)
768
 
    def CheckedOK(self):
769
 
        return self.checked_ok()
 
845
    ## Signals
770
846
    
771
847
    # CheckerCompleted - signal
772
848
    @dbus.service.signal(_interface, signature=u"nxs")
786
862
        "D-Bus signal"
787
863
        pass
788
864
    
789
 
    # ReceivedSecret - signal
 
865
    # GotSecret - signal
790
866
    @dbus.service.signal(_interface)
791
 
    def ReceivedSecret(self):
792
 
        "D-Bus signal"
 
867
    def GotSecret(self):
 
868
        """D-Bus signal
 
869
        Is sent after a successful transfer of secret from the Mandos
 
870
        server to mandos-client
 
871
        """
793
872
        pass
794
873
    
795
874
    # Rejected - signal
796
 
    @dbus.service.signal(_interface)
797
 
    def Rejected(self):
798
 
        "D-Bus signal"
799
 
        pass
 
875
    @dbus.service.signal(_interface, signature=u"s")
 
876
    def Rejected(self, reason):
 
877
        "D-Bus signal"
 
878
        pass
 
879
    
 
880
    # NeedApproval - signal
 
881
    @dbus.service.signal(_interface, signature=u"tb")
 
882
    def NeedApproval(self, timeout, default):
 
883
        "D-Bus signal"
 
884
        pass
 
885
    
 
886
    ## Methods
 
887
 
 
888
    # Approve - method
 
889
    @dbus.service.method(_interface, in_signature=u"b")
 
890
    def Approve(self, value):
 
891
        self.approve(value)
 
892
 
 
893
    # CheckedOK - method
 
894
    @dbus.service.method(_interface)
 
895
    def CheckedOK(self):
 
896
        return self.checked_ok()
800
897
    
801
898
    # Enable - method
802
899
    @dbus.service.method(_interface)
821
918
    def StopChecker(self):
822
919
        self.stop_checker()
823
920
    
824
 
    # name - property
 
921
    ## Properties
 
922
    
 
923
    # ApprovalPending - property
 
924
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
925
    def ApprovalPending_dbus_property(self):
 
926
        return dbus.Boolean(bool(self.approvals_pending))
 
927
    
 
928
    # ApprovedByDefault - property
 
929
    @dbus_service_property(_interface, signature=u"b",
 
930
                           access=u"readwrite")
 
931
    def ApprovedByDefault_dbus_property(self, value=None):
 
932
        if value is None:       # get
 
933
            return dbus.Boolean(self.approved_by_default)
 
934
        self.approved_by_default = bool(value)
 
935
        # Emit D-Bus signal
 
936
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
937
                             dbus.Boolean(value, variant_level=1))
 
938
    
 
939
    # ApprovalDelay - property
 
940
    @dbus_service_property(_interface, signature=u"t",
 
941
                           access=u"readwrite")
 
942
    def ApprovalDelay_dbus_property(self, value=None):
 
943
        if value is None:       # get
 
944
            return dbus.UInt64(self.approval_delay_milliseconds())
 
945
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
946
        # Emit D-Bus signal
 
947
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
948
                             dbus.UInt64(value, variant_level=1))
 
949
    
 
950
    # ApprovalDuration - property
 
951
    @dbus_service_property(_interface, signature=u"t",
 
952
                           access=u"readwrite")
 
953
    def ApprovalDuration_dbus_property(self, value=None):
 
954
        if value is None:       # get
 
955
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
956
                    self.approval_duration))
 
957
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
958
        # Emit D-Bus signal
 
959
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
960
                             dbus.UInt64(value, variant_level=1))
 
961
    
 
962
    # Name - property
825
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
826
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
827
965
        return dbus.String(self.name)
828
966
    
829
 
    # fingerprint - property
 
967
    # Fingerprint - property
830
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
831
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
832
970
        return dbus.String(self.fingerprint)
833
971
    
834
 
    # host - property
 
972
    # Host - property
835
973
    @dbus_service_property(_interface, signature=u"s",
836
974
                           access=u"readwrite")
837
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
838
976
        if value is None:       # get
839
977
            return dbus.String(self.host)
840
978
        self.host = value
841
979
        # Emit D-Bus signal
842
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
843
981
                             dbus.String(value, variant_level=1))
844
982
    
845
 
    # created - property
 
983
    # Created - property
846
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
847
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
848
986
        return dbus.String(self._datetime_to_dbus(self.created))
849
987
    
850
 
    # last_enabled - property
 
988
    # LastEnabled - property
851
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
852
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
853
991
        if self.last_enabled is None:
854
992
            return dbus.String(u"")
855
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
856
994
    
857
 
    # enabled - property
 
995
    # Enabled - property
858
996
    @dbus_service_property(_interface, signature=u"b",
859
997
                           access=u"readwrite")
860
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
861
999
        if value is None:       # get
862
1000
            return dbus.Boolean(self.enabled)
863
1001
        if value:
865
1003
        else:
866
1004
            self.disable()
867
1005
    
868
 
    # last_checked_ok - property
 
1006
    # LastCheckedOK - property
869
1007
    @dbus_service_property(_interface, signature=u"s",
870
1008
                           access=u"readwrite")
871
 
    def last_checked_ok_dbus_property(self, value=None):
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
872
1010
        if value is not None:
873
1011
            self.checked_ok()
874
1012
            return
877
1015
        return dbus.String(self._datetime_to_dbus(self
878
1016
                                                  .last_checked_ok))
879
1017
    
880
 
    # timeout - property
 
1018
    # Timeout - property
881
1019
    @dbus_service_property(_interface, signature=u"t",
882
1020
                           access=u"readwrite")
883
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
884
1022
        if value is None:       # get
885
1023
            return dbus.UInt64(self.timeout_milliseconds())
886
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
887
1025
        # Emit D-Bus signal
888
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
889
1027
                             dbus.UInt64(value, variant_level=1))
890
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
891
1029
            return
905
1043
            self.disable_initiator_tag = (gobject.timeout_add
906
1044
                                          (time_to_die, self.disable))
907
1045
    
908
 
    # interval - property
 
1046
    # Interval - property
909
1047
    @dbus_service_property(_interface, signature=u"t",
910
1048
                           access=u"readwrite")
911
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
912
1050
        if value is None:       # get
913
1051
            return dbus.UInt64(self.interval_milliseconds())
914
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
915
1053
        # Emit D-Bus signal
916
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
917
1055
                             dbus.UInt64(value, variant_level=1))
918
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
919
1057
            return
923
1061
                                      (value, self.start_checker))
924
1062
        self.start_checker()    # Start one now, too
925
1063
 
926
 
    # checker - property
 
1064
    # Checker - property
927
1065
    @dbus_service_property(_interface, signature=u"s",
928
1066
                           access=u"readwrite")
929
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
930
1068
        if value is None:       # get
931
1069
            return dbus.String(self.checker_command)
932
1070
        self.checker_command = value
933
1071
        # Emit D-Bus signal
934
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
935
1073
                             dbus.String(self.checker_command,
936
1074
                                         variant_level=1))
937
1075
    
938
 
    # checker_running - property
 
1076
    # CheckerRunning - property
939
1077
    @dbus_service_property(_interface, signature=u"b",
940
1078
                           access=u"readwrite")
941
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
942
1080
        if value is None:       # get
943
1081
            return dbus.Boolean(self.checker is not None)
944
1082
        if value:
946
1084
        else:
947
1085
            self.stop_checker()
948
1086
    
949
 
    # object_path - property
 
1087
    # ObjectPath - property
950
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
951
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
952
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
953
1091
    
954
 
    # secret = property
 
1092
    # Secret = property
955
1093
    @dbus_service_property(_interface, signature=u"ay",
956
1094
                           access=u"write", byte_arrays=True)
957
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
958
1096
        self.secret = str(value)
959
1097
    
960
1098
    del _interface
961
1099
 
962
1100
 
 
1101
class ProxyClient(object):
 
1102
    def __init__(self, child_pipe, fpr, address):
 
1103
        self._pipe = child_pipe
 
1104
        self._pipe.send(('init', fpr, address))
 
1105
        if not self._pipe.recv():
 
1106
            raise KeyError()
 
1107
 
 
1108
    def __getattribute__(self, name):
 
1109
        if(name == '_pipe'):
 
1110
            return super(ProxyClient, self).__getattribute__(name)
 
1111
        self._pipe.send(('getattr', name))
 
1112
        data = self._pipe.recv()
 
1113
        if data[0] == 'data':
 
1114
            return data[1]
 
1115
        if data[0] == 'function':
 
1116
            def func(*args, **kwargs):
 
1117
                self._pipe.send(('funcall', name, args, kwargs))
 
1118
                return self._pipe.recv()[1]
 
1119
            return func
 
1120
 
 
1121
    def __setattr__(self, name, value):
 
1122
        if(name == '_pipe'):
 
1123
            return super(ProxyClient, self).__setattr__(name, value)
 
1124
        self._pipe.send(('setattr', name, value))
 
1125
 
 
1126
 
963
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
964
1128
    """A class to handle client connections.
965
1129
    
967
1131
    Note: This will run in its own forked process."""
968
1132
    
969
1133
    def handle(self):
970
 
        logger.info(u"TCP connection from: %s",
971
 
                    unicode(self.client_address))
972
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
973
 
        # Open IPC pipe to parent process
974
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
1134
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1135
            logger.info(u"TCP connection from: %s",
 
1136
                        unicode(self.client_address))
 
1137
            logger.debug(u"Pipe FD: %d",
 
1138
                         self.server.child_pipe.fileno())
 
1139
 
975
1140
            session = (gnutls.connection
976
1141
                       .ClientSession(self.request,
977
1142
                                      gnutls.connection
978
1143
                                      .X509Credentials()))
979
 
            
980
 
            line = self.request.makefile().readline()
981
 
            logger.debug(u"Protocol version: %r", line)
982
 
            try:
983
 
                if int(line.strip().split()[0]) > 1:
984
 
                    raise RuntimeError
985
 
            except (ValueError, IndexError, RuntimeError), error:
986
 
                logger.error(u"Unknown protocol version: %s", error)
987
 
                return
988
 
            
 
1144
 
989
1145
            # Note: gnutls.connection.X509Credentials is really a
990
1146
            # generic GnuTLS certificate credentials object so long as
991
1147
            # no X.509 keys are added to it.  Therefore, we can use it
992
1148
            # here despite using OpenPGP certificates.
993
 
            
 
1149
 
994
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
995
1151
            #                      u"+AES-256-CBC", u"+SHA1",
996
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1002
1158
            (gnutls.library.functions
1003
1159
             .gnutls_priority_set_direct(session._c_object,
1004
1160
                                         priority, None))
1005
 
            
 
1161
 
 
1162
            # Start communication using the Mandos protocol
 
1163
            # Get protocol number
 
1164
            line = self.request.makefile().readline()
 
1165
            logger.debug(u"Protocol version: %r", line)
 
1166
            try:
 
1167
                if int(line.strip().split()[0]) > 1:
 
1168
                    raise RuntimeError
 
1169
            except (ValueError, IndexError, RuntimeError), error:
 
1170
                logger.error(u"Unknown protocol version: %s", error)
 
1171
                return
 
1172
 
 
1173
            # Start GnuTLS connection
1006
1174
            try:
1007
1175
                session.handshake()
1008
1176
            except gnutls.errors.GNUTLSError, error:
1011
1179
                # established.  Just abandon the request.
1012
1180
                return
1013
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
1014
1184
            try:
1015
 
                fpr = self.fingerprint(self.peer_certificate(session))
1016
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1017
 
                logger.warning(u"Bad certificate: %s", error)
1018
 
                session.bye()
1019
 
                return
1020
 
            logger.debug(u"Fingerprint: %s", fpr)
 
1185
                try:
 
1186
                    fpr = self.fingerprint(self.peer_certificate
 
1187
                                           (session))
 
1188
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1189
                    logger.warning(u"Bad certificate: %s", error)
 
1190
                    return
 
1191
                logger.debug(u"Fingerprint: %s", fpr)
 
1192
 
 
1193
                try:
 
1194
                    client = ProxyClient(child_pipe, fpr,
 
1195
                                         self.client_address)
 
1196
                except KeyError:
 
1197
                    return
 
1198
                
 
1199
                if client.approval_delay:
 
1200
                    delay = client.approval_delay
 
1201
                    client.approvals_pending += 1
 
1202
                    approval_required = True
 
1203
                
 
1204
                while True:
 
1205
                    if not client.enabled:
 
1206
                        logger.warning(u"Client %s is disabled",
 
1207
                                       client.name)
 
1208
                        if self.server.use_dbus:
 
1209
                            # Emit D-Bus signal
 
1210
                            client.Rejected("Disabled")                    
 
1211
                        return
 
1212
                    
 
1213
                    if client._approved or not client.approval_delay:
 
1214
                        #We are approved or approval is disabled
 
1215
                        break
 
1216
                    elif client._approved is None:
 
1217
                        logger.info(u"Client %s needs approval",
 
1218
                                    client.name)
 
1219
                        if self.server.use_dbus:
 
1220
                            # Emit D-Bus signal
 
1221
                            client.NeedApproval(
 
1222
                                client.approval_delay_milliseconds(),
 
1223
                                client.approved_by_default)
 
1224
                    else:
 
1225
                        logger.warning(u"Client %s was not approved",
 
1226
                                       client.name)
 
1227
                        if self.server.use_dbus:
 
1228
                            # Emit D-Bus signal
 
1229
                            client.Rejected("Denied")
 
1230
                        return
 
1231
                    
 
1232
                    #wait until timeout or approved
 
1233
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1234
                    time = datetime.datetime.now()
 
1235
                    client.changedstate.acquire()
 
1236
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1237
                    client.changedstate.release()
 
1238
                    time2 = datetime.datetime.now()
 
1239
                    if (time2 - time) >= delay:
 
1240
                        if not client.approved_by_default:
 
1241
                            logger.warning("Client %s timed out while"
 
1242
                                           " waiting for approval",
 
1243
                                           client.name)
 
1244
                            if self.server.use_dbus:
 
1245
                                # Emit D-Bus signal
 
1246
                                client.Rejected("Approval timed out")
 
1247
                            return
 
1248
                        else:
 
1249
                            break
 
1250
                    else:
 
1251
                        delay -= time2 - time
 
1252
                
 
1253
                sent_size = 0
 
1254
                while sent_size < len(client.secret):
 
1255
                    try:
 
1256
                        sent = session.send(client.secret[sent_size:])
 
1257
                    except (gnutls.errors.GNUTLSError), error:
 
1258
                        logger.warning("gnutls send failed")
 
1259
                        return
 
1260
                    logger.debug(u"Sent: %d, remaining: %d",
 
1261
                                 sent, len(client.secret)
 
1262
                                 - (sent_size + sent))
 
1263
                    sent_size += sent
 
1264
 
 
1265
                logger.info(u"Sending secret to %s", client.name)
 
1266
                # bump the timeout as if seen
 
1267
                client.checked_ok()
 
1268
                if self.server.use_dbus:
 
1269
                    # Emit D-Bus signal
 
1270
                    client.GotSecret()
1021
1271
            
1022
 
            for c in self.server.clients:
1023
 
                if c.fingerprint == fpr:
1024
 
                    client = c
1025
 
                    break
1026
 
            else:
1027
 
                ipc.write(u"NOTFOUND %s %s\n"
1028
 
                          % (fpr, unicode(self.client_address)))
1029
 
                session.bye()
1030
 
                return
1031
 
            # Have to check if client.still_valid(), since it is
1032
 
            # possible that the client timed out while establishing
1033
 
            # the GnuTLS session.
1034
 
            if not client.still_valid():
1035
 
                ipc.write(u"INVALID %s\n" % client.name)
1036
 
                session.bye()
1037
 
                return
1038
 
            ipc.write(u"SENDING %s\n" % client.name)
1039
 
            sent_size = 0
1040
 
            while sent_size < len(client.secret):
1041
 
                sent = session.send(client.secret[sent_size:])
1042
 
                logger.debug(u"Sent: %d, remaining: %d",
1043
 
                             sent, len(client.secret)
1044
 
                             - (sent_size + sent))
1045
 
                sent_size += sent
1046
 
            session.bye()
 
1272
            finally:
 
1273
                if approval_required:
 
1274
                    client.approvals_pending -= 1
 
1275
                try:
 
1276
                    session.bye()
 
1277
                except (gnutls.errors.GNUTLSError), error:
 
1278
                    logger.warning("GnuTLS bye failed")
1047
1279
    
1048
1280
    @staticmethod
1049
1281
    def peer_certificate(session):
1109
1341
        return hex_fpr
1110
1342
 
1111
1343
 
1112
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1113
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
1344
class MultiprocessingMixIn(object):
 
1345
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1346
    def sub_process_main(self, request, address):
 
1347
        try:
 
1348
            self.finish_request(request, address)
 
1349
        except:
 
1350
            self.handle_error(request, address)
 
1351
        self.close_request(request)
 
1352
            
 
1353
    def process_request(self, request, address):
 
1354
        """Start a new process to process the request."""
 
1355
        multiprocessing.Process(target = self.sub_process_main,
 
1356
                                args = (request, address)).start()
 
1357
 
 
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1359
    """ adds a pipe to the MixIn """
1114
1360
    def process_request(self, request, client_address):
1115
1361
        """Overrides and wraps the original process_request().
1116
1362
        
1117
1363
        This function creates a new pipe in self.pipe
1118
1364
        """
1119
 
        self.pipe = os.pipe()
1120
 
        super(ForkingMixInWithPipe,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1121
1368
              self).process_request(request, client_address)
1122
 
        os.close(self.pipe[1])  # close write end
1123
 
        self.add_pipe(self.pipe[0])
1124
 
    def add_pipe(self, pipe):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
1125
1373
        """Dummy function; override as necessary"""
1126
 
        os.close(pipe)
1127
 
 
1128
 
 
1129
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1130
1377
                     socketserver.TCPServer, object):
1131
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1132
1379
    
1217
1464
            return socketserver.TCPServer.server_activate(self)
1218
1465
    def enable(self):
1219
1466
        self.enabled = True
1220
 
    def add_pipe(self, pipe):
 
1467
    def add_pipe(self, parent_pipe):
1221
1468
        # Call "handle_ipc" for both data and EOF events
1222
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1223
 
                             self.handle_ipc)
1224
 
    def handle_ipc(self, source, condition, file_objects={}):
 
1469
        gobject.io_add_watch(parent_pipe.fileno(),
 
1470
                             gobject.IO_IN | gobject.IO_HUP,
 
1471
                             functools.partial(self.handle_ipc,
 
1472
                                               parent_pipe = parent_pipe))
 
1473
        
 
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1475
                   client_object=None):
1225
1476
        condition_names = {
1226
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1227
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1236
1487
                                       for cond, name in
1237
1488
                                       condition_names.iteritems()
1238
1489
                                       if cond & condition)
1239
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1240
 
                     conditions_string)
1241
 
        
1242
 
        # Turn the pipe file descriptor into a Python file object
1243
 
        if source not in file_objects:
1244
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1245
 
        
1246
 
        # Read a line from the file object
1247
 
        cmdline = file_objects[source].readline()
1248
 
        if not cmdline:             # Empty line means end of file
1249
 
            # close the IPC pipe
1250
 
            file_objects[source].close()
1251
 
            del file_objects[source]
1252
 
            
1253
 
            # Stop calling this function
1254
 
            return False
1255
 
        
1256
 
        logger.debug(u"IPC command: %r", cmdline)
1257
 
        
1258
 
        # Parse and act on command
1259
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1260
 
        
1261
 
        if cmd == u"NOTFOUND":
1262
 
            logger.warning(u"Client not found for fingerprint: %s",
1263
 
                           args)
1264
 
            if self.use_dbus:
1265
 
                # Emit D-Bus signal
1266
 
                mandos_dbus_service.ClientNotFound(args)
1267
 
        elif cmd == u"INVALID":
1268
 
            for client in self.clients:
1269
 
                if client.name == args:
1270
 
                    logger.warning(u"Client %s is invalid", args)
1271
 
                    if self.use_dbus:
1272
 
                        # Emit D-Bus signal
1273
 
                        client.Rejected()
1274
 
                    break
1275
 
            else:
1276
 
                logger.error(u"Unknown client %s is invalid", args)
1277
 
        elif cmd == u"SENDING":
1278
 
            for client in self.clients:
1279
 
                if client.name == args:
1280
 
                    logger.info(u"Sending secret to %s", client.name)
1281
 
                    client.checked_ok()
1282
 
                    if self.use_dbus:
1283
 
                        # Emit D-Bus signal
1284
 
                        client.ReceivedSecret()
1285
 
                    break
1286
 
            else:
1287
 
                logger.error(u"Sending secret to unknown client %s",
1288
 
                             args)
1289
 
        else:
1290
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1291
 
        
1292
 
        # Keep calling this function
 
1490
        # error or the other end of multiprocessing.Pipe has closed
 
1491
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1492
            return False
 
1493
        
 
1494
        # Read a request from the child
 
1495
        request = parent_pipe.recv()
 
1496
        command = request[0]
 
1497
        
 
1498
        if command == 'init':
 
1499
            fpr = request[1]
 
1500
            address = request[2]
 
1501
            
 
1502
            for c in self.clients:
 
1503
                if c.fingerprint == fpr:
 
1504
                    client = c
 
1505
                    break
 
1506
            else:
 
1507
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1508
                               u"dress: %s", fpr, address)
 
1509
                if self.use_dbus:
 
1510
                    # Emit D-Bus signal
 
1511
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1512
                parent_pipe.send(False)
 
1513
                return False
 
1514
            
 
1515
            gobject.io_add_watch(parent_pipe.fileno(),
 
1516
                                 gobject.IO_IN | gobject.IO_HUP,
 
1517
                                 functools.partial(self.handle_ipc,
 
1518
                                                   parent_pipe = parent_pipe,
 
1519
                                                   client_object = client))
 
1520
            parent_pipe.send(True)
 
1521
            # remove the old hook in favor of the new above hook on same fileno
 
1522
            return False
 
1523
        if command == 'funcall':
 
1524
            funcname = request[1]
 
1525
            args = request[2]
 
1526
            kwargs = request[3]
 
1527
            
 
1528
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1529
 
 
1530
        if command == 'getattr':
 
1531
            attrname = request[1]
 
1532
            if callable(client_object.__getattribute__(attrname)):
 
1533
                parent_pipe.send(('function',))
 
1534
            else:
 
1535
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1536
        
 
1537
        if command == 'setattr':
 
1538
            attrname = request[1]
 
1539
            value = request[2]
 
1540
            setattr(client_object, attrname, value)
 
1541
 
1293
1542
        return True
1294
1543
 
1295
1544
 
1325
1574
            elif suffix == u"w":
1326
1575
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1327
1576
            else:
1328
 
                raise ValueError
1329
 
        except (ValueError, IndexError):
1330
 
            raise ValueError
 
1577
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1578
        except (ValueError, IndexError), e:
 
1579
            raise ValueError(e.message)
1331
1580
        timevalue += delta
1332
1581
    return timevalue
1333
1582
 
1346
1595
        def if_nametoindex(interface):
1347
1596
            "Get an interface index the hard way, i.e. using fcntl()"
1348
1597
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1349
 
            with closing(socket.socket()) as s:
 
1598
            with contextlib.closing(socket.socket()) as s:
1350
1599
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1351
1600
                                    struct.pack(str(u"16s16x"),
1352
1601
                                                interface))
1372
1621
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1373
1622
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1374
1623
            raise OSError(errno.ENODEV,
1375
 
                          u"/dev/null not a character device")
 
1624
                          u"%s not a character device"
 
1625
                          % os.path.devnull)
1376
1626
        os.dup2(null, sys.stdin.fileno())
1377
1627
        os.dup2(null, sys.stdout.fileno())
1378
1628
        os.dup2(null, sys.stderr.fileno())
1397
1647
    parser.add_option("--debug", action=u"store_true",
1398
1648
                      help=u"Debug mode; run in foreground and log to"
1399
1649
                      u" terminal")
 
1650
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1651
                      help=u"Debug level for stdout output")
1400
1652
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1401
1653
                      u" priority string (see GnuTLS documentation)")
1402
1654
    parser.add_option("--servicename", type=u"string",
1427
1679
                        u"servicename": u"Mandos",
1428
1680
                        u"use_dbus": u"True",
1429
1681
                        u"use_ipv6": u"True",
 
1682
                        u"debuglevel": u"",
1430
1683
                        }
1431
1684
    
1432
1685
    # Parse config file for server-global settings
1449
1702
    # options, if set.
1450
1703
    for option in (u"interface", u"address", u"port", u"debug",
1451
1704
                   u"priority", u"servicename", u"configdir",
1452
 
                   u"use_dbus", u"use_ipv6"):
 
1705
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1453
1706
        value = getattr(options, option)
1454
1707
        if value is not None:
1455
1708
            server_settings[option] = value
1464
1717
    
1465
1718
    # For convenience
1466
1719
    debug = server_settings[u"debug"]
 
1720
    debuglevel = server_settings[u"debuglevel"]
1467
1721
    use_dbus = server_settings[u"use_dbus"]
1468
1722
    use_ipv6 = server_settings[u"use_ipv6"]
1469
 
    
1470
 
    if not debug:
1471
 
        syslogger.setLevel(logging.WARNING)
1472
 
        console.setLevel(logging.WARNING)
1473
 
    
 
1723
 
1474
1724
    if server_settings[u"servicename"] != u"Mandos":
1475
1725
        syslogger.setFormatter(logging.Formatter
1476
1726
                               (u'Mandos (%s) [%%(process)d]:'
1482
1732
                        u"interval": u"5m",
1483
1733
                        u"checker": u"fping -q -- %%(host)s",
1484
1734
                        u"host": u"",
 
1735
                        u"approval_delay": u"0s",
 
1736
                        u"approval_duration": u"1s",
1485
1737
                        }
1486
1738
    client_config = configparser.SafeConfigParser(client_defaults)
1487
1739
    client_config.read(os.path.join(server_settings[u"configdir"],
1493
1745
    tcp_server = MandosServer((server_settings[u"address"],
1494
1746
                               server_settings[u"port"]),
1495
1747
                              ClientHandler,
1496
 
                              interface=server_settings[u"interface"],
 
1748
                              interface=(server_settings[u"interface"]
 
1749
                                         or None),
1497
1750
                              use_ipv6=use_ipv6,
1498
1751
                              gnutls_priority=
1499
1752
                              server_settings[u"priority"],
1525
1778
        if error[0] != errno.EPERM:
1526
1779
            raise error
1527
1780
    
1528
 
    # Enable all possible GnuTLS debugging
 
1781
    if not debug and not debuglevel:
 
1782
        syslogger.setLevel(logging.WARNING)
 
1783
        console.setLevel(logging.WARNING)
 
1784
    if debuglevel:
 
1785
        level = getattr(logging, debuglevel.upper())
 
1786
        syslogger.setLevel(level)
 
1787
        console.setLevel(level)
 
1788
 
1529
1789
    if debug:
 
1790
        # Enable all possible GnuTLS debugging
 
1791
        
1530
1792
        # "Use a log level over 10 to enable all debugging options."
1531
1793
        # - GnuTLS manual
1532
1794
        gnutls.library.functions.gnutls_global_set_log_level(11)
1537
1799
        
1538
1800
        (gnutls.library.functions
1539
1801
         .gnutls_global_set_log_function(debug_gnutls))
 
1802
        
 
1803
        # Redirect stdin so all checkers get /dev/null
 
1804
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1805
        os.dup2(null, sys.stdin.fileno())
 
1806
        if null > 2:
 
1807
            os.close(null)
 
1808
    else:
 
1809
        # No console logging
 
1810
        logger.removeHandler(console)
 
1811
    
1540
1812
    
1541
1813
    global main_loop
1542
1814
    # From the Avahi example code
1545
1817
    bus = dbus.SystemBus()
1546
1818
    # End of Avahi example code
1547
1819
    if use_dbus:
1548
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1820
        try:
 
1821
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1822
                                            bus, do_not_queue=True)
 
1823
        except dbus.exceptions.NameExistsException, e:
 
1824
            logger.error(unicode(e) + u", disabling D-Bus")
 
1825
            use_dbus = False
 
1826
            server_settings[u"use_dbus"] = False
 
1827
            tcp_server.use_dbus = False
1549
1828
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1550
1829
    service = AvahiService(name = server_settings[u"servicename"],
1551
1830
                           servicetype = u"_mandos._tcp",
1553
1832
    if server_settings["interface"]:
1554
1833
        service.interface = (if_nametoindex
1555
1834
                             (str(server_settings[u"interface"])))
 
1835
 
 
1836
    if not debug:
 
1837
        # Close all input and output, do double fork, etc.
 
1838
        daemon()
 
1839
        
 
1840
    global multiprocessing_manager
 
1841
    multiprocessing_manager = multiprocessing.Manager()
1556
1842
    
1557
1843
    client_class = Client
1558
1844
    if use_dbus:
1559
1845
        client_class = functools.partial(ClientDBus, bus = bus)
 
1846
    def client_config_items(config, section):
 
1847
        special_settings = {
 
1848
            "approved_by_default":
 
1849
                lambda: config.getboolean(section,
 
1850
                                          "approved_by_default"),
 
1851
            }
 
1852
        for name, value in config.items(section):
 
1853
            try:
 
1854
                yield (name, special_settings[name]())
 
1855
            except KeyError:
 
1856
                yield (name, value)
 
1857
    
1560
1858
    tcp_server.clients.update(set(
1561
1859
            client_class(name = section,
1562
 
                         config= dict(client_config.items(section)))
 
1860
                         config= dict(client_config_items(
 
1861
                        client_config, section)))
1563
1862
            for section in client_config.sections()))
1564
1863
    if not tcp_server.clients:
1565
1864
        logger.warning(u"No clients defined")
1566
 
    
1567
 
    if debug:
1568
 
        # Redirect stdin so all checkers get /dev/null
1569
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1570
 
        os.dup2(null, sys.stdin.fileno())
1571
 
        if null > 2:
1572
 
            os.close(null)
1573
 
    else:
1574
 
        # No console logging
1575
 
        logger.removeHandler(console)
1576
 
        # Close all input and output, do double fork, etc.
1577
 
        daemon()
1578
 
    
 
1865
        
1579
1866
    try:
1580
 
        with closing(pidfile):
 
1867
        with pidfile:
1581
1868
            pid = os.getpid()
1582
1869
            pidfile.write(str(pid) + "\n")
1583
1870
        del pidfile
1589
1876
        pass
1590
1877
    del pidfilename
1591
1878
    
1592
 
    def cleanup():
1593
 
        "Cleanup function; run on exit"
1594
 
        service.cleanup()
1595
 
        
1596
 
        while tcp_server.clients:
1597
 
            client = tcp_server.clients.pop()
1598
 
            client.disable_hook = None
1599
 
            client.disable()
1600
 
    
1601
 
    atexit.register(cleanup)
1602
 
    
1603
1879
    if not debug:
1604
1880
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1605
1881
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1612
1888
                dbus.service.Object.__init__(self, bus, u"/")
1613
1889
            _interface = u"se.bsnet.fukt.Mandos"
1614
1890
            
1615
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1616
 
            def ClientAdded(self, objpath, properties):
 
1891
            @dbus.service.signal(_interface, signature=u"o")
 
1892
            def ClientAdded(self, objpath):
1617
1893
                "D-Bus signal"
1618
1894
                pass
1619
1895
            
1620
 
            @dbus.service.signal(_interface, signature=u"s")
1621
 
            def ClientNotFound(self, fingerprint):
 
1896
            @dbus.service.signal(_interface, signature=u"ss")
 
1897
            def ClientNotFound(self, fingerprint, address):
1622
1898
                "D-Bus signal"
1623
1899
                pass
1624
1900
            
1650
1926
                        tcp_server.clients.remove(c)
1651
1927
                        c.remove_from_connection()
1652
1928
                        # Don't signal anything except ClientRemoved
1653
 
                        c.disable(signal=False)
 
1929
                        c.disable(quiet=True)
1654
1930
                        # Emit D-Bus signal
1655
1931
                        self.ClientRemoved(object_path, c.name)
1656
1932
                        return
1657
 
                raise KeyError
 
1933
                raise KeyError(object_path)
1658
1934
            
1659
1935
            del _interface
1660
1936
        
1661
1937
        mandos_dbus_service = MandosDBusService()
1662
1938
    
 
1939
    def cleanup():
 
1940
        "Cleanup function; run on exit"
 
1941
        service.cleanup()
 
1942
        
 
1943
        while tcp_server.clients:
 
1944
            client = tcp_server.clients.pop()
 
1945
            if use_dbus:
 
1946
                client.remove_from_connection()
 
1947
            client.disable_hook = None
 
1948
            # Don't signal anything except ClientRemoved
 
1949
            client.disable(quiet=True)
 
1950
            if use_dbus:
 
1951
                # Emit D-Bus signal
 
1952
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1953
                                                  client.name)
 
1954
    
 
1955
    atexit.register(cleanup)
 
1956
    
1663
1957
    for client in tcp_server.clients:
1664
1958
        if use_dbus:
1665
1959
            # Emit D-Bus signal
1666
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1667
 
                                            client.GetAll(u""))
 
1960
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1668
1961
        client.enable()
1669
1962
    
1670
1963
    tcp_server.enable()
1688
1981
            service.activate()
1689
1982
        except dbus.exceptions.DBusException, error:
1690
1983
            logger.critical(u"DBusException: %s", error)
 
1984
            cleanup()
1691
1985
            sys.exit(1)
1692
1986
        # End of Avahi example code
1693
1987
        
1700
1994
        main_loop.run()
1701
1995
    except AvahiError, error:
1702
1996
        logger.critical(u"AvahiError: %s", error)
 
1997
        cleanup()
1703
1998
        sys.exit(1)
1704
1999
    except KeyboardInterrupt:
1705
2000
        if debug:
1706
2001
            print >> sys.stderr
1707
2002
        logger.debug(u"Server received KeyboardInterrupt")
1708
2003
    logger.debug(u"Server exiting")
 
2004
    # Must run before the D-Bus bus name gets deregistered
 
2005
    cleanup()
1709
2006
 
1710
2007
if __name__ == '__main__':
1711
2008
    main()