/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 Hogeborn
  • Date: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

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
    
761
 
    # CheckedOK - method
762
 
    @dbus.service.method(_interface)
763
 
    def CheckedOK(self):
764
 
        return self.checked_ok()
 
845
    ## Signals
765
846
    
766
847
    # CheckerCompleted - signal
767
848
    @dbus.service.signal(_interface, signature=u"nxs")
781
862
        "D-Bus signal"
782
863
        pass
783
864
    
784
 
    # ReceivedSecret - signal
 
865
    # GotSecret - signal
785
866
    @dbus.service.signal(_interface)
786
 
    def ReceivedSecret(self):
787
 
        "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
        """
788
872
        pass
789
873
    
790
874
    # Rejected - signal
791
 
    @dbus.service.signal(_interface)
792
 
    def Rejected(self):
793
 
        "D-Bus signal"
794
 
        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()
795
897
    
796
898
    # Enable - method
797
899
    @dbus.service.method(_interface)
816
918
    def StopChecker(self):
817
919
        self.stop_checker()
818
920
    
819
 
    # 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
820
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
821
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
822
965
        return dbus.String(self.name)
823
966
    
824
 
    # fingerprint - property
 
967
    # Fingerprint - property
825
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
826
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
827
970
        return dbus.String(self.fingerprint)
828
971
    
829
 
    # host - property
 
972
    # Host - property
830
973
    @dbus_service_property(_interface, signature=u"s",
831
974
                           access=u"readwrite")
832
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
833
976
        if value is None:       # get
834
977
            return dbus.String(self.host)
835
978
        self.host = value
836
979
        # Emit D-Bus signal
837
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
838
981
                             dbus.String(value, variant_level=1))
839
982
    
840
 
    # created - property
 
983
    # Created - property
841
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
842
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
843
986
        return dbus.String(self._datetime_to_dbus(self.created))
844
987
    
845
 
    # last_enabled - property
 
988
    # LastEnabled - property
846
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
847
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
848
991
        if self.last_enabled is None:
849
992
            return dbus.String(u"")
850
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
851
994
    
852
 
    # enabled - property
 
995
    # Enabled - property
853
996
    @dbus_service_property(_interface, signature=u"b",
854
997
                           access=u"readwrite")
855
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
856
999
        if value is None:       # get
857
1000
            return dbus.Boolean(self.enabled)
858
1001
        if value:
860
1003
        else:
861
1004
            self.disable()
862
1005
    
863
 
    # last_checked_ok - property
 
1006
    # LastCheckedOK - property
864
1007
    @dbus_service_property(_interface, signature=u"s",
865
1008
                           access=u"readwrite")
866
 
    def last_checked_ok_dbus_property(self, value=None):
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
867
1010
        if value is not None:
868
1011
            self.checked_ok()
869
1012
            return
872
1015
        return dbus.String(self._datetime_to_dbus(self
873
1016
                                                  .last_checked_ok))
874
1017
    
875
 
    # timeout - property
 
1018
    # Timeout - property
876
1019
    @dbus_service_property(_interface, signature=u"t",
877
1020
                           access=u"readwrite")
878
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
879
1022
        if value is None:       # get
880
1023
            return dbus.UInt64(self.timeout_milliseconds())
881
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
882
1025
        # Emit D-Bus signal
883
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
884
1027
                             dbus.UInt64(value, variant_level=1))
885
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
886
1029
            return
900
1043
            self.disable_initiator_tag = (gobject.timeout_add
901
1044
                                          (time_to_die, self.disable))
902
1045
    
903
 
    # interval - property
 
1046
    # Interval - property
904
1047
    @dbus_service_property(_interface, signature=u"t",
905
1048
                           access=u"readwrite")
906
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
907
1050
        if value is None:       # get
908
1051
            return dbus.UInt64(self.interval_milliseconds())
909
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
910
1053
        # Emit D-Bus signal
911
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
912
1055
                             dbus.UInt64(value, variant_level=1))
913
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
914
1057
            return
918
1061
                                      (value, self.start_checker))
919
1062
        self.start_checker()    # Start one now, too
920
1063
 
921
 
    # checker - property
 
1064
    # Checker - property
922
1065
    @dbus_service_property(_interface, signature=u"s",
923
1066
                           access=u"readwrite")
924
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
925
1068
        if value is None:       # get
926
1069
            return dbus.String(self.checker_command)
927
1070
        self.checker_command = value
928
1071
        # Emit D-Bus signal
929
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
930
1073
                             dbus.String(self.checker_command,
931
1074
                                         variant_level=1))
932
1075
    
933
 
    # checker_running - property
 
1076
    # CheckerRunning - property
934
1077
    @dbus_service_property(_interface, signature=u"b",
935
1078
                           access=u"readwrite")
936
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
937
1080
        if value is None:       # get
938
1081
            return dbus.Boolean(self.checker is not None)
939
1082
        if value:
941
1084
        else:
942
1085
            self.stop_checker()
943
1086
    
944
 
    # object_path - property
 
1087
    # ObjectPath - property
945
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
946
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
947
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
948
1091
    
949
 
    # secret = property
 
1092
    # Secret = property
950
1093
    @dbus_service_property(_interface, signature=u"ay",
951
1094
                           access=u"write", byte_arrays=True)
952
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
953
1096
        self.secret = str(value)
954
1097
    
955
1098
    del _interface
956
1099
 
957
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
 
958
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
959
1128
    """A class to handle client connections.
960
1129
    
962
1131
    Note: This will run in its own forked process."""
963
1132
    
964
1133
    def handle(self):
965
 
        logger.info(u"TCP connection from: %s",
966
 
                    unicode(self.client_address))
967
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
968
 
        # Open IPC pipe to parent process
969
 
        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
 
970
1140
            session = (gnutls.connection
971
1141
                       .ClientSession(self.request,
972
1142
                                      gnutls.connection
973
1143
                                      .X509Credentials()))
974
 
            
975
 
            line = self.request.makefile().readline()
976
 
            logger.debug(u"Protocol version: %r", line)
977
 
            try:
978
 
                if int(line.strip().split()[0]) > 1:
979
 
                    raise RuntimeError
980
 
            except (ValueError, IndexError, RuntimeError), error:
981
 
                logger.error(u"Unknown protocol version: %s", error)
982
 
                return
983
 
            
 
1144
 
984
1145
            # Note: gnutls.connection.X509Credentials is really a
985
1146
            # generic GnuTLS certificate credentials object so long as
986
1147
            # no X.509 keys are added to it.  Therefore, we can use it
987
1148
            # here despite using OpenPGP certificates.
988
 
            
 
1149
 
989
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
990
1151
            #                      u"+AES-256-CBC", u"+SHA1",
991
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
997
1158
            (gnutls.library.functions
998
1159
             .gnutls_priority_set_direct(session._c_object,
999
1160
                                         priority, None))
1000
 
            
 
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
1001
1174
            try:
1002
1175
                session.handshake()
1003
1176
            except gnutls.errors.GNUTLSError, error:
1006
1179
                # established.  Just abandon the request.
1007
1180
                return
1008
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
1009
1184
            try:
1010
 
                fpr = self.fingerprint(self.peer_certificate(session))
1011
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1012
 
                logger.warning(u"Bad certificate: %s", error)
1013
 
                session.bye()
1014
 
                return
1015
 
            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("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()
1016
1271
            
1017
 
            for c in self.server.clients:
1018
 
                if c.fingerprint == fpr:
1019
 
                    client = c
1020
 
                    break
1021
 
            else:
1022
 
                ipc.write(u"NOTFOUND %s %s\n"
1023
 
                          % (fpr, unicode(self.client_address)))
1024
 
                session.bye()
1025
 
                return
1026
 
            # Have to check if client.still_valid(), since it is
1027
 
            # possible that the client timed out while establishing
1028
 
            # the GnuTLS session.
1029
 
            if not client.still_valid():
1030
 
                ipc.write(u"INVALID %s\n" % client.name)
1031
 
                session.bye()
1032
 
                return
1033
 
            ipc.write(u"SENDING %s\n" % client.name)
1034
 
            sent_size = 0
1035
 
            while sent_size < len(client.secret):
1036
 
                sent = session.send(client.secret[sent_size:])
1037
 
                logger.debug(u"Sent: %d, remaining: %d",
1038
 
                             sent, len(client.secret)
1039
 
                             - (sent_size + sent))
1040
 
                sent_size += sent
1041
 
            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")
1042
1279
    
1043
1280
    @staticmethod
1044
1281
    def peer_certificate(session):
1104
1341
        return hex_fpr
1105
1342
 
1106
1343
 
1107
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1108
 
    """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 """
1109
1360
    def process_request(self, request, client_address):
1110
1361
        """Overrides and wraps the original process_request().
1111
1362
        
1112
1363
        This function creates a new pipe in self.pipe
1113
1364
        """
1114
 
        self.pipe = os.pipe()
1115
 
        super(ForkingMixInWithPipe,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1116
1368
              self).process_request(request, client_address)
1117
 
        os.close(self.pipe[1])  # close write end
1118
 
        self.add_pipe(self.pipe[0])
1119
 
    def add_pipe(self, pipe):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
1120
1373
        """Dummy function; override as necessary"""
1121
 
        os.close(pipe)
1122
 
 
1123
 
 
1124
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1125
1377
                     socketserver.TCPServer, object):
1126
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1127
1379
    
1212
1464
            return socketserver.TCPServer.server_activate(self)
1213
1465
    def enable(self):
1214
1466
        self.enabled = True
1215
 
    def add_pipe(self, pipe):
 
1467
    def add_pipe(self, parent_pipe):
1216
1468
        # Call "handle_ipc" for both data and EOF events
1217
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1218
 
                             self.handle_ipc)
1219
 
    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):
1220
1476
        condition_names = {
1221
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1222
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1233
1489
                                       if cond & condition)
1234
1490
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1235
1491
                     conditions_string)
1236
 
        
1237
 
        # Turn the pipe file descriptor into a Python file object
1238
 
        if source not in file_objects:
1239
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1240
 
        
1241
 
        # Read a line from the file object
1242
 
        cmdline = file_objects[source].readline()
1243
 
        if not cmdline:             # Empty line means end of file
1244
 
            # close the IPC pipe
1245
 
            file_objects[source].close()
1246
 
            del file_objects[source]
1247
 
            
1248
 
            # Stop calling this function
1249
 
            return False
1250
 
        
1251
 
        logger.debug(u"IPC command: %r", cmdline)
1252
 
        
1253
 
        # Parse and act on command
1254
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1255
 
        
1256
 
        if cmd == u"NOTFOUND":
1257
 
            logger.warning(u"Client not found for fingerprint: %s",
1258
 
                           args)
1259
 
            if self.use_dbus:
1260
 
                # Emit D-Bus signal
1261
 
                mandos_dbus_service.ClientNotFound(args)
1262
 
        elif cmd == u"INVALID":
1263
 
            for client in self.clients:
1264
 
                if client.name == args:
1265
 
                    logger.warning(u"Client %s is invalid", args)
1266
 
                    if self.use_dbus:
1267
 
                        # Emit D-Bus signal
1268
 
                        client.Rejected()
1269
 
                    break
1270
 
            else:
1271
 
                logger.error(u"Unknown client %s is invalid", args)
1272
 
        elif cmd == u"SENDING":
1273
 
            for client in self.clients:
1274
 
                if client.name == args:
1275
 
                    logger.info(u"Sending secret to %s", client.name)
1276
 
                    client.checked_ok()
1277
 
                    if self.use_dbus:
1278
 
                        # Emit D-Bus signal
1279
 
                        client.ReceivedSecret()
1280
 
                    break
1281
 
            else:
1282
 
                logger.error(u"Sending secret to unknown client %s",
1283
 
                             args)
1284
 
        else:
1285
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1286
 
        
1287
 
        # Keep calling this function
 
1492
 
 
1493
        # error or the other end of multiprocessing.Pipe has closed
 
1494
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1495
            return False
 
1496
        
 
1497
        # Read a request from the child
 
1498
        request = parent_pipe.recv()
 
1499
        logger.debug(u"IPC request: %s", repr(request))
 
1500
        command = request[0]
 
1501
        
 
1502
        if command == 'init':
 
1503
            fpr = request[1]
 
1504
            address = request[2]
 
1505
            
 
1506
            for c in self.clients:
 
1507
                if c.fingerprint == fpr:
 
1508
                    client = c
 
1509
                    break
 
1510
            else:
 
1511
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1512
                               u"dress: %s", fpr, address)
 
1513
                if self.use_dbus:
 
1514
                    # Emit D-Bus signal
 
1515
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1516
                parent_pipe.send(False)
 
1517
                return False
 
1518
            
 
1519
            gobject.io_add_watch(parent_pipe.fileno(),
 
1520
                                 gobject.IO_IN | gobject.IO_HUP,
 
1521
                                 functools.partial(self.handle_ipc,
 
1522
                                                   parent_pipe = parent_pipe,
 
1523
                                                   client_object = client))
 
1524
            parent_pipe.send(True)
 
1525
            # remove the old hook in favor of the new above hook on same fileno
 
1526
            return False
 
1527
        if command == 'funcall':
 
1528
            funcname = request[1]
 
1529
            args = request[2]
 
1530
            kwargs = request[3]
 
1531
            
 
1532
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1533
 
 
1534
        if command == 'getattr':
 
1535
            attrname = request[1]
 
1536
            if callable(client_object.__getattribute__(attrname)):
 
1537
                parent_pipe.send(('function',))
 
1538
            else:
 
1539
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1540
        
 
1541
        if command == 'setattr':
 
1542
            attrname = request[1]
 
1543
            value = request[2]
 
1544
            setattr(client_object, attrname, value)
 
1545
 
1288
1546
        return True
1289
1547
 
1290
1548
 
1320
1578
            elif suffix == u"w":
1321
1579
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1322
1580
            else:
1323
 
                raise ValueError
1324
 
        except (ValueError, IndexError):
1325
 
            raise ValueError
 
1581
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1582
        except (ValueError, IndexError), e:
 
1583
            raise ValueError(e.message)
1326
1584
        timevalue += delta
1327
1585
    return timevalue
1328
1586
 
1341
1599
        def if_nametoindex(interface):
1342
1600
            "Get an interface index the hard way, i.e. using fcntl()"
1343
1601
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1344
 
            with closing(socket.socket()) as s:
 
1602
            with contextlib.closing(socket.socket()) as s:
1345
1603
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1346
1604
                                    struct.pack(str(u"16s16x"),
1347
1605
                                                interface))
1367
1625
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1368
1626
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1369
1627
            raise OSError(errno.ENODEV,
1370
 
                          u"/dev/null not a character device")
 
1628
                          u"%s not a character device"
 
1629
                          % os.path.devnull)
1371
1630
        os.dup2(null, sys.stdin.fileno())
1372
1631
        os.dup2(null, sys.stdout.fileno())
1373
1632
        os.dup2(null, sys.stderr.fileno())
1392
1651
    parser.add_option("--debug", action=u"store_true",
1393
1652
                      help=u"Debug mode; run in foreground and log to"
1394
1653
                      u" terminal")
 
1654
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1655
                      help=u"Debug level for stdout output")
1395
1656
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1396
1657
                      u" priority string (see GnuTLS documentation)")
1397
1658
    parser.add_option("--servicename", type=u"string",
1422
1683
                        u"servicename": u"Mandos",
1423
1684
                        u"use_dbus": u"True",
1424
1685
                        u"use_ipv6": u"True",
 
1686
                        u"debuglevel": u"",
1425
1687
                        }
1426
1688
    
1427
1689
    # Parse config file for server-global settings
1444
1706
    # options, if set.
1445
1707
    for option in (u"interface", u"address", u"port", u"debug",
1446
1708
                   u"priority", u"servicename", u"configdir",
1447
 
                   u"use_dbus", u"use_ipv6"):
 
1709
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1448
1710
        value = getattr(options, option)
1449
1711
        if value is not None:
1450
1712
            server_settings[option] = value
1459
1721
    
1460
1722
    # For convenience
1461
1723
    debug = server_settings[u"debug"]
 
1724
    debuglevel = server_settings[u"debuglevel"]
1462
1725
    use_dbus = server_settings[u"use_dbus"]
1463
1726
    use_ipv6 = server_settings[u"use_ipv6"]
1464
 
    
1465
 
    if not debug:
1466
 
        syslogger.setLevel(logging.WARNING)
1467
 
        console.setLevel(logging.WARNING)
1468
 
    
 
1727
 
1469
1728
    if server_settings[u"servicename"] != u"Mandos":
1470
1729
        syslogger.setFormatter(logging.Formatter
1471
1730
                               (u'Mandos (%s) [%%(process)d]:'
1477
1736
                        u"interval": u"5m",
1478
1737
                        u"checker": u"fping -q -- %%(host)s",
1479
1738
                        u"host": u"",
 
1739
                        u"approval_delay": u"0s",
 
1740
                        u"approval_duration": u"1s",
1480
1741
                        }
1481
1742
    client_config = configparser.SafeConfigParser(client_defaults)
1482
1743
    client_config.read(os.path.join(server_settings[u"configdir"],
1488
1749
    tcp_server = MandosServer((server_settings[u"address"],
1489
1750
                               server_settings[u"port"]),
1490
1751
                              ClientHandler,
1491
 
                              interface=server_settings[u"interface"],
 
1752
                              interface=(server_settings[u"interface"]
 
1753
                                         or None),
1492
1754
                              use_ipv6=use_ipv6,
1493
1755
                              gnutls_priority=
1494
1756
                              server_settings[u"priority"],
1520
1782
        if error[0] != errno.EPERM:
1521
1783
            raise error
1522
1784
    
1523
 
    # Enable all possible GnuTLS debugging
 
1785
    if not debug and not debuglevel:
 
1786
        syslogger.setLevel(logging.WARNING)
 
1787
        console.setLevel(logging.WARNING)
 
1788
    if debuglevel:
 
1789
        level = getattr(logging, debuglevel.upper())
 
1790
        syslogger.setLevel(level)
 
1791
        console.setLevel(level)
 
1792
 
1524
1793
    if debug:
 
1794
        # Enable all possible GnuTLS debugging
 
1795
        
1525
1796
        # "Use a log level over 10 to enable all debugging options."
1526
1797
        # - GnuTLS manual
1527
1798
        gnutls.library.functions.gnutls_global_set_log_level(11)
1532
1803
        
1533
1804
        (gnutls.library.functions
1534
1805
         .gnutls_global_set_log_function(debug_gnutls))
 
1806
        
 
1807
        # Redirect stdin so all checkers get /dev/null
 
1808
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1809
        os.dup2(null, sys.stdin.fileno())
 
1810
        if null > 2:
 
1811
            os.close(null)
 
1812
    else:
 
1813
        # No console logging
 
1814
        logger.removeHandler(console)
 
1815
    
1535
1816
    
1536
1817
    global main_loop
1537
1818
    # From the Avahi example code
1540
1821
    bus = dbus.SystemBus()
1541
1822
    # End of Avahi example code
1542
1823
    if use_dbus:
1543
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1824
        try:
 
1825
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1826
                                            bus, do_not_queue=True)
 
1827
        except dbus.exceptions.NameExistsException, e:
 
1828
            logger.error(unicode(e) + u", disabling D-Bus")
 
1829
            use_dbus = False
 
1830
            server_settings[u"use_dbus"] = False
 
1831
            tcp_server.use_dbus = False
1544
1832
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1545
1833
    service = AvahiService(name = server_settings[u"servicename"],
1546
1834
                           servicetype = u"_mandos._tcp",
1548
1836
    if server_settings["interface"]:
1549
1837
        service.interface = (if_nametoindex
1550
1838
                             (str(server_settings[u"interface"])))
 
1839
 
 
1840
    if not debug:
 
1841
        # Close all input and output, do double fork, etc.
 
1842
        daemon()
 
1843
        
 
1844
    global multiprocessing_manager
 
1845
    multiprocessing_manager = multiprocessing.Manager()
1551
1846
    
1552
1847
    client_class = Client
1553
1848
    if use_dbus:
1554
1849
        client_class = functools.partial(ClientDBus, bus = bus)
 
1850
    def client_config_items(config, section):
 
1851
        special_settings = {
 
1852
            "approved_by_default":
 
1853
                lambda: config.getboolean(section,
 
1854
                                          "approved_by_default"),
 
1855
            }
 
1856
        for name, value in config.items(section):
 
1857
            try:
 
1858
                yield (name, special_settings[name]())
 
1859
            except KeyError:
 
1860
                yield (name, value)
 
1861
    
1555
1862
    tcp_server.clients.update(set(
1556
1863
            client_class(name = section,
1557
 
                         config= dict(client_config.items(section)))
 
1864
                         config= dict(client_config_items(
 
1865
                        client_config, section)))
1558
1866
            for section in client_config.sections()))
1559
1867
    if not tcp_server.clients:
1560
1868
        logger.warning(u"No clients defined")
1561
 
    
1562
 
    if debug:
1563
 
        # Redirect stdin so all checkers get /dev/null
1564
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1565
 
        os.dup2(null, sys.stdin.fileno())
1566
 
        if null > 2:
1567
 
            os.close(null)
1568
 
    else:
1569
 
        # No console logging
1570
 
        logger.removeHandler(console)
1571
 
        # Close all input and output, do double fork, etc.
1572
 
        daemon()
1573
 
    
 
1869
        
1574
1870
    try:
1575
 
        with closing(pidfile):
 
1871
        with pidfile:
1576
1872
            pid = os.getpid()
1577
1873
            pidfile.write(str(pid) + "\n")
1578
1874
        del pidfile
1584
1880
        pass
1585
1881
    del pidfilename
1586
1882
    
1587
 
    def cleanup():
1588
 
        "Cleanup function; run on exit"
1589
 
        service.cleanup()
1590
 
        
1591
 
        while tcp_server.clients:
1592
 
            client = tcp_server.clients.pop()
1593
 
            client.disable_hook = None
1594
 
            client.disable()
1595
 
    
1596
 
    atexit.register(cleanup)
1597
 
    
1598
1883
    if not debug:
1599
1884
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1600
1885
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1607
1892
                dbus.service.Object.__init__(self, bus, u"/")
1608
1893
            _interface = u"se.bsnet.fukt.Mandos"
1609
1894
            
1610
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1611
 
            def ClientAdded(self, objpath, properties):
 
1895
            @dbus.service.signal(_interface, signature=u"o")
 
1896
            def ClientAdded(self, objpath):
1612
1897
                "D-Bus signal"
1613
1898
                pass
1614
1899
            
1615
 
            @dbus.service.signal(_interface, signature=u"s")
1616
 
            def ClientNotFound(self, fingerprint):
 
1900
            @dbus.service.signal(_interface, signature=u"ss")
 
1901
            def ClientNotFound(self, fingerprint, address):
1617
1902
                "D-Bus signal"
1618
1903
                pass
1619
1904
            
1645
1930
                        tcp_server.clients.remove(c)
1646
1931
                        c.remove_from_connection()
1647
1932
                        # Don't signal anything except ClientRemoved
1648
 
                        c.disable(signal=False)
 
1933
                        c.disable(quiet=True)
1649
1934
                        # Emit D-Bus signal
1650
1935
                        self.ClientRemoved(object_path, c.name)
1651
1936
                        return
1652
 
                raise KeyError
 
1937
                raise KeyError(object_path)
1653
1938
            
1654
1939
            del _interface
1655
1940
        
1656
1941
        mandos_dbus_service = MandosDBusService()
1657
1942
    
 
1943
    def cleanup():
 
1944
        "Cleanup function; run on exit"
 
1945
        service.cleanup()
 
1946
        
 
1947
        while tcp_server.clients:
 
1948
            client = tcp_server.clients.pop()
 
1949
            if use_dbus:
 
1950
                client.remove_from_connection()
 
1951
            client.disable_hook = None
 
1952
            # Don't signal anything except ClientRemoved
 
1953
            client.disable(quiet=True)
 
1954
            if use_dbus:
 
1955
                # Emit D-Bus signal
 
1956
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1957
                                                  client.name)
 
1958
    
 
1959
    atexit.register(cleanup)
 
1960
    
1658
1961
    for client in tcp_server.clients:
1659
1962
        if use_dbus:
1660
1963
            # Emit D-Bus signal
1661
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1662
 
                                            client.GetAll(u""))
 
1964
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1663
1965
        client.enable()
1664
1966
    
1665
1967
    tcp_server.enable()
1683
1985
            service.activate()
1684
1986
        except dbus.exceptions.DBusException, error:
1685
1987
            logger.critical(u"DBusException: %s", error)
 
1988
            cleanup()
1686
1989
            sys.exit(1)
1687
1990
        # End of Avahi example code
1688
1991
        
1695
1998
        main_loop.run()
1696
1999
    except AvahiError, error:
1697
2000
        logger.critical(u"AvahiError: %s", error)
 
2001
        cleanup()
1698
2002
        sys.exit(1)
1699
2003
    except KeyboardInterrupt:
1700
2004
        if debug:
1701
2005
            print >> sys.stderr
1702
2006
        logger.debug(u"Server received KeyboardInterrupt")
1703
2007
    logger.debug(u"Server exiting")
 
2008
    # Must run before the D-Bus bus name gets deregistered
 
2009
    cleanup()
1704
2010
 
1705
2011
if __name__ == '__main__':
1706
2012
    main()