/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-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
60
60
import fcntl
61
61
import functools
62
62
import cPickle as pickle
 
63
import multiprocessing
63
64
 
64
65
import dbus
65
66
import dbus.service
82
83
 
83
84
version = "1.0.14"
84
85
 
 
86
#logger = logging.getLogger(u'mandos')
85
87
logger = logging.Logger(u'mandos')
86
88
syslogger = (logging.handlers.SysLogHandler
87
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
155
157
                            u" after %i retries, exiting.",
156
158
                            self.rename_count)
157
159
            raise AvahiServiceError(u"Too many renames")
158
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
159
161
        logger.info(u"Changing Zeroconf service name to %r ...",
160
 
                    unicode(self.name))
 
162
                    self.name)
161
163
        syslogger.setFormatter(logging.Formatter
162
164
                               (u'Mandos (%s) [%%(process)d]:'
163
165
                                u' %%(levelname)s: %%(message)s'
164
166
                                % self.name))
165
167
        self.remove()
166
 
        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)
167
174
        self.rename_count += 1
168
175
    def remove(self):
169
176
        """Derived from the Avahi example code"""
192
199
        self.group.Commit()
193
200
    def entry_group_state_changed(self, state, error):
194
201
        """Derived from the Avahi example code"""
195
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
196
203
        
197
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
198
205
            logger.debug(u"Zeroconf service established.")
211
218
            self.group = None
212
219
    def server_state_changed(self, state):
213
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
214
222
        if state == avahi.SERVER_COLLISION:
215
223
            logger.error(u"Zeroconf server name collision")
216
224
            self.remove()
232
240
    """A representation of a client host served by this server.
233
241
    
234
242
    Attributes:
235
 
    name:       string; from the config file, used in log messages and
236
 
                        D-Bus identifiers
237
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
238
 
                 uniquely identify the client
239
 
    secret:     bytestring; sent verbatim (over TLS) to client
240
 
    host:       string; available for use by the checker command
241
 
    created:    datetime.datetime(); (UTC) object creation
242
 
    last_enabled: datetime.datetime(); (UTC)
243
 
    enabled:    bool()
244
 
    last_checked_ok: datetime.datetime(); (UTC) or None
245
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
246
 
                                      until this client is disabled
247
 
    interval:   datetime.timedelta(); How often to start a new checker
248
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
243
    _approved:   bool(); 'None' if not yet approved/disapproved
 
244
    approval_delay: datetime.timedelta(); Time to wait for approval
 
245
    approval_duration: datetime.timedelta(); Duration of one approval
249
246
    checker:    subprocess.Popen(); a running checker process used
250
247
                                    to see if the client lives.
251
248
                                    'None' if no process is running.
252
 
    checker_initiator_tag: a gobject event source tag, or None
253
 
    disable_initiator_tag: - '' -
254
249
    checker_callback_tag:  - '' -
255
 
    checker_command: string; External command which is run to check if
256
 
                     client lives.  %() expansions are done at
 
250
    checker_command: string; External command which is run to check
 
251
                     if client lives.  %() expansions are done at
257
252
                     runtime with vars(self) as dict, so that for
258
253
                     instance %(name)s can be used in the command.
 
254
    checker_initiator_tag: a gobject event source tag, or None
 
255
    created:    datetime.datetime(); (UTC) object creation
259
256
    current_checker_command: string; current running checker_command
 
257
    disable_hook:  If set, called by disable() as disable_hook(self)
 
258
    disable_initiator_tag: - '' -
 
259
    enabled:    bool()
 
260
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
261
                 uniquely identify the client
 
262
    host:       string; available for use by the checker command
 
263
    interval:   datetime.timedelta(); How often to start a new checker
 
264
    last_checked_ok: datetime.datetime(); (UTC) or None
 
265
    last_enabled: datetime.datetime(); (UTC)
 
266
    name:       string; from the config file, used in log messages and
 
267
                        D-Bus identifiers
 
268
    secret:     bytestring; sent verbatim (over TLS) to client
 
269
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
270
                                      until this client is disabled
 
271
    runtime_expansions: Allowed attributes for runtime expansion.
260
272
    """
261
273
    
 
274
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
275
                          u"created", u"enabled", u"fingerprint",
 
276
                          u"host", u"interval", u"last_checked_ok",
 
277
                          u"last_enabled", u"name", u"timeout")
 
278
    
262
279
    @staticmethod
263
280
    def _timedelta_to_milliseconds(td):
264
281
        "Convert a datetime.timedelta() to milliseconds"
273
290
    def interval_milliseconds(self):
274
291
        "Return the 'interval' attribute in milliseconds"
275
292
        return self._timedelta_to_milliseconds(self.interval)
 
293
 
 
294
    def approval_delay_milliseconds(self):
 
295
        return self._timedelta_to_milliseconds(self.approval_delay)
276
296
    
277
297
    def __init__(self, name = None, disable_hook=None, config=None):
278
298
        """Note: the 'checker' key in 'config' sets the
313
333
        self.checker_command = config[u"checker"]
314
334
        self.current_checker_command = None
315
335
        self.last_connect = None
 
336
        self._approved = None
 
337
        self.approved_by_default = config.get(u"approved_by_default",
 
338
                                              True)
 
339
        self.approvals_pending = 0
 
340
        self.approval_delay = string_to_delta(
 
341
            config[u"approval_delay"])
 
342
        self.approval_duration = string_to_delta(
 
343
            config[u"approval_duration"])
 
344
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
316
345
    
 
346
    def send_changedstate(self):
 
347
        self.changedstate.acquire()
 
348
        self.changedstate.notify_all()
 
349
        self.changedstate.release()
 
350
        
317
351
    def enable(self):
318
352
        """Start this client's checker and timeout hooks"""
319
353
        if getattr(self, u"enabled", False):
320
354
            # Already enabled
321
355
            return
 
356
        self.send_changedstate()
322
357
        self.last_enabled = datetime.datetime.utcnow()
323
358
        # Schedule a new checker to be started an 'interval' from now,
324
359
        # and every interval from then on.
338
373
        if not getattr(self, "enabled", False):
339
374
            return False
340
375
        if not quiet:
 
376
            self.send_changedstate()
 
377
        if not quiet:
341
378
            logger.info(u"Disabling client %s", self.name)
342
379
        if getattr(self, u"disable_initiator_tag", False):
343
380
            gobject.source_remove(self.disable_initiator_tag)
419
456
                command = self.checker_command % self.host
420
457
            except TypeError:
421
458
                # Escape attributes for the shell
422
 
                escaped_attrs = dict((key,
423
 
                                      re.escape(unicode(str(val),
424
 
                                                        errors=
425
 
                                                        u'replace')))
426
 
                                     for key, val in
427
 
                                     vars(self).iteritems())
 
459
                escaped_attrs = dict(
 
460
                    (attr,
 
461
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
462
                                       errors=
 
463
                                       u'replace')))
 
464
                    for attr in
 
465
                    self.runtime_expansions)
 
466
 
428
467
                try:
429
468
                    command = self.checker_command % escaped_attrs
430
469
                except TypeError, error:
476
515
                raise
477
516
        self.checker = None
478
517
 
479
 
 
480
518
def dbus_service_property(dbus_interface, signature=u"v",
481
519
                          access=u"readwrite", byte_arrays=False):
482
520
    """Decorators for marking methods of a DBusObjectWithProperties to
673
711
    dbus_object_path: dbus.ObjectPath
674
712
    bus: dbus.SystemBus()
675
713
    """
 
714
    
 
715
    runtime_expansions = (Client.runtime_expansions
 
716
                          + (u"dbus_object_path",))
 
717
    
676
718
    # dbus.service.Object doesn't use super(), so we can't either.
677
719
    
678
720
    def __init__(self, bus = None, *args, **kwargs):
 
721
        self._approvals_pending = 0
679
722
        self.bus = bus
680
723
        Client.__init__(self, *args, **kwargs)
681
724
        # Only now, when this client is initialized, can it show up on
682
725
        # the D-Bus
 
726
        client_object_name = unicode(self.name).translate(
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
683
729
        self.dbus_object_path = (dbus.ObjectPath
684
 
                                 (u"/clients/"
685
 
                                  + self.name.replace(u".", u"_")))
 
730
                                 (u"/clients/" + client_object_name))
686
731
        DBusObjectWithProperties.__init__(self, self.bus,
687
732
                                          self.dbus_object_path)
 
733
        
 
734
    def _get_approvals_pending(self):
 
735
        return self._approvals_pending
 
736
    def _set_approvals_pending(self, value):
 
737
        old_value = self._approvals_pending
 
738
        self._approvals_pending = value
 
739
        bval = bool(value)
 
740
        if (hasattr(self, "dbus_object_path")
 
741
            and bval is not bool(old_value)):
 
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
744
                                 dbus_bool)
 
745
 
 
746
    approvals_pending = property(_get_approvals_pending,
 
747
                                 _set_approvals_pending)
 
748
    del _get_approvals_pending, _set_approvals_pending
688
749
    
689
750
    @staticmethod
690
751
    def _datetime_to_dbus(dt, variant_level=0):
697
758
        r = Client.enable(self)
698
759
        if oldstate != self.enabled:
699
760
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
701
762
                                 dbus.Boolean(True, variant_level=1))
702
763
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
 
764
                dbus.String(u"LastEnabled"),
704
765
                self._datetime_to_dbus(self.last_enabled,
705
766
                                       variant_level=1))
706
767
        return r
710
771
        r = Client.disable(self, quiet=quiet)
711
772
        if not quiet and oldstate != self.enabled:
712
773
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
714
775
                                 dbus.Boolean(False, variant_level=1))
715
776
        return r
716
777
    
728
789
        self.checker_callback_tag = None
729
790
        self.checker = None
730
791
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
732
793
                             dbus.Boolean(False, variant_level=1))
733
794
        if os.WIFEXITED(condition):
734
795
            exitstatus = os.WEXITSTATUS(condition)
749
810
        r = Client.checked_ok(self, *args, **kwargs)
750
811
        # Emit D-Bus signal
751
812
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
 
813
            dbus.String(u"LastCheckedOK"),
753
814
            (self._datetime_to_dbus(self.last_checked_ok,
754
815
                                    variant_level=1)))
755
816
        return r
767
828
            # Emit D-Bus signal
768
829
            self.CheckerStarted(self.current_checker_command)
769
830
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
 
831
                dbus.String(u"CheckerRunning"),
771
832
                dbus.Boolean(True, variant_level=1))
772
833
        return r
773
834
    
776
837
        r = Client.stop_checker(self, *args, **kwargs)
777
838
        if (old_checker is not None
778
839
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
780
841
                                 dbus.Boolean(False, variant_level=1))
781
842
        return r
782
 
    
783
 
    ## D-Bus methods & signals
 
843
 
 
844
    def _reset_approved(self):
 
845
        self._approved = None
 
846
        return False
 
847
    
 
848
    def approve(self, value=True):
 
849
        self.send_changedstate()
 
850
        self._approved = value
 
851
        gobject.timeout_add(self._timedelta_to_milliseconds
 
852
                            (self.approval_duration),
 
853
                            self._reset_approved)
 
854
    
 
855
    
 
856
    ## D-Bus methods, signals & properties
784
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
858
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
859
    ## Signals
790
860
    
791
861
    # CheckerCompleted - signal
792
862
    @dbus.service.signal(_interface, signature=u"nxs")
809
879
    # GotSecret - signal
810
880
    @dbus.service.signal(_interface)
811
881
    def GotSecret(self):
812
 
        "D-Bus signal"
 
882
        """D-Bus signal
 
883
        Is sent after a successful transfer of secret from the Mandos
 
884
        server to mandos-client
 
885
        """
813
886
        pass
814
887
    
815
888
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
818
 
        "D-Bus signal"
819
 
        pass
 
889
    @dbus.service.signal(_interface, signature=u"s")
 
890
    def Rejected(self, reason):
 
891
        "D-Bus signal"
 
892
        pass
 
893
    
 
894
    # NeedApproval - signal
 
895
    @dbus.service.signal(_interface, signature=u"tb")
 
896
    def NeedApproval(self, timeout, default):
 
897
        "D-Bus signal"
 
898
        pass
 
899
    
 
900
    ## Methods
 
901
 
 
902
    # Approve - method
 
903
    @dbus.service.method(_interface, in_signature=u"b")
 
904
    def Approve(self, value):
 
905
        self.approve(value)
 
906
 
 
907
    # CheckedOK - method
 
908
    @dbus.service.method(_interface)
 
909
    def CheckedOK(self):
 
910
        return self.checked_ok()
820
911
    
821
912
    # Enable - method
822
913
    @dbus.service.method(_interface)
841
932
    def StopChecker(self):
842
933
        self.stop_checker()
843
934
    
844
 
    # name - property
 
935
    ## Properties
 
936
    
 
937
    # ApprovalPending - property
 
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
939
    def ApprovalPending_dbus_property(self):
 
940
        return dbus.Boolean(bool(self.approvals_pending))
 
941
    
 
942
    # ApprovedByDefault - property
 
943
    @dbus_service_property(_interface, signature=u"b",
 
944
                           access=u"readwrite")
 
945
    def ApprovedByDefault_dbus_property(self, value=None):
 
946
        if value is None:       # get
 
947
            return dbus.Boolean(self.approved_by_default)
 
948
        self.approved_by_default = bool(value)
 
949
        # Emit D-Bus signal
 
950
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
951
                             dbus.Boolean(value, variant_level=1))
 
952
    
 
953
    # ApprovalDelay - property
 
954
    @dbus_service_property(_interface, signature=u"t",
 
955
                           access=u"readwrite")
 
956
    def ApprovalDelay_dbus_property(self, value=None):
 
957
        if value is None:       # get
 
958
            return dbus.UInt64(self.approval_delay_milliseconds())
 
959
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
960
        # Emit D-Bus signal
 
961
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
962
                             dbus.UInt64(value, variant_level=1))
 
963
    
 
964
    # ApprovalDuration - property
 
965
    @dbus_service_property(_interface, signature=u"t",
 
966
                           access=u"readwrite")
 
967
    def ApprovalDuration_dbus_property(self, value=None):
 
968
        if value is None:       # get
 
969
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
970
                    self.approval_duration))
 
971
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
972
        # Emit D-Bus signal
 
973
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
974
                             dbus.UInt64(value, variant_level=1))
 
975
    
 
976
    # Name - property
845
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
978
    def Name_dbus_property(self):
847
979
        return dbus.String(self.name)
848
980
    
849
 
    # fingerprint - property
 
981
    # Fingerprint - property
850
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
983
    def Fingerprint_dbus_property(self):
852
984
        return dbus.String(self.fingerprint)
853
985
    
854
 
    # host - property
 
986
    # Host - property
855
987
    @dbus_service_property(_interface, signature=u"s",
856
988
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
989
    def Host_dbus_property(self, value=None):
858
990
        if value is None:       # get
859
991
            return dbus.String(self.host)
860
992
        self.host = value
861
993
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
 
994
        self.PropertyChanged(dbus.String(u"Host"),
863
995
                             dbus.String(value, variant_level=1))
864
996
    
865
 
    # created - property
 
997
    # Created - property
866
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
 
999
    def Created_dbus_property(self):
868
1000
        return dbus.String(self._datetime_to_dbus(self.created))
869
1001
    
870
 
    # last_enabled - property
 
1002
    # LastEnabled - property
871
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
 
1004
    def LastEnabled_dbus_property(self):
873
1005
        if self.last_enabled is None:
874
1006
            return dbus.String(u"")
875
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
1008
    
877
 
    # enabled - property
 
1009
    # Enabled - property
878
1010
    @dbus_service_property(_interface, signature=u"b",
879
1011
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
1012
    def Enabled_dbus_property(self, value=None):
881
1013
        if value is None:       # get
882
1014
            return dbus.Boolean(self.enabled)
883
1015
        if value:
885
1017
        else:
886
1018
            self.disable()
887
1019
    
888
 
    # last_checked_ok - property
 
1020
    # LastCheckedOK - property
889
1021
    @dbus_service_property(_interface, signature=u"s",
890
1022
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1023
    def LastCheckedOK_dbus_property(self, value=None):
892
1024
        if value is not None:
893
1025
            self.checked_ok()
894
1026
            return
897
1029
        return dbus.String(self._datetime_to_dbus(self
898
1030
                                                  .last_checked_ok))
899
1031
    
900
 
    # timeout - property
 
1032
    # Timeout - property
901
1033
    @dbus_service_property(_interface, signature=u"t",
902
1034
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1035
    def Timeout_dbus_property(self, value=None):
904
1036
        if value is None:       # get
905
1037
            return dbus.UInt64(self.timeout_milliseconds())
906
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
1039
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
909
1041
                             dbus.UInt64(value, variant_level=1))
910
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
911
1043
            return
925
1057
            self.disable_initiator_tag = (gobject.timeout_add
926
1058
                                          (time_to_die, self.disable))
927
1059
    
928
 
    # interval - property
 
1060
    # Interval - property
929
1061
    @dbus_service_property(_interface, signature=u"t",
930
1062
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1063
    def Interval_dbus_property(self, value=None):
932
1064
        if value is None:       # get
933
1065
            return dbus.UInt64(self.interval_milliseconds())
934
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
935
1067
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
937
1069
                             dbus.UInt64(value, variant_level=1))
938
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
939
1071
            return
943
1075
                                      (value, self.start_checker))
944
1076
        self.start_checker()    # Start one now, too
945
1077
 
946
 
    # checker - property
 
1078
    # Checker - property
947
1079
    @dbus_service_property(_interface, signature=u"s",
948
1080
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1081
    def Checker_dbus_property(self, value=None):
950
1082
        if value is None:       # get
951
1083
            return dbus.String(self.checker_command)
952
1084
        self.checker_command = value
953
1085
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
955
1087
                             dbus.String(self.checker_command,
956
1088
                                         variant_level=1))
957
1089
    
958
 
    # checker_running - property
 
1090
    # CheckerRunning - property
959
1091
    @dbus_service_property(_interface, signature=u"b",
960
1092
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1093
    def CheckerRunning_dbus_property(self, value=None):
962
1094
        if value is None:       # get
963
1095
            return dbus.Boolean(self.checker is not None)
964
1096
        if value:
966
1098
        else:
967
1099
            self.stop_checker()
968
1100
    
969
 
    # object_path - property
 
1101
    # ObjectPath - property
970
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1103
    def ObjectPath_dbus_property(self):
972
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1105
    
974
 
    # secret = property
 
1106
    # Secret = property
975
1107
    @dbus_service_property(_interface, signature=u"ay",
976
1108
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1109
    def Secret_dbus_property(self, value):
978
1110
        self.secret = str(value)
979
1111
    
980
1112
    del _interface
981
1113
 
982
1114
 
 
1115
class ProxyClient(object):
 
1116
    def __init__(self, child_pipe, fpr, address):
 
1117
        self._pipe = child_pipe
 
1118
        self._pipe.send(('init', fpr, address))
 
1119
        if not self._pipe.recv():
 
1120
            raise KeyError()
 
1121
 
 
1122
    def __getattribute__(self, name):
 
1123
        if(name == '_pipe'):
 
1124
            return super(ProxyClient, self).__getattribute__(name)
 
1125
        self._pipe.send(('getattr', name))
 
1126
        data = self._pipe.recv()
 
1127
        if data[0] == 'data':
 
1128
            return data[1]
 
1129
        if data[0] == 'function':
 
1130
            def func(*args, **kwargs):
 
1131
                self._pipe.send(('funcall', name, args, kwargs))
 
1132
                return self._pipe.recv()[1]
 
1133
            return func
 
1134
 
 
1135
    def __setattr__(self, name, value):
 
1136
        if(name == '_pipe'):
 
1137
            return super(ProxyClient, self).__setattr__(name, value)
 
1138
        self._pipe.send(('setattr', name, value))
 
1139
 
 
1140
 
983
1141
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1142
    """A class to handle client connections.
985
1143
    
987
1145
    Note: This will run in its own forked process."""
988
1146
    
989
1147
    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.child_pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        with contextlib.nested(os.fdopen(self.server.child_pipe[1],
995
 
                                         u"w", 1),
996
 
                               os.fdopen(self.server.parent_pipe[0],
997
 
                                         u"r", 0)) as (ipc,
998
 
                                                       ipc_return):
 
1148
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1149
            logger.info(u"TCP connection from: %s",
 
1150
                        unicode(self.client_address))
 
1151
            logger.debug(u"Pipe FD: %d",
 
1152
                         self.server.child_pipe.fileno())
 
1153
 
999
1154
            session = (gnutls.connection
1000
1155
                       .ClientSession(self.request,
1001
1156
                                      gnutls.connection
1002
1157
                                      .X509Credentials()))
1003
 
            
1004
 
            line = self.request.makefile().readline()
1005
 
            logger.debug(u"Protocol version: %r", line)
1006
 
            try:
1007
 
                if int(line.strip().split()[0]) > 1:
1008
 
                    raise RuntimeError
1009
 
            except (ValueError, IndexError, RuntimeError), error:
1010
 
                logger.error(u"Unknown protocol version: %s", error)
1011
 
                return
1012
 
            
 
1158
 
1013
1159
            # Note: gnutls.connection.X509Credentials is really a
1014
1160
            # generic GnuTLS certificate credentials object so long as
1015
1161
            # no X.509 keys are added to it.  Therefore, we can use it
1016
1162
            # here despite using OpenPGP certificates.
1017
 
            
 
1163
 
1018
1164
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1019
1165
            #                      u"+AES-256-CBC", u"+SHA1",
1020
1166
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1026
1172
            (gnutls.library.functions
1027
1173
             .gnutls_priority_set_direct(session._c_object,
1028
1174
                                         priority, None))
1029
 
            
 
1175
 
 
1176
            # Start communication using the Mandos protocol
 
1177
            # Get protocol number
 
1178
            line = self.request.makefile().readline()
 
1179
            logger.debug(u"Protocol version: %r", line)
 
1180
            try:
 
1181
                if int(line.strip().split()[0]) > 1:
 
1182
                    raise RuntimeError
 
1183
            except (ValueError, IndexError, RuntimeError), error:
 
1184
                logger.error(u"Unknown protocol version: %s", error)
 
1185
                return
 
1186
 
 
1187
            # Start GnuTLS connection
1030
1188
            try:
1031
1189
                session.handshake()
1032
1190
            except gnutls.errors.GNUTLSError, error:
1035
1193
                # established.  Just abandon the request.
1036
1194
                return
1037
1195
            logger.debug(u"Handshake succeeded")
 
1196
 
 
1197
            approval_required = False
1038
1198
            try:
1039
1199
                try:
1040
1200
                    fpr = self.fingerprint(self.peer_certificate
1044
1204
                    return
1045
1205
                logger.debug(u"Fingerprint: %s", fpr)
1046
1206
 
1047
 
                for c in self.server.clients:
1048
 
                    if c.fingerprint == fpr:
1049
 
                        client = c
 
1207
                try:
 
1208
                    client = ProxyClient(child_pipe, fpr,
 
1209
                                         self.client_address)
 
1210
                except KeyError:
 
1211
                    return
 
1212
                
 
1213
                if client.approval_delay:
 
1214
                    delay = client.approval_delay
 
1215
                    client.approvals_pending += 1
 
1216
                    approval_required = True
 
1217
                
 
1218
                while True:
 
1219
                    if not client.enabled:
 
1220
                        logger.warning(u"Client %s is disabled",
 
1221
                                       client.name)
 
1222
                        if self.server.use_dbus:
 
1223
                            # Emit D-Bus signal
 
1224
                            client.Rejected("Disabled")                    
 
1225
                        return
 
1226
                    
 
1227
                    if client._approved or not client.approval_delay:
 
1228
                        #We are approved or approval is disabled
1050
1229
                        break
1051
 
                else:
1052
 
                    ipc.write(u"NOTFOUND %s %s\n"
1053
 
                              % (fpr, unicode(self.client_address)))
1054
 
                    return
1055
 
                # Have to check if client.enabled, since it is
1056
 
                # possible that the client was disabled since the
1057
 
                # GnuTLS session was established.
1058
 
                ipc.write(u"GETATTR enabled %s\n" % fpr)
1059
 
                enabled = pickle.load(ipc_return)
1060
 
                if not enabled:
1061
 
                    ipc.write(u"DISABLED %s\n" % client.name)
1062
 
                    return
1063
 
                ipc.write(u"SENDING %s\n" % client.name)
 
1230
                    elif client._approved is None:
 
1231
                        logger.info(u"Client %s needs approval",
 
1232
                                    client.name)
 
1233
                        if self.server.use_dbus:
 
1234
                            # Emit D-Bus signal
 
1235
                            client.NeedApproval(
 
1236
                                client.approval_delay_milliseconds(),
 
1237
                                client.approved_by_default)
 
1238
                    else:
 
1239
                        logger.warning(u"Client %s was not approved",
 
1240
                                       client.name)
 
1241
                        if self.server.use_dbus:
 
1242
                            # Emit D-Bus signal
 
1243
                            client.Rejected("Denied")
 
1244
                        return
 
1245
                    
 
1246
                    #wait until timeout or approved
 
1247
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1248
                    time = datetime.datetime.now()
 
1249
                    client.changedstate.acquire()
 
1250
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1251
                    client.changedstate.release()
 
1252
                    time2 = datetime.datetime.now()
 
1253
                    if (time2 - time) >= delay:
 
1254
                        if not client.approved_by_default:
 
1255
                            logger.warning("Client %s timed out while"
 
1256
                                           " waiting for approval",
 
1257
                                           client.name)
 
1258
                            if self.server.use_dbus:
 
1259
                                # Emit D-Bus signal
 
1260
                                client.Rejected("Approval timed out")
 
1261
                            return
 
1262
                        else:
 
1263
                            break
 
1264
                    else:
 
1265
                        delay -= time2 - time
 
1266
                
1064
1267
                sent_size = 0
1065
1268
                while sent_size < len(client.secret):
1066
 
                    sent = session.send(client.secret[sent_size:])
 
1269
                    try:
 
1270
                        sent = session.send(client.secret[sent_size:])
 
1271
                    except (gnutls.errors.GNUTLSError), error:
 
1272
                        logger.warning("gnutls send failed")
 
1273
                        return
1067
1274
                    logger.debug(u"Sent: %d, remaining: %d",
1068
1275
                                 sent, len(client.secret)
1069
1276
                                 - (sent_size + sent))
1070
1277
                    sent_size += sent
 
1278
 
 
1279
                logger.info(u"Sending secret to %s", client.name)
 
1280
                # bump the timeout as if seen
 
1281
                client.checked_ok()
 
1282
                if self.server.use_dbus:
 
1283
                    # Emit D-Bus signal
 
1284
                    client.GotSecret()
 
1285
            
1071
1286
            finally:
1072
 
                session.bye()
 
1287
                if approval_required:
 
1288
                    client.approvals_pending -= 1
 
1289
                try:
 
1290
                    session.bye()
 
1291
                except (gnutls.errors.GNUTLSError), error:
 
1292
                    logger.warning("GnuTLS bye failed")
1073
1293
    
1074
1294
    @staticmethod
1075
1295
    def peer_certificate(session):
1135
1355
        return hex_fpr
1136
1356
 
1137
1357
 
1138
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1139
 
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
1358
class MultiprocessingMixIn(object):
 
1359
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1360
    def sub_process_main(self, request, address):
 
1361
        try:
 
1362
            self.finish_request(request, address)
 
1363
        except:
 
1364
            self.handle_error(request, address)
 
1365
        self.close_request(request)
 
1366
            
 
1367
    def process_request(self, request, address):
 
1368
        """Start a new process to process the request."""
 
1369
        multiprocessing.Process(target = self.sub_process_main,
 
1370
                                args = (request, address)).start()
 
1371
 
 
1372
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1373
    """ adds a pipe to the MixIn """
1140
1374
    def process_request(self, request, client_address):
1141
1375
        """Overrides and wraps the original process_request().
1142
1376
        
1143
1377
        This function creates a new pipe in self.pipe
1144
1378
        """
1145
 
        self.child_pipe = os.pipe() # Child writes here
1146
 
        self.parent_pipe = os.pipe() # Parent writes here
1147
 
        super(ForkingMixInWithPipes,
 
1379
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1380
 
 
1381
        super(MultiprocessingMixInWithPipe,
1148
1382
              self).process_request(request, client_address)
1149
 
        # Close unused ends for parent
1150
 
        os.close(self.parent_pipe[0]) # close read end
1151
 
        os.close(self.child_pipe[1])  # close write end
1152
 
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1153
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1383
        self.child_pipe.close()
 
1384
        self.add_pipe(parent_pipe)
 
1385
 
 
1386
    def add_pipe(self, parent_pipe):
1154
1387
        """Dummy function; override as necessary"""
1155
 
        os.close(child_pipe_fd)
1156
 
        os.close(parent_pipe_fd)
1157
 
 
1158
 
 
1159
 
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1388
        pass
 
1389
 
 
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1160
1391
                     socketserver.TCPServer, object):
1161
1392
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1162
1393
    
1247
1478
            return socketserver.TCPServer.server_activate(self)
1248
1479
    def enable(self):
1249
1480
        self.enabled = True
1250
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1481
    def add_pipe(self, parent_pipe):
1251
1482
        # Call "handle_ipc" for both data and EOF events
1252
 
        gobject.io_add_watch(child_pipe_fd,
 
1483
        gobject.io_add_watch(parent_pipe.fileno(),
1253
1484
                             gobject.IO_IN | gobject.IO_HUP,
1254
1485
                             functools.partial(self.handle_ipc,
1255
 
                                               reply_fd
1256
 
                                               =parent_pipe_fd))
1257
 
    def handle_ipc(self, source, condition, reply_fd=None,
1258
 
                   file_objects={}):
 
1486
                                               parent_pipe = parent_pipe))
 
1487
        
 
1488
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1489
                   client_object=None):
1259
1490
        condition_names = {
1260
1491
            gobject.IO_IN: u"IN",   # There is data to read.
1261
1492
            gobject.IO_OUT: u"OUT", # Data can be written (without
1270
1501
                                       for cond, name in
1271
1502
                                       condition_names.iteritems()
1272
1503
                                       if cond & condition)
1273
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1274
 
                     conditions_string)
1275
 
        
1276
 
        # Turn the pipe file descriptors into Python file objects
1277
 
        if source not in file_objects:
1278
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1279
 
        if reply_fd not in file_objects:
1280
 
            file_objects[reply_fd] = os.fdopen(reply_fd, u"w", 0)
1281
 
        
1282
 
        # Read a line from the file object
1283
 
        cmdline = file_objects[source].readline()
1284
 
        if not cmdline:             # Empty line means end of file
1285
 
            # close the IPC pipes
1286
 
            file_objects[source].close()
1287
 
            del file_objects[source]
1288
 
            file_objects[reply_fd].close()
1289
 
            del file_objects[reply_fd]
1290
 
            
1291
 
            # Stop calling this function
1292
 
            return False
1293
 
        
1294
 
        logger.debug(u"IPC command: %r", cmdline)
1295
 
        
1296
 
        # Parse and act on command
1297
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1298
 
        
1299
 
        if cmd == u"NOTFOUND":
1300
 
            fpr, address = args.split(None, 1)
1301
 
            logger.warning(u"Client not found for fingerprint: %s, ad"
1302
 
                           u"dress: %s", fpr, address)
1303
 
            if self.use_dbus:
1304
 
                # Emit D-Bus signal
1305
 
                mandos_dbus_service.ClientNotFound(fpr, address)
1306
 
        elif cmd == u"DISABLED":
1307
 
            for client in self.clients:
1308
 
                if client.name == args:
1309
 
                    logger.warning(u"Client %s is disabled", args)
1310
 
                    if self.use_dbus:
1311
 
                        # Emit D-Bus signal
1312
 
                        client.Rejected()
1313
 
                    break
1314
 
            else:
1315
 
                logger.error(u"Unknown client %s is disabled", args)
1316
 
        elif cmd == u"SENDING":
1317
 
            for client in self.clients:
1318
 
                if client.name == args:
1319
 
                    logger.info(u"Sending secret to %s", client.name)
1320
 
                    client.checked_ok()
1321
 
                    if self.use_dbus:
1322
 
                        # Emit D-Bus signal
1323
 
                        client.GotSecret()
1324
 
                    break
1325
 
            else:
1326
 
                logger.error(u"Sending secret to unknown client %s",
1327
 
                             args)
1328
 
        elif cmd == u"GETATTR":
1329
 
            attr_name, fpr = args.split(None, 1)
1330
 
            for client in self.clients:
1331
 
                if client.fingerprint == fpr:
1332
 
                    attr_value = getattr(client, attr_name, None)
1333
 
                    logger.debug("IPC reply: %r", attr_value)
1334
 
                    pickle.dump(attr_value, file_objects[reply_fd])
1335
 
                    break
1336
 
            else:
1337
 
                logger.error(u"Client %s on address %s requesting "
1338
 
                             u"attribute %s not found", fpr, address,
1339
 
                             attr_name)
1340
 
                pickle.dump(None, file_objects[reply_fd])
1341
 
        else:
1342
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1343
 
        
1344
 
        # Keep calling this function
 
1504
        # error or the other end of multiprocessing.Pipe has closed
 
1505
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1506
            return False
 
1507
        
 
1508
        # Read a request from the child
 
1509
        request = parent_pipe.recv()
 
1510
        command = request[0]
 
1511
        
 
1512
        if command == 'init':
 
1513
            fpr = request[1]
 
1514
            address = request[2]
 
1515
            
 
1516
            for c in self.clients:
 
1517
                if c.fingerprint == fpr:
 
1518
                    client = c
 
1519
                    break
 
1520
            else:
 
1521
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1522
                               u"dress: %s", fpr, address)
 
1523
                if self.use_dbus:
 
1524
                    # Emit D-Bus signal
 
1525
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1526
                parent_pipe.send(False)
 
1527
                return False
 
1528
            
 
1529
            gobject.io_add_watch(parent_pipe.fileno(),
 
1530
                                 gobject.IO_IN | gobject.IO_HUP,
 
1531
                                 functools.partial(self.handle_ipc,
 
1532
                                                   parent_pipe = parent_pipe,
 
1533
                                                   client_object = client))
 
1534
            parent_pipe.send(True)
 
1535
            # remove the old hook in favor of the new above hook on same fileno
 
1536
            return False
 
1537
        if command == 'funcall':
 
1538
            funcname = request[1]
 
1539
            args = request[2]
 
1540
            kwargs = request[3]
 
1541
            
 
1542
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1543
 
 
1544
        if command == 'getattr':
 
1545
            attrname = request[1]
 
1546
            if callable(client_object.__getattribute__(attrname)):
 
1547
                parent_pipe.send(('function',))
 
1548
            else:
 
1549
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1550
        
 
1551
        if command == 'setattr':
 
1552
            attrname = request[1]
 
1553
            value = request[2]
 
1554
            setattr(client_object, attrname, value)
 
1555
 
1345
1556
        return True
1346
1557
 
1347
1558
 
1450
1661
    parser.add_option("--debug", action=u"store_true",
1451
1662
                      help=u"Debug mode; run in foreground and log to"
1452
1663
                      u" terminal")
 
1664
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1665
                      help=u"Debug level for stdout output")
1453
1666
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1454
1667
                      u" priority string (see GnuTLS documentation)")
1455
1668
    parser.add_option("--servicename", type=u"string",
1480
1693
                        u"servicename": u"Mandos",
1481
1694
                        u"use_dbus": u"True",
1482
1695
                        u"use_ipv6": u"True",
 
1696
                        u"debuglevel": u"",
1483
1697
                        }
1484
1698
    
1485
1699
    # Parse config file for server-global settings
1502
1716
    # options, if set.
1503
1717
    for option in (u"interface", u"address", u"port", u"debug",
1504
1718
                   u"priority", u"servicename", u"configdir",
1505
 
                   u"use_dbus", u"use_ipv6"):
 
1719
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1506
1720
        value = getattr(options, option)
1507
1721
        if value is not None:
1508
1722
            server_settings[option] = value
1517
1731
    
1518
1732
    # For convenience
1519
1733
    debug = server_settings[u"debug"]
 
1734
    debuglevel = server_settings[u"debuglevel"]
1520
1735
    use_dbus = server_settings[u"use_dbus"]
1521
1736
    use_ipv6 = server_settings[u"use_ipv6"]
1522
 
    
1523
 
    if not debug:
1524
 
        syslogger.setLevel(logging.WARNING)
1525
 
        console.setLevel(logging.WARNING)
1526
 
    
 
1737
 
1527
1738
    if server_settings[u"servicename"] != u"Mandos":
1528
1739
        syslogger.setFormatter(logging.Formatter
1529
1740
                               (u'Mandos (%s) [%%(process)d]:'
1535
1746
                        u"interval": u"5m",
1536
1747
                        u"checker": u"fping -q -- %%(host)s",
1537
1748
                        u"host": u"",
 
1749
                        u"approval_delay": u"0s",
 
1750
                        u"approval_duration": u"1s",
1538
1751
                        }
1539
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1540
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
1546
1759
    tcp_server = MandosServer((server_settings[u"address"],
1547
1760
                               server_settings[u"port"]),
1548
1761
                              ClientHandler,
1549
 
                              interface=server_settings[u"interface"],
 
1762
                              interface=(server_settings[u"interface"]
 
1763
                                         or None),
1550
1764
                              use_ipv6=use_ipv6,
1551
1765
                              gnutls_priority=
1552
1766
                              server_settings[u"priority"],
1553
1767
                              use_dbus=use_dbus)
1554
 
    pidfilename = u"/var/run/mandos.pid"
1555
 
    try:
1556
 
        pidfile = open(pidfilename, u"w")
1557
 
    except IOError:
1558
 
        logger.error(u"Could not open file %r", pidfilename)
 
1768
    if not debug:
 
1769
        pidfilename = u"/var/run/mandos.pid"
 
1770
        try:
 
1771
            pidfile = open(pidfilename, u"w")
 
1772
        except IOError:
 
1773
            logger.error(u"Could not open file %r", pidfilename)
1559
1774
    
1560
1775
    try:
1561
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
1578
1793
        if error[0] != errno.EPERM:
1579
1794
            raise error
1580
1795
    
1581
 
    # Enable all possible GnuTLS debugging
 
1796
    if not debug and not debuglevel:
 
1797
        syslogger.setLevel(logging.WARNING)
 
1798
        console.setLevel(logging.WARNING)
 
1799
    if debuglevel:
 
1800
        level = getattr(logging, debuglevel.upper())
 
1801
        syslogger.setLevel(level)
 
1802
        console.setLevel(level)
 
1803
 
1582
1804
    if debug:
 
1805
        # Enable all possible GnuTLS debugging
 
1806
        
1583
1807
        # "Use a log level over 10 to enable all debugging options."
1584
1808
        # - GnuTLS manual
1585
1809
        gnutls.library.functions.gnutls_global_set_log_level(11)
1590
1814
        
1591
1815
        (gnutls.library.functions
1592
1816
         .gnutls_global_set_log_function(debug_gnutls))
 
1817
        
 
1818
        # Redirect stdin so all checkers get /dev/null
 
1819
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1820
        os.dup2(null, sys.stdin.fileno())
 
1821
        if null > 2:
 
1822
            os.close(null)
 
1823
    else:
 
1824
        # No console logging
 
1825
        logger.removeHandler(console)
 
1826
    
1593
1827
    
1594
1828
    global main_loop
1595
1829
    # From the Avahi example code
1613
1847
    if server_settings["interface"]:
1614
1848
        service.interface = (if_nametoindex
1615
1849
                             (str(server_settings[u"interface"])))
 
1850
 
 
1851
    if not debug:
 
1852
        # Close all input and output, do double fork, etc.
 
1853
        daemon()
 
1854
        
 
1855
    global multiprocessing_manager
 
1856
    multiprocessing_manager = multiprocessing.Manager()
1616
1857
    
1617
1858
    client_class = Client
1618
1859
    if use_dbus:
1619
1860
        client_class = functools.partial(ClientDBus, bus = bus)
 
1861
    def client_config_items(config, section):
 
1862
        special_settings = {
 
1863
            "approved_by_default":
 
1864
                lambda: config.getboolean(section,
 
1865
                                          "approved_by_default"),
 
1866
            }
 
1867
        for name, value in config.items(section):
 
1868
            try:
 
1869
                yield (name, special_settings[name]())
 
1870
            except KeyError:
 
1871
                yield (name, value)
 
1872
    
1620
1873
    tcp_server.clients.update(set(
1621
1874
            client_class(name = section,
1622
 
                         config= dict(client_config.items(section)))
 
1875
                         config= dict(client_config_items(
 
1876
                        client_config, section)))
1623
1877
            for section in client_config.sections()))
1624
1878
    if not tcp_server.clients:
1625
1879
        logger.warning(u"No clients defined")
1626
 
    
1627
 
    if debug:
1628
 
        # Redirect stdin so all checkers get /dev/null
1629
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1630
 
        os.dup2(null, sys.stdin.fileno())
1631
 
        if null > 2:
1632
 
            os.close(null)
1633
 
    else:
1634
 
        # No console logging
1635
 
        logger.removeHandler(console)
1636
 
        # Close all input and output, do double fork, etc.
1637
 
        daemon()
1638
 
    
1639
 
    try:
1640
 
        with pidfile:
1641
 
            pid = os.getpid()
1642
 
            pidfile.write(str(pid) + "\n")
1643
 
        del pidfile
1644
 
    except IOError:
1645
 
        logger.error(u"Could not write to file %r with PID %d",
1646
 
                     pidfilename, pid)
1647
 
    except NameError:
1648
 
        # "pidfile" was never created
1649
 
        pass
1650
 
    del pidfilename
1651
 
    
 
1880
        
1652
1881
    if not debug:
 
1882
        try:
 
1883
            with pidfile:
 
1884
                pid = os.getpid()
 
1885
                pidfile.write(str(pid) + "\n")
 
1886
            del pidfile
 
1887
        except IOError:
 
1888
            logger.error(u"Could not write to file %r with PID %d",
 
1889
                         pidfilename, pid)
 
1890
        except NameError:
 
1891
            # "pidfile" was never created
 
1892
            pass
 
1893
        del pidfilename
 
1894
        
1653
1895
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1896
 
1654
1897
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1655
1898
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1656
1899