/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-13 06:19:45 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100913061945-y6qw52q01ptn7q71
* mandos-keygen: Don't use "echo -e".

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
 
        if self.checker is not None:
 
434
        try:
402
435
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
436
        except (AttributeError, OSError), error:
 
437
            if (isinstance(error, OSError)
 
438
                and error.errno != errno.ECHILD):
 
439
                raise error
 
440
        else:
403
441
            if pid:
404
442
                logger.warning(u"Checker was a zombie")
405
443
                gobject.source_remove(self.checker_callback_tag)
461
499
        logger.debug(u"Stopping checker for %(name)s", vars(self))
462
500
        try:
463
501
            os.kill(self.checker.pid, signal.SIGTERM)
464
 
            #os.sleep(0.5)
 
502
            #time.sleep(0.5)
465
503
            #if self.checker.poll() is None:
466
504
            #    os.kill(self.checker.pid, signal.SIGKILL)
467
505
        except OSError, error:
468
506
            if error.errno != errno.ESRCH: # No such process
469
507
                raise
470
508
        self.checker = None
471
 
    
472
 
    def still_valid(self):
473
 
        """Has the timeout not yet passed for this client?"""
474
 
        if not getattr(self, u"enabled", False):
475
 
            return False
476
 
        now = datetime.datetime.utcnow()
477
 
        if self.last_checked_ok is None:
478
 
            return now < (self.created + self.timeout)
479
 
        else:
480
 
            return now < (self.last_checked_ok + self.timeout)
481
 
 
482
509
 
483
510
def dbus_service_property(dbus_interface, signature=u"v",
484
511
                          access=u"readwrite", byte_arrays=False):
492
519
    dbus.service.method, except there is only "signature", since the
493
520
    type from Get() and the type sent to Set() is the same.
494
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)
495
527
    def decorator(func):
496
528
        func._dbus_is_property = True
497
529
        func._dbus_interface = dbus_interface
583
615
        if prop._dbus_access == u"read":
584
616
            raise DBusPropertyAccessException(property_name)
585
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
586
622
            value = dbus.ByteArray(''.join(unichr(byte)
587
623
                                           for byte in value))
588
624
        prop(value)
620
656
        """Standard D-Bus method, overloaded to insert property tags.
621
657
        """
622
658
        xmlstring = dbus.service.Object.Introspect(self, object_path,
623
 
                                           connection)
624
 
        document = xml.dom.minidom.parseString(xmlstring)
625
 
        del xmlstring
626
 
        def make_tag(document, name, prop):
627
 
            e = document.createElement(u"property")
628
 
            e.setAttribute(u"name", name)
629
 
            e.setAttribute(u"type", prop._dbus_signature)
630
 
            e.setAttribute(u"access", prop._dbus_access)
631
 
            return e
632
 
        for if_tag in document.getElementsByTagName(u"interface"):
633
 
            for tag in (make_tag(document, name, prop)
634
 
                        for name, prop
635
 
                        in self._get_all_dbus_properties()
636
 
                        if prop._dbus_interface
637
 
                        == if_tag.getAttribute(u"name")):
638
 
                if_tag.appendChild(tag)
639
 
        xmlstring = document.toxml(u"utf-8")
640
 
        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)
641
696
        return xmlstring
642
697
 
643
698
 
651
706
    # dbus.service.Object doesn't use super(), so we can't either.
652
707
    
653
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
654
710
        self.bus = bus
655
711
        Client.__init__(self, *args, **kwargs)
656
712
        # Only now, when this client is initialized, can it show up on
660
716
                                  + self.name.replace(u".", u"_")))
661
717
        DBusObjectWithProperties.__init__(self, self.bus,
662
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
663
735
    
664
736
    @staticmethod
665
737
    def _datetime_to_dbus(dt, variant_level=0):
672
744
        r = Client.enable(self)
673
745
        if oldstate != self.enabled:
674
746
            # Emit D-Bus signals
675
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
676
748
                                 dbus.Boolean(True, variant_level=1))
677
749
            self.PropertyChanged(
678
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
679
751
                self._datetime_to_dbus(self.last_enabled,
680
752
                                       variant_level=1))
681
753
        return r
682
754
    
683
 
    def disable(self, signal = True):
 
755
    def disable(self, quiet = False):
684
756
        oldstate = getattr(self, u"enabled", False)
685
 
        r = Client.disable(self)
686
 
        if signal and oldstate != self.enabled:
 
757
        r = Client.disable(self, quiet=quiet)
 
758
        if not quiet and oldstate != self.enabled:
687
759
            # Emit D-Bus signal
688
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
689
761
                                 dbus.Boolean(False, variant_level=1))
690
762
        return r
691
763
    
703
775
        self.checker_callback_tag = None
704
776
        self.checker = None
705
777
        # Emit D-Bus signal
706
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
707
779
                             dbus.Boolean(False, variant_level=1))
708
780
        if os.WIFEXITED(condition):
709
781
            exitstatus = os.WEXITSTATUS(condition)
724
796
        r = Client.checked_ok(self, *args, **kwargs)
725
797
        # Emit D-Bus signal
726
798
        self.PropertyChanged(
727
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
728
800
            (self._datetime_to_dbus(self.last_checked_ok,
729
801
                                    variant_level=1)))
730
802
        return r
742
814
            # Emit D-Bus signal
743
815
            self.CheckerStarted(self.current_checker_command)
744
816
            self.PropertyChanged(
745
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
746
818
                dbus.Boolean(True, variant_level=1))
747
819
        return r
748
820
    
751
823
        r = Client.stop_checker(self, *args, **kwargs)
752
824
        if (old_checker is not None
753
825
            and getattr(self, u"checker", None) is None):
754
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
755
827
                                 dbus.Boolean(False, variant_level=1))
756
828
        return r
757
 
    
758
 
    ## 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
759
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
760
844
    
 
845
    ## Signals
 
846
    
761
847
    # CheckerCompleted - signal
762
848
    @dbus.service.signal(_interface, signature=u"nxs")
763
849
    def CheckerCompleted(self, exitcode, waitstatus, command):
776
862
        "D-Bus signal"
777
863
        pass
778
864
    
779
 
    # ReceivedSecret - signal
 
865
    # GotSecret - signal
780
866
    @dbus.service.signal(_interface)
781
 
    def ReceivedSecret(self):
782
 
        "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
        """
783
872
        pass
784
873
    
785
874
    # Rejected - signal
786
 
    @dbus.service.signal(_interface)
787
 
    def Rejected(self):
788
 
        "D-Bus signal"
789
 
        pass
790
 
    
791
 
    # name - property
 
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()
 
897
    
 
898
    # Enable - method
 
899
    @dbus.service.method(_interface)
 
900
    def Enable(self):
 
901
        "D-Bus method"
 
902
        self.enable()
 
903
    
 
904
    # StartChecker - method
 
905
    @dbus.service.method(_interface)
 
906
    def StartChecker(self):
 
907
        "D-Bus method"
 
908
        self.start_checker()
 
909
    
 
910
    # Disable - method
 
911
    @dbus.service.method(_interface)
 
912
    def Disable(self):
 
913
        "D-Bus method"
 
914
        self.disable()
 
915
    
 
916
    # StopChecker - method
 
917
    @dbus.service.method(_interface)
 
918
    def StopChecker(self):
 
919
        self.stop_checker()
 
920
    
 
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
792
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
793
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
794
965
        return dbus.String(self.name)
795
966
    
796
 
    # fingerprint - property
 
967
    # Fingerprint - property
797
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
798
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
799
970
        return dbus.String(self.fingerprint)
800
971
    
801
 
    # host - property
 
972
    # Host - property
802
973
    @dbus_service_property(_interface, signature=u"s",
803
974
                           access=u"readwrite")
804
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
805
976
        if value is None:       # get
806
977
            return dbus.String(self.host)
807
978
        self.host = value
808
979
        # Emit D-Bus signal
809
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
810
981
                             dbus.String(value, variant_level=1))
811
982
    
812
 
    # created - property
 
983
    # Created - property
813
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
814
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
815
986
        return dbus.String(self._datetime_to_dbus(self.created))
816
987
    
817
 
    # last_enabled - property
 
988
    # LastEnabled - property
818
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
819
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
820
991
        if self.last_enabled is None:
821
992
            return dbus.String(u"")
822
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
823
994
    
824
 
    # enabled - property
 
995
    # Enabled - property
825
996
    @dbus_service_property(_interface, signature=u"b",
826
997
                           access=u"readwrite")
827
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
828
999
        if value is None:       # get
829
1000
            return dbus.Boolean(self.enabled)
830
1001
        if value:
832
1003
        else:
833
1004
            self.disable()
834
1005
    
835
 
    # last_checked_ok - property
836
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
837
 
    def last_checked_ok_dbus_property(self):
 
1006
    # LastCheckedOK - property
 
1007
    @dbus_service_property(_interface, signature=u"s",
 
1008
                           access=u"readwrite")
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
 
1010
        if value is not None:
 
1011
            self.checked_ok()
 
1012
            return
838
1013
        if self.last_checked_ok is None:
839
1014
            return dbus.String(u"")
840
1015
        return dbus.String(self._datetime_to_dbus(self
841
1016
                                                  .last_checked_ok))
842
1017
    
843
 
    # timeout - property
 
1018
    # Timeout - property
844
1019
    @dbus_service_property(_interface, signature=u"t",
845
1020
                           access=u"readwrite")
846
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
847
1022
        if value is None:       # get
848
1023
            return dbus.UInt64(self.timeout_milliseconds())
849
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
850
1025
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
852
1027
                             dbus.UInt64(value, variant_level=1))
853
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
854
1029
            return
868
1043
            self.disable_initiator_tag = (gobject.timeout_add
869
1044
                                          (time_to_die, self.disable))
870
1045
    
871
 
    # interval - property
 
1046
    # Interval - property
872
1047
    @dbus_service_property(_interface, signature=u"t",
873
1048
                           access=u"readwrite")
874
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
875
1050
        if value is None:       # get
876
1051
            return dbus.UInt64(self.interval_milliseconds())
877
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
878
1053
        # Emit D-Bus signal
879
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
880
1055
                             dbus.UInt64(value, variant_level=1))
881
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
882
1057
            return
886
1061
                                      (value, self.start_checker))
887
1062
        self.start_checker()    # Start one now, too
888
1063
 
889
 
    # checker - property
 
1064
    # Checker - property
890
1065
    @dbus_service_property(_interface, signature=u"s",
891
1066
                           access=u"readwrite")
892
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
893
1068
        if value is None:       # get
894
1069
            return dbus.String(self.checker_command)
895
1070
        self.checker_command = value
896
1071
        # Emit D-Bus signal
897
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
898
1073
                             dbus.String(self.checker_command,
899
1074
                                         variant_level=1))
900
1075
    
901
 
    # checker_running - property
 
1076
    # CheckerRunning - property
902
1077
    @dbus_service_property(_interface, signature=u"b",
903
1078
                           access=u"readwrite")
904
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
905
1080
        if value is None:       # get
906
1081
            return dbus.Boolean(self.checker is not None)
907
1082
        if value:
909
1084
        else:
910
1085
            self.stop_checker()
911
1086
    
912
 
    # object_path - property
 
1087
    # ObjectPath - property
913
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
914
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
915
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
916
1091
    
917
 
    # secret = property xxx
 
1092
    # Secret = property
918
1093
    @dbus_service_property(_interface, signature=u"ay",
919
1094
                           access=u"write", byte_arrays=True)
920
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
921
1096
        self.secret = str(value)
922
1097
    
923
1098
    del _interface
924
1099
 
925
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
 
926
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
927
1128
    """A class to handle client connections.
928
1129
    
930
1131
    Note: This will run in its own forked process."""
931
1132
    
932
1133
    def handle(self):
933
 
        logger.info(u"TCP connection from: %s",
934
 
                    unicode(self.client_address))
935
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
936
 
        # Open IPC pipe to parent process
937
 
        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
 
938
1140
            session = (gnutls.connection
939
1141
                       .ClientSession(self.request,
940
1142
                                      gnutls.connection
941
1143
                                      .X509Credentials()))
942
 
            
943
 
            line = self.request.makefile().readline()
944
 
            logger.debug(u"Protocol version: %r", line)
945
 
            try:
946
 
                if int(line.strip().split()[0]) > 1:
947
 
                    raise RuntimeError
948
 
            except (ValueError, IndexError, RuntimeError), error:
949
 
                logger.error(u"Unknown protocol version: %s", error)
950
 
                return
951
 
            
 
1144
 
952
1145
            # Note: gnutls.connection.X509Credentials is really a
953
1146
            # generic GnuTLS certificate credentials object so long as
954
1147
            # no X.509 keys are added to it.  Therefore, we can use it
955
1148
            # here despite using OpenPGP certificates.
956
 
            
 
1149
 
957
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
958
1151
            #                      u"+AES-256-CBC", u"+SHA1",
959
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
965
1158
            (gnutls.library.functions
966
1159
             .gnutls_priority_set_direct(session._c_object,
967
1160
                                         priority, None))
968
 
            
 
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
969
1174
            try:
970
1175
                session.handshake()
971
1176
            except gnutls.errors.GNUTLSError, error:
974
1179
                # established.  Just abandon the request.
975
1180
                return
976
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
977
1184
            try:
978
 
                fpr = self.fingerprint(self.peer_certificate(session))
979
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
980
 
                logger.warning(u"Bad certificate: %s", error)
981
 
                session.bye()
982
 
                return
983
 
            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()
984
1271
            
985
 
            for c in self.server.clients:
986
 
                if c.fingerprint == fpr:
987
 
                    client = c
988
 
                    break
989
 
            else:
990
 
                ipc.write(u"NOTFOUND %s %s\n"
991
 
                          % (fpr, unicode(self.client_address)))
992
 
                session.bye()
993
 
                return
994
 
            # Have to check if client.still_valid(), since it is
995
 
            # possible that the client timed out while establishing
996
 
            # the GnuTLS session.
997
 
            if not client.still_valid():
998
 
                ipc.write(u"INVALID %s\n" % client.name)
999
 
                session.bye()
1000
 
                return
1001
 
            ipc.write(u"SENDING %s\n" % client.name)
1002
 
            sent_size = 0
1003
 
            while sent_size < len(client.secret):
1004
 
                sent = session.send(client.secret[sent_size:])
1005
 
                logger.debug(u"Sent: %d, remaining: %d",
1006
 
                             sent, len(client.secret)
1007
 
                             - (sent_size + sent))
1008
 
                sent_size += sent
1009
 
            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")
1010
1279
    
1011
1280
    @staticmethod
1012
1281
    def peer_certificate(session):
1072
1341
        return hex_fpr
1073
1342
 
1074
1343
 
1075
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1076
 
    """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 """
1077
1360
    def process_request(self, request, client_address):
1078
1361
        """Overrides and wraps the original process_request().
1079
1362
        
1080
1363
        This function creates a new pipe in self.pipe
1081
1364
        """
1082
 
        self.pipe = os.pipe()
1083
 
        super(ForkingMixInWithPipe,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1084
1368
              self).process_request(request, client_address)
1085
 
        os.close(self.pipe[1])  # close write end
1086
 
        self.add_pipe(self.pipe[0])
1087
 
    def add_pipe(self, pipe):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
1088
1373
        """Dummy function; override as necessary"""
1089
 
        os.close(pipe)
1090
 
 
1091
 
 
1092
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1093
1377
                     socketserver.TCPServer, object):
1094
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1095
1379
    
1180
1464
            return socketserver.TCPServer.server_activate(self)
1181
1465
    def enable(self):
1182
1466
        self.enabled = True
1183
 
    def add_pipe(self, pipe):
 
1467
    def add_pipe(self, parent_pipe):
1184
1468
        # Call "handle_ipc" for both data and EOF events
1185
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1186
 
                             self.handle_ipc)
1187
 
    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):
1188
1476
        condition_names = {
1189
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1190
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1199
1487
                                       for cond, name in
1200
1488
                                       condition_names.iteritems()
1201
1489
                                       if cond & condition)
1202
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1203
 
                     conditions_string)
1204
 
        
1205
 
        # Turn the pipe file descriptor into a Python file object
1206
 
        if source not in file_objects:
1207
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1208
 
        
1209
 
        # Read a line from the file object
1210
 
        cmdline = file_objects[source].readline()
1211
 
        if not cmdline:             # Empty line means end of file
1212
 
            # close the IPC pipe
1213
 
            file_objects[source].close()
1214
 
            del file_objects[source]
1215
 
            
1216
 
            # Stop calling this function
1217
 
            return False
1218
 
        
1219
 
        logger.debug(u"IPC command: %r", cmdline)
1220
 
        
1221
 
        # Parse and act on command
1222
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1223
 
        
1224
 
        if cmd == u"NOTFOUND":
1225
 
            logger.warning(u"Client not found for fingerprint: %s",
1226
 
                           args)
1227
 
            if self.use_dbus:
1228
 
                # Emit D-Bus signal
1229
 
                mandos_dbus_service.ClientNotFound(args)
1230
 
        elif cmd == u"INVALID":
1231
 
            for client in self.clients:
1232
 
                if client.name == args:
1233
 
                    logger.warning(u"Client %s is invalid", args)
1234
 
                    if self.use_dbus:
1235
 
                        # Emit D-Bus signal
1236
 
                        client.Rejected()
1237
 
                    break
1238
 
            else:
1239
 
                logger.error(u"Unknown client %s is invalid", args)
1240
 
        elif cmd == u"SENDING":
1241
 
            for client in self.clients:
1242
 
                if client.name == args:
1243
 
                    logger.info(u"Sending secret to %s", client.name)
1244
 
                    client.checked_ok()
1245
 
                    if self.use_dbus:
1246
 
                        # Emit D-Bus signal
1247
 
                        client.ReceivedSecret()
1248
 
                    break
1249
 
            else:
1250
 
                logger.error(u"Sending secret to unknown client %s",
1251
 
                             args)
1252
 
        else:
1253
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1254
 
        
1255
 
        # 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
 
1256
1542
        return True
1257
1543
 
1258
1544
 
1288
1574
            elif suffix == u"w":
1289
1575
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1290
1576
            else:
1291
 
                raise ValueError
1292
 
        except (ValueError, IndexError):
1293
 
            raise ValueError
 
1577
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1578
        except (ValueError, IndexError), e:
 
1579
            raise ValueError(e.message)
1294
1580
        timevalue += delta
1295
1581
    return timevalue
1296
1582
 
1309
1595
        def if_nametoindex(interface):
1310
1596
            "Get an interface index the hard way, i.e. using fcntl()"
1311
1597
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1312
 
            with closing(socket.socket()) as s:
 
1598
            with contextlib.closing(socket.socket()) as s:
1313
1599
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1314
1600
                                    struct.pack(str(u"16s16x"),
1315
1601
                                                interface))
1335
1621
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1336
1622
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1337
1623
            raise OSError(errno.ENODEV,
1338
 
                          u"/dev/null not a character device")
 
1624
                          u"%s not a character device"
 
1625
                          % os.path.devnull)
1339
1626
        os.dup2(null, sys.stdin.fileno())
1340
1627
        os.dup2(null, sys.stdout.fileno())
1341
1628
        os.dup2(null, sys.stderr.fileno())
1360
1647
    parser.add_option("--debug", action=u"store_true",
1361
1648
                      help=u"Debug mode; run in foreground and log to"
1362
1649
                      u" terminal")
 
1650
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1651
                      help=u"Debug level for stdout output")
1363
1652
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1364
1653
                      u" priority string (see GnuTLS documentation)")
1365
1654
    parser.add_option("--servicename", type=u"string",
1390
1679
                        u"servicename": u"Mandos",
1391
1680
                        u"use_dbus": u"True",
1392
1681
                        u"use_ipv6": u"True",
 
1682
                        u"debuglevel": u"",
1393
1683
                        }
1394
1684
    
1395
1685
    # Parse config file for server-global settings
1412
1702
    # options, if set.
1413
1703
    for option in (u"interface", u"address", u"port", u"debug",
1414
1704
                   u"priority", u"servicename", u"configdir",
1415
 
                   u"use_dbus", u"use_ipv6"):
 
1705
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1416
1706
        value = getattr(options, option)
1417
1707
        if value is not None:
1418
1708
            server_settings[option] = value
1427
1717
    
1428
1718
    # For convenience
1429
1719
    debug = server_settings[u"debug"]
 
1720
    debuglevel = server_settings[u"debuglevel"]
1430
1721
    use_dbus = server_settings[u"use_dbus"]
1431
1722
    use_ipv6 = server_settings[u"use_ipv6"]
1432
 
    
1433
 
    if not debug:
1434
 
        syslogger.setLevel(logging.WARNING)
1435
 
        console.setLevel(logging.WARNING)
1436
 
    
 
1723
 
1437
1724
    if server_settings[u"servicename"] != u"Mandos":
1438
1725
        syslogger.setFormatter(logging.Formatter
1439
1726
                               (u'Mandos (%s) [%%(process)d]:'
1445
1732
                        u"interval": u"5m",
1446
1733
                        u"checker": u"fping -q -- %%(host)s",
1447
1734
                        u"host": u"",
 
1735
                        u"approval_delay": u"0s",
 
1736
                        u"approval_duration": u"1s",
1448
1737
                        }
1449
1738
    client_config = configparser.SafeConfigParser(client_defaults)
1450
1739
    client_config.read(os.path.join(server_settings[u"configdir"],
1456
1745
    tcp_server = MandosServer((server_settings[u"address"],
1457
1746
                               server_settings[u"port"]),
1458
1747
                              ClientHandler,
1459
 
                              interface=server_settings[u"interface"],
 
1748
                              interface=(server_settings[u"interface"]
 
1749
                                         or None),
1460
1750
                              use_ipv6=use_ipv6,
1461
1751
                              gnutls_priority=
1462
1752
                              server_settings[u"priority"],
1488
1778
        if error[0] != errno.EPERM:
1489
1779
            raise error
1490
1780
    
1491
 
    # 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
 
1492
1789
    if debug:
 
1790
        # Enable all possible GnuTLS debugging
 
1791
        
1493
1792
        # "Use a log level over 10 to enable all debugging options."
1494
1793
        # - GnuTLS manual
1495
1794
        gnutls.library.functions.gnutls_global_set_log_level(11)
1500
1799
        
1501
1800
        (gnutls.library.functions
1502
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
    
1503
1812
    
1504
1813
    global main_loop
1505
1814
    # From the Avahi example code
1508
1817
    bus = dbus.SystemBus()
1509
1818
    # End of Avahi example code
1510
1819
    if use_dbus:
1511
 
        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
1512
1828
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1513
1829
    service = AvahiService(name = server_settings[u"servicename"],
1514
1830
                           servicetype = u"_mandos._tcp",
1516
1832
    if server_settings["interface"]:
1517
1833
        service.interface = (if_nametoindex
1518
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()
1519
1842
    
1520
1843
    client_class = Client
1521
1844
    if use_dbus:
1522
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
    
1523
1858
    tcp_server.clients.update(set(
1524
1859
            client_class(name = section,
1525
 
                         config= dict(client_config.items(section)))
 
1860
                         config= dict(client_config_items(
 
1861
                        client_config, section)))
1526
1862
            for section in client_config.sections()))
1527
1863
    if not tcp_server.clients:
1528
1864
        logger.warning(u"No clients defined")
1529
 
    
1530
 
    if debug:
1531
 
        # Redirect stdin so all checkers get /dev/null
1532
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1533
 
        os.dup2(null, sys.stdin.fileno())
1534
 
        if null > 2:
1535
 
            os.close(null)
1536
 
    else:
1537
 
        # No console logging
1538
 
        logger.removeHandler(console)
1539
 
        # Close all input and output, do double fork, etc.
1540
 
        daemon()
1541
 
    
 
1865
        
1542
1866
    try:
1543
 
        with closing(pidfile):
 
1867
        with pidfile:
1544
1868
            pid = os.getpid()
1545
1869
            pidfile.write(str(pid) + "\n")
1546
1870
        del pidfile
1552
1876
        pass
1553
1877
    del pidfilename
1554
1878
    
1555
 
    def cleanup():
1556
 
        "Cleanup function; run on exit"
1557
 
        service.cleanup()
1558
 
        
1559
 
        while tcp_server.clients:
1560
 
            client = tcp_server.clients.pop()
1561
 
            client.disable_hook = None
1562
 
            client.disable()
1563
 
    
1564
 
    atexit.register(cleanup)
1565
 
    
1566
1879
    if not debug:
1567
1880
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1568
1881
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1575
1888
                dbus.service.Object.__init__(self, bus, u"/")
1576
1889
            _interface = u"se.bsnet.fukt.Mandos"
1577
1890
            
1578
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1579
 
            def ClientAdded(self, objpath, properties):
 
1891
            @dbus.service.signal(_interface, signature=u"o")
 
1892
            def ClientAdded(self, objpath):
1580
1893
                "D-Bus signal"
1581
1894
                pass
1582
1895
            
1583
 
            @dbus.service.signal(_interface, signature=u"s")
1584
 
            def ClientNotFound(self, fingerprint):
 
1896
            @dbus.service.signal(_interface, signature=u"ss")
 
1897
            def ClientNotFound(self, fingerprint, address):
1585
1898
                "D-Bus signal"
1586
1899
                pass
1587
1900
            
1613
1926
                        tcp_server.clients.remove(c)
1614
1927
                        c.remove_from_connection()
1615
1928
                        # Don't signal anything except ClientRemoved
1616
 
                        c.disable(signal=False)
 
1929
                        c.disable(quiet=True)
1617
1930
                        # Emit D-Bus signal
1618
1931
                        self.ClientRemoved(object_path, c.name)
1619
1932
                        return
1620
 
                raise KeyError
 
1933
                raise KeyError(object_path)
1621
1934
            
1622
1935
            del _interface
1623
1936
        
1624
1937
        mandos_dbus_service = MandosDBusService()
1625
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
    
1626
1957
    for client in tcp_server.clients:
1627
1958
        if use_dbus:
1628
1959
            # Emit D-Bus signal
1629
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1630
 
                                            client.GetAll(u""))
 
1960
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1631
1961
        client.enable()
1632
1962
    
1633
1963
    tcp_server.enable()
1651
1981
            service.activate()
1652
1982
        except dbus.exceptions.DBusException, error:
1653
1983
            logger.critical(u"DBusException: %s", error)
 
1984
            cleanup()
1654
1985
            sys.exit(1)
1655
1986
        # End of Avahi example code
1656
1987
        
1663
1994
        main_loop.run()
1664
1995
    except AvahiError, error:
1665
1996
        logger.critical(u"AvahiError: %s", error)
 
1997
        cleanup()
1666
1998
        sys.exit(1)
1667
1999
    except KeyboardInterrupt:
1668
2000
        if debug:
1669
2001
            print >> sys.stderr
1670
2002
        logger.debug(u"Server received KeyboardInterrupt")
1671
2003
    logger.debug(u"Server exiting")
 
2004
    # Must run before the D-Bus bus name gets deregistered
 
2005
    cleanup()
1672
2006
 
1673
2007
if __name__ == '__main__':
1674
2008
    main()