/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
165
165
                                u' %%(levelname)s: %%(message)s'
166
166
                                % self.name))
167
167
        self.remove()
168
 
        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)
169
174
        self.rename_count += 1
170
175
    def remove(self):
171
176
        """Derived from the Avahi example code"""
194
199
        self.group.Commit()
195
200
    def entry_group_state_changed(self, state, error):
196
201
        """Derived from the Avahi example code"""
197
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
198
203
        
199
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
200
205
            logger.debug(u"Zeroconf service established.")
213
218
            self.group = None
214
219
    def server_state_changed(self, state):
215
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
216
222
        if state == avahi.SERVER_COLLISION:
217
223
            logger.error(u"Zeroconf server name collision")
218
224
            self.remove()
234
240
    """A representation of a client host served by this server.
235
241
    
236
242
    Attributes:
237
 
    name:       string; from the config file, used in log messages and
238
 
                        D-Bus identifiers
239
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
240
 
                 uniquely identify the client
241
 
    secret:     bytestring; sent verbatim (over TLS) to client
242
 
    host:       string; available for use by the checker command
243
 
    created:    datetime.datetime(); (UTC) object creation
244
 
    last_enabled: datetime.datetime(); (UTC)
245
 
    enabled:    bool()
246
 
    last_checked_ok: datetime.datetime(); (UTC) or None
247
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
248
 
                                      until this client is disabled
249
 
    interval:   datetime.timedelta(); How often to start a new checker
250
 
    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
251
246
    checker:    subprocess.Popen(); a running checker process used
252
247
                                    to see if the client lives.
253
248
                                    'None' if no process is running.
254
 
    checker_initiator_tag: a gobject event source tag, or None
255
 
    disable_initiator_tag: - '' -
256
249
    checker_callback_tag:  - '' -
257
 
    checker_command: string; External command which is run to check if
258
 
                     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
259
252
                     runtime with vars(self) as dict, so that for
260
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
261
256
    current_checker_command: string; current running checker_command
262
 
    approved_delay: datetime.timedelta(); Time to wait for approval
263
 
    _approved:   bool(); 'None' if not yet approved/disapproved
264
 
    approved_duration: datetime.timedelta(); Duration of one approval
 
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.
265
272
    """
266
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
    
267
279
    @staticmethod
268
280
    def _timedelta_to_milliseconds(td):
269
281
        "Convert a datetime.timedelta() to milliseconds"
279
291
        "Return the 'interval' attribute in milliseconds"
280
292
        return self._timedelta_to_milliseconds(self.interval)
281
293
 
282
 
    def approved_delay_milliseconds(self):
283
 
        return self._timedelta_to_milliseconds(self.approved_delay)
 
294
    def approval_delay_milliseconds(self):
 
295
        return self._timedelta_to_milliseconds(self.approval_delay)
284
296
    
285
297
    def __init__(self, name = None, disable_hook=None, config=None):
286
298
        """Note: the 'checker' key in 'config' sets the
325
337
        self.approved_by_default = config.get(u"approved_by_default",
326
338
                                              True)
327
339
        self.approvals_pending = 0
328
 
        self.approved_delay = string_to_delta(
329
 
            config[u"approved_delay"])
330
 
        self.approved_duration = string_to_delta(
331
 
            config[u"approved_duration"])
 
340
        self.approval_delay = string_to_delta(
 
341
            config[u"approval_delay"])
 
342
        self.approval_duration = string_to_delta(
 
343
            config[u"approval_duration"])
332
344
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
333
345
    
334
346
    def send_changedstate(self):
444
456
                command = self.checker_command % self.host
445
457
            except TypeError:
446
458
                # Escape attributes for the shell
447
 
                escaped_attrs = dict((key,
448
 
                                      re.escape(unicode(str(val),
449
 
                                                        errors=
450
 
                                                        u'replace')))
451
 
                                     for key, val in
452
 
                                     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
 
453
467
                try:
454
468
                    command = self.checker_command % escaped_attrs
455
469
                except TypeError, error:
697
711
    dbus_object_path: dbus.ObjectPath
698
712
    bus: dbus.SystemBus()
699
713
    """
 
714
    
 
715
    runtime_expansions = (Client.runtime_expansions
 
716
                          + (u"dbus_object_path",))
 
717
    
700
718
    # dbus.service.Object doesn't use super(), so we can't either.
701
719
    
702
720
    def __init__(self, bus = None, *args, **kwargs):
705
723
        Client.__init__(self, *args, **kwargs)
706
724
        # Only now, when this client is initialized, can it show up on
707
725
        # the D-Bus
 
726
        client_object_name = unicode(self.name).translate(
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
708
729
        self.dbus_object_path = (dbus.ObjectPath
709
 
                                 (u"/clients/"
710
 
                                  + self.name.replace(u".", u"_")))
 
730
                                 (u"/clients/" + client_object_name))
711
731
        DBusObjectWithProperties.__init__(self, self.bus,
712
732
                                          self.dbus_object_path)
713
 
 
 
733
        
714
734
    def _get_approvals_pending(self):
715
735
        return self._approvals_pending
716
736
    def _set_approvals_pending(self, value):
720
740
        if (hasattr(self, "dbus_object_path")
721
741
            and bval is not bool(old_value)):
722
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
723
 
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
724
744
                                 dbus_bool)
725
745
 
726
746
    approvals_pending = property(_get_approvals_pending,
738
758
        r = Client.enable(self)
739
759
        if oldstate != self.enabled:
740
760
            # Emit D-Bus signals
741
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
742
762
                                 dbus.Boolean(True, variant_level=1))
743
763
            self.PropertyChanged(
744
 
                dbus.String(u"last_enabled"),
 
764
                dbus.String(u"LastEnabled"),
745
765
                self._datetime_to_dbus(self.last_enabled,
746
766
                                       variant_level=1))
747
767
        return r
751
771
        r = Client.disable(self, quiet=quiet)
752
772
        if not quiet and oldstate != self.enabled:
753
773
            # Emit D-Bus signal
754
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
755
775
                                 dbus.Boolean(False, variant_level=1))
756
776
        return r
757
777
    
769
789
        self.checker_callback_tag = None
770
790
        self.checker = None
771
791
        # Emit D-Bus signal
772
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
773
793
                             dbus.Boolean(False, variant_level=1))
774
794
        if os.WIFEXITED(condition):
775
795
            exitstatus = os.WEXITSTATUS(condition)
790
810
        r = Client.checked_ok(self, *args, **kwargs)
791
811
        # Emit D-Bus signal
792
812
        self.PropertyChanged(
793
 
            dbus.String(u"last_checked_ok"),
 
813
            dbus.String(u"LastCheckedOK"),
794
814
            (self._datetime_to_dbus(self.last_checked_ok,
795
815
                                    variant_level=1)))
796
816
        return r
808
828
            # Emit D-Bus signal
809
829
            self.CheckerStarted(self.current_checker_command)
810
830
            self.PropertyChanged(
811
 
                dbus.String(u"checker_running"),
 
831
                dbus.String(u"CheckerRunning"),
812
832
                dbus.Boolean(True, variant_level=1))
813
833
        return r
814
834
    
817
837
        r = Client.stop_checker(self, *args, **kwargs)
818
838
        if (old_checker is not None
819
839
            and getattr(self, u"checker", None) is None):
820
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
821
841
                                 dbus.Boolean(False, variant_level=1))
822
842
        return r
823
843
 
828
848
    def approve(self, value=True):
829
849
        self.send_changedstate()
830
850
        self._approved = value
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
851
        gobject.timeout_add(self._timedelta_to_milliseconds
 
852
                            (self.approval_duration),
832
853
                            self._reset_approved)
833
854
    
834
855
    
871
892
        pass
872
893
    
873
894
    # NeedApproval - signal
874
 
    @dbus.service.signal(_interface, signature=u"db")
 
895
    @dbus.service.signal(_interface, signature=u"tb")
875
896
    def NeedApproval(self, timeout, default):
876
897
        "D-Bus signal"
877
898
        pass
913
934
    
914
935
    ## Properties
915
936
    
916
 
    # approved_pending - property
 
937
    # ApprovalPending - property
917
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
918
 
    def approved_pending_dbus_property(self):
 
939
    def ApprovalPending_dbus_property(self):
919
940
        return dbus.Boolean(bool(self.approvals_pending))
920
941
    
921
 
    # approved_by_default - property
 
942
    # ApprovedByDefault - property
922
943
    @dbus_service_property(_interface, signature=u"b",
923
944
                           access=u"readwrite")
924
 
    def approved_by_default_dbus_property(self):
925
 
        return dbus.Boolean(self.approved_by_default)
926
 
    
927
 
    # approved_delay - property
928
 
    @dbus_service_property(_interface, signature=u"t",
929
 
                           access=u"readwrite")
930
 
    def approved_delay_dbus_property(self):
931
 
        return dbus.UInt64(self.approved_delay_milliseconds())
932
 
    
933
 
    # approved_duration - property
934
 
    @dbus_service_property(_interface, signature=u"t",
935
 
                           access=u"readwrite")
936
 
    def approved_duration_dbus_property(self):
937
 
        return dbus.UInt64(self._timedelta_to_milliseconds(
938
 
                self.approved_duration))
939
 
    
940
 
    # name - property
 
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
941
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
942
 
    def name_dbus_property(self):
 
978
    def Name_dbus_property(self):
943
979
        return dbus.String(self.name)
944
980
    
945
 
    # fingerprint - property
 
981
    # Fingerprint - property
946
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
947
 
    def fingerprint_dbus_property(self):
 
983
    def Fingerprint_dbus_property(self):
948
984
        return dbus.String(self.fingerprint)
949
985
    
950
 
    # host - property
 
986
    # Host - property
951
987
    @dbus_service_property(_interface, signature=u"s",
952
988
                           access=u"readwrite")
953
 
    def host_dbus_property(self, value=None):
 
989
    def Host_dbus_property(self, value=None):
954
990
        if value is None:       # get
955
991
            return dbus.String(self.host)
956
992
        self.host = value
957
993
        # Emit D-Bus signal
958
 
        self.PropertyChanged(dbus.String(u"host"),
 
994
        self.PropertyChanged(dbus.String(u"Host"),
959
995
                             dbus.String(value, variant_level=1))
960
996
    
961
 
    # created - property
 
997
    # Created - property
962
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
963
 
    def created_dbus_property(self):
 
999
    def Created_dbus_property(self):
964
1000
        return dbus.String(self._datetime_to_dbus(self.created))
965
1001
    
966
 
    # last_enabled - property
 
1002
    # LastEnabled - property
967
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
968
 
    def last_enabled_dbus_property(self):
 
1004
    def LastEnabled_dbus_property(self):
969
1005
        if self.last_enabled is None:
970
1006
            return dbus.String(u"")
971
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
972
1008
    
973
 
    # enabled - property
 
1009
    # Enabled - property
974
1010
    @dbus_service_property(_interface, signature=u"b",
975
1011
                           access=u"readwrite")
976
 
    def enabled_dbus_property(self, value=None):
 
1012
    def Enabled_dbus_property(self, value=None):
977
1013
        if value is None:       # get
978
1014
            return dbus.Boolean(self.enabled)
979
1015
        if value:
981
1017
        else:
982
1018
            self.disable()
983
1019
    
984
 
    # last_checked_ok - property
 
1020
    # LastCheckedOK - property
985
1021
    @dbus_service_property(_interface, signature=u"s",
986
1022
                           access=u"readwrite")
987
 
    def last_checked_ok_dbus_property(self, value=None):
 
1023
    def LastCheckedOK_dbus_property(self, value=None):
988
1024
        if value is not None:
989
1025
            self.checked_ok()
990
1026
            return
993
1029
        return dbus.String(self._datetime_to_dbus(self
994
1030
                                                  .last_checked_ok))
995
1031
    
996
 
    # timeout - property
 
1032
    # Timeout - property
997
1033
    @dbus_service_property(_interface, signature=u"t",
998
1034
                           access=u"readwrite")
999
 
    def timeout_dbus_property(self, value=None):
 
1035
    def Timeout_dbus_property(self, value=None):
1000
1036
        if value is None:       # get
1001
1037
            return dbus.UInt64(self.timeout_milliseconds())
1002
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
1003
1039
        # Emit D-Bus signal
1004
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
1005
1041
                             dbus.UInt64(value, variant_level=1))
1006
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
1007
1043
            return
1021
1057
            self.disable_initiator_tag = (gobject.timeout_add
1022
1058
                                          (time_to_die, self.disable))
1023
1059
    
1024
 
    # interval - property
 
1060
    # Interval - property
1025
1061
    @dbus_service_property(_interface, signature=u"t",
1026
1062
                           access=u"readwrite")
1027
 
    def interval_dbus_property(self, value=None):
 
1063
    def Interval_dbus_property(self, value=None):
1028
1064
        if value is None:       # get
1029
1065
            return dbus.UInt64(self.interval_milliseconds())
1030
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
1031
1067
        # Emit D-Bus signal
1032
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
1033
1069
                             dbus.UInt64(value, variant_level=1))
1034
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
1035
1071
            return
1039
1075
                                      (value, self.start_checker))
1040
1076
        self.start_checker()    # Start one now, too
1041
1077
 
1042
 
    # checker - property
 
1078
    # Checker - property
1043
1079
    @dbus_service_property(_interface, signature=u"s",
1044
1080
                           access=u"readwrite")
1045
 
    def checker_dbus_property(self, value=None):
 
1081
    def Checker_dbus_property(self, value=None):
1046
1082
        if value is None:       # get
1047
1083
            return dbus.String(self.checker_command)
1048
1084
        self.checker_command = value
1049
1085
        # Emit D-Bus signal
1050
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
1051
1087
                             dbus.String(self.checker_command,
1052
1088
                                         variant_level=1))
1053
1089
    
1054
 
    # checker_running - property
 
1090
    # CheckerRunning - property
1055
1091
    @dbus_service_property(_interface, signature=u"b",
1056
1092
                           access=u"readwrite")
1057
 
    def checker_running_dbus_property(self, value=None):
 
1093
    def CheckerRunning_dbus_property(self, value=None):
1058
1094
        if value is None:       # get
1059
1095
            return dbus.Boolean(self.checker is not None)
1060
1096
        if value:
1062
1098
        else:
1063
1099
            self.stop_checker()
1064
1100
    
1065
 
    # object_path - property
 
1101
    # ObjectPath - property
1066
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1067
 
    def object_path_dbus_property(self):
 
1103
    def ObjectPath_dbus_property(self):
1068
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
1069
1105
    
1070
 
    # secret = property
 
1106
    # Secret = property
1071
1107
    @dbus_service_property(_interface, signature=u"ay",
1072
1108
                           access=u"write", byte_arrays=True)
1073
 
    def secret_dbus_property(self, value):
 
1109
    def Secret_dbus_property(self, value):
1074
1110
        self.secret = str(value)
1075
1111
    
1076
1112
    del _interface
1174
1210
                except KeyError:
1175
1211
                    return
1176
1212
                
1177
 
                if client.approved_delay:
1178
 
                    delay = client.approved_delay
 
1213
                if client.approval_delay:
 
1214
                    delay = client.approval_delay
1179
1215
                    client.approvals_pending += 1
1180
1216
                    approval_required = True
1181
1217
                
1188
1224
                            client.Rejected("Disabled")                    
1189
1225
                        return
1190
1226
                    
1191
 
                    if client._approved or not client.approved_delay:
 
1227
                    if client._approved or not client.approval_delay:
1192
1228
                        #We are approved or approval is disabled
1193
1229
                        break
1194
1230
                    elif client._approved is None:
1195
 
                        logger.info(u"Client %s need approval",
 
1231
                        logger.info(u"Client %s needs approval",
1196
1232
                                    client.name)
1197
1233
                        if self.server.use_dbus:
1198
1234
                            # Emit D-Bus signal
1199
1235
                            client.NeedApproval(
1200
 
                                client.approved_delay_milliseconds(),
 
1236
                                client.approval_delay_milliseconds(),
1201
1237
                                client.approved_by_default)
1202
1238
                    else:
1203
1239
                        logger.warning(u"Client %s was not approved",
1204
1240
                                       client.name)
1205
1241
                        if self.server.use_dbus:
1206
1242
                            # Emit D-Bus signal
1207
 
                            client.Rejected("Disapproved")
 
1243
                            client.Rejected("Denied")
1208
1244
                        return
1209
1245
                    
1210
1246
                    #wait until timeout or approved
1221
1257
                                           client.name)
1222
1258
                            if self.server.use_dbus:
1223
1259
                                # Emit D-Bus signal
1224
 
                                client.Rejected("Time out")
 
1260
                                client.Rejected("Approval timed out")
1225
1261
                            return
1226
1262
                        else:
1227
1263
                            break
1253
1289
                try:
1254
1290
                    session.bye()
1255
1291
                except (gnutls.errors.GNUTLSError), error:
1256
 
                    logger.warning("gnutls bye failed")
 
1292
                    logger.warning("GnuTLS bye failed")
1257
1293
    
1258
1294
    @staticmethod
1259
1295
    def peer_certificate(session):
1465
1501
                                       for cond, name in
1466
1502
                                       condition_names.iteritems()
1467
1503
                                       if cond & condition)
1468
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1469
 
                     conditions_string)
1470
 
 
1471
1504
        # error or the other end of multiprocessing.Pipe has closed
1472
1505
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1473
1506
            return False
1474
1507
        
1475
1508
        # Read a request from the child
1476
1509
        request = parent_pipe.recv()
1477
 
        logger.debug(u"IPC request: %s", repr(request))
1478
1510
        command = request[0]
1479
1511
        
1480
1512
        if command == 'init':
1490
1522
                               u"dress: %s", fpr, address)
1491
1523
                if self.use_dbus:
1492
1524
                    # Emit D-Bus signal
1493
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1525
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1494
1526
                parent_pipe.send(False)
1495
1527
                return False
1496
1528
            
1714
1746
                        u"interval": u"5m",
1715
1747
                        u"checker": u"fping -q -- %%(host)s",
1716
1748
                        u"host": u"",
1717
 
                        u"approved_delay": u"0s",
1718
 
                        u"approved_duration": u"1s",
 
1749
                        u"approval_delay": u"0s",
 
1750
                        u"approval_duration": u"1s",
1719
1751
                        }
1720
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1721
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
1727
1759
    tcp_server = MandosServer((server_settings[u"address"],
1728
1760
                               server_settings[u"port"]),
1729
1761
                              ClientHandler,
1730
 
                              interface=server_settings[u"interface"],
 
1762
                              interface=(server_settings[u"interface"]
 
1763
                                         or None),
1731
1764
                              use_ipv6=use_ipv6,
1732
1765
                              gnutls_priority=
1733
1766
                              server_settings[u"priority"],
1734
1767
                              use_dbus=use_dbus)
1735
 
    pidfilename = u"/var/run/mandos.pid"
1736
 
    try:
1737
 
        pidfile = open(pidfilename, u"w")
1738
 
    except IOError:
1739
 
        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)
1740
1774
    
1741
1775
    try:
1742
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
1759
1793
        if error[0] != errno.EPERM:
1760
1794
            raise error
1761
1795
    
1762
 
    # Enable all possible GnuTLS debugging
1763
 
 
1764
 
 
1765
1796
    if not debug and not debuglevel:
1766
1797
        syslogger.setLevel(logging.WARNING)
1767
1798
        console.setLevel(logging.WARNING)
1771
1802
        console.setLevel(level)
1772
1803
 
1773
1804
    if debug:
 
1805
        # Enable all possible GnuTLS debugging
 
1806
        
1774
1807
        # "Use a log level over 10 to enable all debugging options."
1775
1808
        # - GnuTLS manual
1776
1809
        gnutls.library.functions.gnutls_global_set_log_level(11)
1781
1814
        
1782
1815
        (gnutls.library.functions
1783
1816
         .gnutls_global_set_log_function(debug_gnutls))
1784
 
 
 
1817
        
1785
1818
        # Redirect stdin so all checkers get /dev/null
1786
1819
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1787
1820
        os.dup2(null, sys.stdin.fileno())
1790
1823
    else:
1791
1824
        # No console logging
1792
1825
        logger.removeHandler(console)
1793
 
 
 
1826
    
1794
1827
    
1795
1828
    global main_loop
1796
1829
    # From the Avahi example code
1845
1878
    if not tcp_server.clients:
1846
1879
        logger.warning(u"No clients defined")
1847
1880
        
1848
 
    try:
1849
 
        with pidfile:
1850
 
            pid = os.getpid()
1851
 
            pidfile.write(str(pid) + "\n")
1852
 
        del pidfile
1853
 
    except IOError:
1854
 
        logger.error(u"Could not write to file %r with PID %d",
1855
 
                     pidfilename, pid)
1856
 
    except NameError:
1857
 
        # "pidfile" was never created
1858
 
        pass
1859
 
    del pidfilename
1860
 
    
1861
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
        
1862
1895
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1896
 
1863
1897
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1864
1898
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1865
1899