/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"])),
296
 
                              "rb")) as secfile:
 
308
            with open(os.path.expanduser(os.path.expandvars
 
309
                                         (config[u"secfile"])),
 
310
                      "rb") as secfile:
297
311
                self.secret = secfile.read()
298
312
        else:
299
313
            raise TypeError(u"No secret or secfile for client %s"
313
327
        self.checker_command = config[u"checker"]
314
328
        self.current_checker_command = None
315
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())
316
339
    
 
340
    def send_changedstate(self):
 
341
        self.changedstate.acquire()
 
342
        self.changedstate.notify_all()
 
343
        self.changedstate.release()
 
344
        
317
345
    def enable(self):
318
346
        """Start this client's checker and timeout hooks"""
319
347
        if getattr(self, u"enabled", False):
320
348
            # Already enabled
321
349
            return
 
350
        self.send_changedstate()
322
351
        self.last_enabled = datetime.datetime.utcnow()
323
352
        # Schedule a new checker to be started an 'interval' from now,
324
353
        # and every interval from then on.
325
354
        self.checker_initiator_tag = (gobject.timeout_add
326
355
                                      (self.interval_milliseconds(),
327
356
                                       self.start_checker))
328
 
        # Also start a new checker *right now*.
329
 
        self.start_checker()
330
357
        # Schedule a disable() when 'timeout' has passed
331
358
        self.disable_initiator_tag = (gobject.timeout_add
332
359
                                   (self.timeout_milliseconds(),
333
360
                                    self.disable))
334
361
        self.enabled = True
 
362
        # Also start a new checker *right now*.
 
363
        self.start_checker()
335
364
    
336
 
    def disable(self):
 
365
    def disable(self, quiet=True):
337
366
        """Disable this client."""
338
367
        if not getattr(self, "enabled", False):
339
368
            return False
340
 
        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)
341
373
        if getattr(self, u"disable_initiator_tag", False):
342
374
            gobject.source_remove(self.disable_initiator_tag)
343
375
            self.disable_initiator_tag = None
395
427
        # client would inevitably timeout, since no checker would get
396
428
        # a chance to run to completion.  If we instead leave running
397
429
        # checkers alone, the checker would have to take more time
398
 
        # than 'timeout' for the client to be declared invalid, which
399
 
        # is as it should be.
 
430
        # than 'timeout' for the client to be disabled, which is as it
 
431
        # should be.
400
432
        
401
433
        # If a checker exists, make sure it is not a zombie
402
434
        try:
467
499
        logger.debug(u"Stopping checker for %(name)s", vars(self))
468
500
        try:
469
501
            os.kill(self.checker.pid, signal.SIGTERM)
470
 
            #os.sleep(0.5)
 
502
            #time.sleep(0.5)
471
503
            #if self.checker.poll() is None:
472
504
            #    os.kill(self.checker.pid, signal.SIGKILL)
473
505
        except OSError, error:
474
506
            if error.errno != errno.ESRCH: # No such process
475
507
                raise
476
508
        self.checker = None
477
 
    
478
 
    def still_valid(self):
479
 
        """Has the timeout not yet passed for this client?"""
480
 
        if not getattr(self, u"enabled", False):
481
 
            return False
482
 
        now = datetime.datetime.utcnow()
483
 
        if self.last_checked_ok is None:
484
 
            return now < (self.created + self.timeout)
485
 
        else:
486
 
            return now < (self.last_checked_ok + self.timeout)
487
 
 
488
509
 
489
510
def dbus_service_property(dbus_interface, signature=u"v",
490
511
                          access=u"readwrite", byte_arrays=False):
498
519
    dbus.service.method, except there is only "signature", since the
499
520
    type from Get() and the type sent to Set() is the same.
500
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)
501
527
    def decorator(func):
502
528
        func._dbus_is_property = True
503
529
        func._dbus_interface = dbus_interface
589
615
        if prop._dbus_access == u"read":
590
616
            raise DBusPropertyAccessException(property_name)
591
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
592
622
            value = dbus.ByteArray(''.join(unichr(byte)
593
623
                                           for byte in value))
594
624
        prop(value)
676
706
    # dbus.service.Object doesn't use super(), so we can't either.
677
707
    
678
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
679
710
        self.bus = bus
680
711
        Client.__init__(self, *args, **kwargs)
681
712
        # Only now, when this client is initialized, can it show up on
685
716
                                  + self.name.replace(u".", u"_")))
686
717
        DBusObjectWithProperties.__init__(self, self.bus,
687
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
688
735
    
689
736
    @staticmethod
690
737
    def _datetime_to_dbus(dt, variant_level=0):
697
744
        r = Client.enable(self)
698
745
        if oldstate != self.enabled:
699
746
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
701
748
                                 dbus.Boolean(True, variant_level=1))
702
749
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
704
751
                self._datetime_to_dbus(self.last_enabled,
705
752
                                       variant_level=1))
706
753
        return r
707
754
    
708
 
    def disable(self, signal = True):
 
755
    def disable(self, quiet = False):
709
756
        oldstate = getattr(self, u"enabled", False)
710
 
        r = Client.disable(self)
711
 
        if signal and oldstate != self.enabled:
 
757
        r = Client.disable(self, quiet=quiet)
 
758
        if not quiet and oldstate != self.enabled:
712
759
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
714
761
                                 dbus.Boolean(False, variant_level=1))
715
762
        return r
716
763
    
728
775
        self.checker_callback_tag = None
729
776
        self.checker = None
730
777
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
732
779
                             dbus.Boolean(False, variant_level=1))
733
780
        if os.WIFEXITED(condition):
734
781
            exitstatus = os.WEXITSTATUS(condition)
749
796
        r = Client.checked_ok(self, *args, **kwargs)
750
797
        # Emit D-Bus signal
751
798
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
753
800
            (self._datetime_to_dbus(self.last_checked_ok,
754
801
                                    variant_level=1)))
755
802
        return r
767
814
            # Emit D-Bus signal
768
815
            self.CheckerStarted(self.current_checker_command)
769
816
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
771
818
                dbus.Boolean(True, variant_level=1))
772
819
        return r
773
820
    
776
823
        r = Client.stop_checker(self, *args, **kwargs)
777
824
        if (old_checker is not None
778
825
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
780
827
                                 dbus.Boolean(False, variant_level=1))
781
828
        return r
782
 
    
783
 
    ## 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
784
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
844
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
845
    ## Signals
790
846
    
791
847
    # CheckerCompleted - signal
792
848
    @dbus.service.signal(_interface, signature=u"nxs")
809
865
    # GotSecret - signal
810
866
    @dbus.service.signal(_interface)
811
867
    def GotSecret(self):
812
 
        "D-Bus signal"
 
868
        """D-Bus signal
 
869
        Is sent after a successful transfer of secret from the Mandos
 
870
        server to mandos-client
 
871
        """
813
872
        pass
814
873
    
815
874
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
818
 
        "D-Bus signal"
819
 
        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()
820
897
    
821
898
    # Enable - method
822
899
    @dbus.service.method(_interface)
841
918
    def StopChecker(self):
842
919
        self.stop_checker()
843
920
    
844
 
    # 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
845
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
847
965
        return dbus.String(self.name)
848
966
    
849
 
    # fingerprint - property
 
967
    # Fingerprint - property
850
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
852
970
        return dbus.String(self.fingerprint)
853
971
    
854
 
    # host - property
 
972
    # Host - property
855
973
    @dbus_service_property(_interface, signature=u"s",
856
974
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
858
976
        if value is None:       # get
859
977
            return dbus.String(self.host)
860
978
        self.host = value
861
979
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
863
981
                             dbus.String(value, variant_level=1))
864
982
    
865
 
    # created - property
 
983
    # Created - property
866
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
868
986
        return dbus.String(self._datetime_to_dbus(self.created))
869
987
    
870
 
    # last_enabled - property
 
988
    # LastEnabled - property
871
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
873
991
        if self.last_enabled is None:
874
992
            return dbus.String(u"")
875
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
994
    
877
 
    # enabled - property
 
995
    # Enabled - property
878
996
    @dbus_service_property(_interface, signature=u"b",
879
997
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
881
999
        if value is None:       # get
882
1000
            return dbus.Boolean(self.enabled)
883
1001
        if value:
885
1003
        else:
886
1004
            self.disable()
887
1005
    
888
 
    # last_checked_ok - property
 
1006
    # LastCheckedOK - property
889
1007
    @dbus_service_property(_interface, signature=u"s",
890
1008
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
892
1010
        if value is not None:
893
1011
            self.checked_ok()
894
1012
            return
897
1015
        return dbus.String(self._datetime_to_dbus(self
898
1016
                                                  .last_checked_ok))
899
1017
    
900
 
    # timeout - property
 
1018
    # Timeout - property
901
1019
    @dbus_service_property(_interface, signature=u"t",
902
1020
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
904
1022
        if value is None:       # get
905
1023
            return dbus.UInt64(self.timeout_milliseconds())
906
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
1025
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
909
1027
                             dbus.UInt64(value, variant_level=1))
910
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
911
1029
            return
925
1043
            self.disable_initiator_tag = (gobject.timeout_add
926
1044
                                          (time_to_die, self.disable))
927
1045
    
928
 
    # interval - property
 
1046
    # Interval - property
929
1047
    @dbus_service_property(_interface, signature=u"t",
930
1048
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
932
1050
        if value is None:       # get
933
1051
            return dbus.UInt64(self.interval_milliseconds())
934
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
935
1053
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
937
1055
                             dbus.UInt64(value, variant_level=1))
938
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
939
1057
            return
943
1061
                                      (value, self.start_checker))
944
1062
        self.start_checker()    # Start one now, too
945
1063
 
946
 
    # checker - property
 
1064
    # Checker - property
947
1065
    @dbus_service_property(_interface, signature=u"s",
948
1066
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
950
1068
        if value is None:       # get
951
1069
            return dbus.String(self.checker_command)
952
1070
        self.checker_command = value
953
1071
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
955
1073
                             dbus.String(self.checker_command,
956
1074
                                         variant_level=1))
957
1075
    
958
 
    # checker_running - property
 
1076
    # CheckerRunning - property
959
1077
    @dbus_service_property(_interface, signature=u"b",
960
1078
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
962
1080
        if value is None:       # get
963
1081
            return dbus.Boolean(self.checker is not None)
964
1082
        if value:
966
1084
        else:
967
1085
            self.stop_checker()
968
1086
    
969
 
    # object_path - property
 
1087
    # ObjectPath - property
970
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
972
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1091
    
974
 
    # secret = property
 
1092
    # Secret = property
975
1093
    @dbus_service_property(_interface, signature=u"ay",
976
1094
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
978
1096
        self.secret = str(value)
979
1097
    
980
1098
    del _interface
981
1099
 
982
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
 
983
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1128
    """A class to handle client connections.
985
1129
    
987
1131
    Note: This will run in its own forked process."""
988
1132
    
989
1133
    def handle(self):
990
 
        logger.info(u"TCP connection from: %s",
991
 
                    unicode(self.client_address))
992
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        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
 
995
1140
            session = (gnutls.connection
996
1141
                       .ClientSession(self.request,
997
1142
                                      gnutls.connection
998
1143
                                      .X509Credentials()))
999
 
            
1000
 
            line = self.request.makefile().readline()
1001
 
            logger.debug(u"Protocol version: %r", line)
1002
 
            try:
1003
 
                if int(line.strip().split()[0]) > 1:
1004
 
                    raise RuntimeError
1005
 
            except (ValueError, IndexError, RuntimeError), error:
1006
 
                logger.error(u"Unknown protocol version: %s", error)
1007
 
                return
1008
 
            
 
1144
 
1009
1145
            # Note: gnutls.connection.X509Credentials is really a
1010
1146
            # generic GnuTLS certificate credentials object so long as
1011
1147
            # no X.509 keys are added to it.  Therefore, we can use it
1012
1148
            # here despite using OpenPGP certificates.
1013
 
            
 
1149
 
1014
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1015
1151
            #                      u"+AES-256-CBC", u"+SHA1",
1016
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1022
1158
            (gnutls.library.functions
1023
1159
             .gnutls_priority_set_direct(session._c_object,
1024
1160
                                         priority, None))
1025
 
            
 
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
1026
1174
            try:
1027
1175
                session.handshake()
1028
1176
            except gnutls.errors.GNUTLSError, error:
1031
1179
                # established.  Just abandon the request.
1032
1180
                return
1033
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
1034
1184
            try:
1035
 
                fpr = self.fingerprint(self.peer_certificate(session))
1036
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1037
 
                logger.warning(u"Bad certificate: %s", error)
1038
 
                session.bye()
1039
 
                return
1040
 
            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()
1041
1271
            
1042
 
            for c in self.server.clients:
1043
 
                if c.fingerprint == fpr:
1044
 
                    client = c
1045
 
                    break
1046
 
            else:
1047
 
                ipc.write(u"NOTFOUND %s %s\n"
1048
 
                          % (fpr, unicode(self.client_address)))
1049
 
                session.bye()
1050
 
                return
1051
 
            # Have to check if client.still_valid(), since it is
1052
 
            # possible that the client timed out while establishing
1053
 
            # the GnuTLS session.
1054
 
            if not client.still_valid():
1055
 
                ipc.write(u"INVALID %s\n" % client.name)
1056
 
                session.bye()
1057
 
                return
1058
 
            ipc.write(u"SENDING %s\n" % client.name)
1059
 
            sent_size = 0
1060
 
            while sent_size < len(client.secret):
1061
 
                sent = session.send(client.secret[sent_size:])
1062
 
                logger.debug(u"Sent: %d, remaining: %d",
1063
 
                             sent, len(client.secret)
1064
 
                             - (sent_size + sent))
1065
 
                sent_size += sent
1066
 
            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")
1067
1279
    
1068
1280
    @staticmethod
1069
1281
    def peer_certificate(session):
1129
1341
        return hex_fpr
1130
1342
 
1131
1343
 
1132
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
 
    """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 """
1134
1360
    def process_request(self, request, client_address):
1135
1361
        """Overrides and wraps the original process_request().
1136
1362
        
1137
1363
        This function creates a new pipe in self.pipe
1138
1364
        """
1139
 
        self.pipe = os.pipe()
1140
 
        super(ForkingMixInWithPipe,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1141
1368
              self).process_request(request, client_address)
1142
 
        os.close(self.pipe[1])  # close write end
1143
 
        self.add_pipe(self.pipe[0])
1144
 
    def add_pipe(self, pipe):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
1145
1373
        """Dummy function; override as necessary"""
1146
 
        os.close(pipe)
1147
 
 
1148
 
 
1149
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1150
1377
                     socketserver.TCPServer, object):
1151
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1152
1379
    
1237
1464
            return socketserver.TCPServer.server_activate(self)
1238
1465
    def enable(self):
1239
1466
        self.enabled = True
1240
 
    def add_pipe(self, pipe):
 
1467
    def add_pipe(self, parent_pipe):
1241
1468
        # Call "handle_ipc" for both data and EOF events
1242
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1243
 
                             self.handle_ipc)
1244
 
    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):
1245
1476
        condition_names = {
1246
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1247
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1258
1489
                                       if cond & condition)
1259
1490
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1260
1491
                     conditions_string)
1261
 
        
1262
 
        # Turn the pipe file descriptor into a Python file object
1263
 
        if source not in file_objects:
1264
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1265
 
        
1266
 
        # Read a line from the file object
1267
 
        cmdline = file_objects[source].readline()
1268
 
        if not cmdline:             # Empty line means end of file
1269
 
            # close the IPC pipe
1270
 
            file_objects[source].close()
1271
 
            del file_objects[source]
1272
 
            
1273
 
            # Stop calling this function
1274
 
            return False
1275
 
        
1276
 
        logger.debug(u"IPC command: %r", cmdline)
1277
 
        
1278
 
        # Parse and act on command
1279
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1280
 
        
1281
 
        if cmd == u"NOTFOUND":
1282
 
            logger.warning(u"Client not found for fingerprint: %s",
1283
 
                           args)
1284
 
            if self.use_dbus:
1285
 
                # Emit D-Bus signal
1286
 
                mandos_dbus_service.ClientNotFound(args)
1287
 
        elif cmd == u"INVALID":
1288
 
            for client in self.clients:
1289
 
                if client.name == args:
1290
 
                    logger.warning(u"Client %s is invalid", args)
1291
 
                    if self.use_dbus:
1292
 
                        # Emit D-Bus signal
1293
 
                        client.Rejected()
1294
 
                    break
1295
 
            else:
1296
 
                logger.error(u"Unknown client %s is invalid", args)
1297
 
        elif cmd == u"SENDING":
1298
 
            for client in self.clients:
1299
 
                if client.name == args:
1300
 
                    logger.info(u"Sending secret to %s", client.name)
1301
 
                    client.checked_ok()
1302
 
                    if self.use_dbus:
1303
 
                        # Emit D-Bus signal
1304
 
                        client.GotSecret()
1305
 
                    break
1306
 
            else:
1307
 
                logger.error(u"Sending secret to unknown client %s",
1308
 
                             args)
1309
 
        else:
1310
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1311
 
        
1312
 
        # 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
 
1313
1546
        return True
1314
1547
 
1315
1548
 
1345
1578
            elif suffix == u"w":
1346
1579
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1347
1580
            else:
1348
 
                raise ValueError
1349
 
        except (ValueError, IndexError):
1350
 
            raise ValueError
 
1581
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1582
        except (ValueError, IndexError), e:
 
1583
            raise ValueError(e.message)
1351
1584
        timevalue += delta
1352
1585
    return timevalue
1353
1586
 
1366
1599
        def if_nametoindex(interface):
1367
1600
            "Get an interface index the hard way, i.e. using fcntl()"
1368
1601
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1369
 
            with closing(socket.socket()) as s:
 
1602
            with contextlib.closing(socket.socket()) as s:
1370
1603
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1371
1604
                                    struct.pack(str(u"16s16x"),
1372
1605
                                                interface))
1418
1651
    parser.add_option("--debug", action=u"store_true",
1419
1652
                      help=u"Debug mode; run in foreground and log to"
1420
1653
                      u" terminal")
 
1654
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1655
                      help=u"Debug level for stdout output")
1421
1656
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1422
1657
                      u" priority string (see GnuTLS documentation)")
1423
1658
    parser.add_option("--servicename", type=u"string",
1448
1683
                        u"servicename": u"Mandos",
1449
1684
                        u"use_dbus": u"True",
1450
1685
                        u"use_ipv6": u"True",
 
1686
                        u"debuglevel": u"",
1451
1687
                        }
1452
1688
    
1453
1689
    # Parse config file for server-global settings
1470
1706
    # options, if set.
1471
1707
    for option in (u"interface", u"address", u"port", u"debug",
1472
1708
                   u"priority", u"servicename", u"configdir",
1473
 
                   u"use_dbus", u"use_ipv6"):
 
1709
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1474
1710
        value = getattr(options, option)
1475
1711
        if value is not None:
1476
1712
            server_settings[option] = value
1485
1721
    
1486
1722
    # For convenience
1487
1723
    debug = server_settings[u"debug"]
 
1724
    debuglevel = server_settings[u"debuglevel"]
1488
1725
    use_dbus = server_settings[u"use_dbus"]
1489
1726
    use_ipv6 = server_settings[u"use_ipv6"]
1490
 
    
1491
 
    if not debug:
1492
 
        syslogger.setLevel(logging.WARNING)
1493
 
        console.setLevel(logging.WARNING)
1494
 
    
 
1727
 
1495
1728
    if server_settings[u"servicename"] != u"Mandos":
1496
1729
        syslogger.setFormatter(logging.Formatter
1497
1730
                               (u'Mandos (%s) [%%(process)d]:'
1503
1736
                        u"interval": u"5m",
1504
1737
                        u"checker": u"fping -q -- %%(host)s",
1505
1738
                        u"host": u"",
 
1739
                        u"approval_delay": u"0s",
 
1740
                        u"approval_duration": u"1s",
1506
1741
                        }
1507
1742
    client_config = configparser.SafeConfigParser(client_defaults)
1508
1743
    client_config.read(os.path.join(server_settings[u"configdir"],
1514
1749
    tcp_server = MandosServer((server_settings[u"address"],
1515
1750
                               server_settings[u"port"]),
1516
1751
                              ClientHandler,
1517
 
                              interface=server_settings[u"interface"],
 
1752
                              interface=(server_settings[u"interface"]
 
1753
                                         or None),
1518
1754
                              use_ipv6=use_ipv6,
1519
1755
                              gnutls_priority=
1520
1756
                              server_settings[u"priority"],
1546
1782
        if error[0] != errno.EPERM:
1547
1783
            raise error
1548
1784
    
1549
 
    # 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
 
1550
1793
    if debug:
 
1794
        # Enable all possible GnuTLS debugging
 
1795
        
1551
1796
        # "Use a log level over 10 to enable all debugging options."
1552
1797
        # - GnuTLS manual
1553
1798
        gnutls.library.functions.gnutls_global_set_log_level(11)
1558
1803
        
1559
1804
        (gnutls.library.functions
1560
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
    
1561
1816
    
1562
1817
    global main_loop
1563
1818
    # From the Avahi example code
1566
1821
    bus = dbus.SystemBus()
1567
1822
    # End of Avahi example code
1568
1823
    if use_dbus:
1569
 
        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
1570
1832
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1571
1833
    service = AvahiService(name = server_settings[u"servicename"],
1572
1834
                           servicetype = u"_mandos._tcp",
1574
1836
    if server_settings["interface"]:
1575
1837
        service.interface = (if_nametoindex
1576
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()
1577
1846
    
1578
1847
    client_class = Client
1579
1848
    if use_dbus:
1580
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
    
1581
1862
    tcp_server.clients.update(set(
1582
1863
            client_class(name = section,
1583
 
                         config= dict(client_config.items(section)))
 
1864
                         config= dict(client_config_items(
 
1865
                        client_config, section)))
1584
1866
            for section in client_config.sections()))
1585
1867
    if not tcp_server.clients:
1586
1868
        logger.warning(u"No clients defined")
1587
 
    
1588
 
    if debug:
1589
 
        # Redirect stdin so all checkers get /dev/null
1590
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
 
        os.dup2(null, sys.stdin.fileno())
1592
 
        if null > 2:
1593
 
            os.close(null)
1594
 
    else:
1595
 
        # No console logging
1596
 
        logger.removeHandler(console)
1597
 
        # Close all input and output, do double fork, etc.
1598
 
        daemon()
1599
 
    
 
1869
        
1600
1870
    try:
1601
 
        with closing(pidfile):
 
1871
        with pidfile:
1602
1872
            pid = os.getpid()
1603
1873
            pidfile.write(str(pid) + "\n")
1604
1874
        del pidfile
1610
1880
        pass
1611
1881
    del pidfilename
1612
1882
    
1613
 
    def cleanup():
1614
 
        "Cleanup function; run on exit"
1615
 
        service.cleanup()
1616
 
        
1617
 
        while tcp_server.clients:
1618
 
            client = tcp_server.clients.pop()
1619
 
            client.disable_hook = None
1620
 
            client.disable()
1621
 
    
1622
 
    atexit.register(cleanup)
1623
 
    
1624
1883
    if not debug:
1625
1884
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1626
1885
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1633
1892
                dbus.service.Object.__init__(self, bus, u"/")
1634
1893
            _interface = u"se.bsnet.fukt.Mandos"
1635
1894
            
1636
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1637
 
            def ClientAdded(self, objpath, properties):
 
1895
            @dbus.service.signal(_interface, signature=u"o")
 
1896
            def ClientAdded(self, objpath):
1638
1897
                "D-Bus signal"
1639
1898
                pass
1640
1899
            
1641
 
            @dbus.service.signal(_interface, signature=u"s")
1642
 
            def ClientNotFound(self, fingerprint):
 
1900
            @dbus.service.signal(_interface, signature=u"ss")
 
1901
            def ClientNotFound(self, fingerprint, address):
1643
1902
                "D-Bus signal"
1644
1903
                pass
1645
1904
            
1671
1930
                        tcp_server.clients.remove(c)
1672
1931
                        c.remove_from_connection()
1673
1932
                        # Don't signal anything except ClientRemoved
1674
 
                        c.disable(signal=False)
 
1933
                        c.disable(quiet=True)
1675
1934
                        # Emit D-Bus signal
1676
1935
                        self.ClientRemoved(object_path, c.name)
1677
1936
                        return
1678
 
                raise KeyError
 
1937
                raise KeyError(object_path)
1679
1938
            
1680
1939
            del _interface
1681
1940
        
1682
1941
        mandos_dbus_service = MandosDBusService()
1683
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
    
1684
1961
    for client in tcp_server.clients:
1685
1962
        if use_dbus:
1686
1963
            # Emit D-Bus signal
1687
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1688
 
                                            client.GetAll(u""))
 
1964
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1689
1965
        client.enable()
1690
1966
    
1691
1967
    tcp_server.enable()
1709
1985
            service.activate()
1710
1986
        except dbus.exceptions.DBusException, error:
1711
1987
            logger.critical(u"DBusException: %s", error)
 
1988
            cleanup()
1712
1989
            sys.exit(1)
1713
1990
        # End of Avahi example code
1714
1991
        
1721
1998
        main_loop.run()
1722
1999
    except AvahiError, error:
1723
2000
        logger.critical(u"AvahiError: %s", error)
 
2001
        cleanup()
1724
2002
        sys.exit(1)
1725
2003
    except KeyboardInterrupt:
1726
2004
        if debug:
1727
2005
            print >> sys.stderr
1728
2006
        logger.debug(u"Server received KeyboardInterrupt")
1729
2007
    logger.debug(u"Server exiting")
 
2008
    # Must run before the D-Bus bus name gets deregistered
 
2009
    cleanup()
1730
2010
 
1731
2011
if __name__ == '__main__':
1732
2012
    main()