/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2010-10-05 17:15:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20101005171509-xqxdzcgjjynchfyy
* debian/changelog: Include entry from 1.0.14-1.1 NMU.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2010 Teddy Hogeborn
 
15
# Copyright © 2008-2010 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
81
81
        SO_BINDTODEVICE = None
82
82
 
83
83
 
84
 
version = "1.0.14"
 
84
version = "1.2.1"
85
85
 
86
86
#logger = logging.getLogger(u'mandos')
87
87
logger = logging.Logger(u'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
 
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
 
246
    checker:    subprocess.Popen(); a running checker process used
 
247
                                    to see if the client lives.
 
248
                                    'None' if no process is running.
 
249
    checker_callback_tag: a gobject event source tag, or None
 
250
    checker_command: string; External command which is run to check
 
251
                     if client lives.  %() expansions are done at
 
252
                     runtime with vars(self) as dict, so that for
 
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
 
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: a gobject event source tag, or None
 
259
    enabled:    bool()
239
260
    fingerprint: string (40 or 32 hexadecimal digits); used to
240
261
                 uniquely identify the client
241
 
    secret:     bytestring; sent verbatim (over TLS) to client
242
262
    host:       string; available for use by the checker command
243
 
    created:    datetime.datetime(); (UTC) object creation
 
263
    interval:   datetime.timedelta(); How often to start a new checker
 
264
    last_approval_request: datetime.datetime(); (UTC) or None
 
265
    last_checked_ok: datetime.datetime(); (UTC) or None
244
266
    last_enabled: datetime.datetime(); (UTC)
245
 
    enabled:    bool()
246
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
267
    name:       string; from the config file, used in log messages and
 
268
                        D-Bus identifiers
 
269
    secret:     bytestring; sent verbatim (over TLS) to client
247
270
    timeout:    datetime.timedelta(); How long from last_checked_ok
248
271
                                      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)
251
 
    checker:    subprocess.Popen(); a running checker process used
252
 
                                    to see if the client lives.
253
 
                                    'None' if no process is running.
254
 
    checker_initiator_tag: a gobject event source tag, or None
255
 
    disable_initiator_tag: - '' -
256
 
    checker_callback_tag:  - '' -
257
 
    checker_command: string; External command which is run to check if
258
 
                     client lives.  %() expansions are done at
259
 
                     runtime with vars(self) as dict, so that for
260
 
                     instance %(name)s can be used in the command.
261
 
    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
 
272
    runtime_expansions: Allowed attributes for runtime expansion.
265
273
    """
266
274
    
 
275
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
276
                          u"created", u"enabled", u"fingerprint",
 
277
                          u"host", u"interval", u"last_checked_ok",
 
278
                          u"last_enabled", u"name", u"timeout")
 
279
    
267
280
    @staticmethod
268
281
    def _timedelta_to_milliseconds(td):
269
282
        "Convert a datetime.timedelta() to milliseconds"
279
292
        "Return the 'interval' attribute in milliseconds"
280
293
        return self._timedelta_to_milliseconds(self.interval)
281
294
 
282
 
    def approved_delay_milliseconds(self):
283
 
        return self._timedelta_to_milliseconds(self.approved_delay)
 
295
    def approval_delay_milliseconds(self):
 
296
        return self._timedelta_to_milliseconds(self.approval_delay)
284
297
    
285
298
    def __init__(self, name = None, disable_hook=None, config=None):
286
299
        """Note: the 'checker' key in 'config' sets the
309
322
        self.host = config.get(u"host", u"")
310
323
        self.created = datetime.datetime.utcnow()
311
324
        self.enabled = False
 
325
        self.last_approval_request = None
312
326
        self.last_enabled = None
313
327
        self.last_checked_ok = None
314
328
        self.timeout = string_to_delta(config[u"timeout"])
325
339
        self.approved_by_default = config.get(u"approved_by_default",
326
340
                                              True)
327
341
        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"])
 
342
        self.approval_delay = string_to_delta(
 
343
            config[u"approval_delay"])
 
344
        self.approval_duration = string_to_delta(
 
345
            config[u"approval_duration"])
332
346
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
333
347
    
334
348
    def send_changedstate(self):
410
424
                                      (self.timeout_milliseconds(),
411
425
                                       self.disable))
412
426
    
 
427
    def need_approval(self):
 
428
        self.last_approval_request = datetime.datetime.utcnow()
 
429
    
413
430
    def start_checker(self):
414
431
        """Start a new checker subprocess if one is not running.
415
432
        
444
461
                command = self.checker_command % self.host
445
462
            except TypeError:
446
463
                # 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())
 
464
                escaped_attrs = dict(
 
465
                    (attr,
 
466
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
467
                                       errors=
 
468
                                       u'replace')))
 
469
                    for attr in
 
470
                    self.runtime_expansions)
 
471
 
453
472
                try:
454
473
                    command = self.checker_command % escaped_attrs
455
474
                except TypeError, error:
697
716
    dbus_object_path: dbus.ObjectPath
698
717
    bus: dbus.SystemBus()
699
718
    """
 
719
    
 
720
    runtime_expansions = (Client.runtime_expansions
 
721
                          + (u"dbus_object_path",))
 
722
    
700
723
    # dbus.service.Object doesn't use super(), so we can't either.
701
724
    
702
725
    def __init__(self, bus = None, *args, **kwargs):
705
728
        Client.__init__(self, *args, **kwargs)
706
729
        # Only now, when this client is initialized, can it show up on
707
730
        # the D-Bus
 
731
        client_object_name = unicode(self.name).translate(
 
732
            {ord(u"."): ord(u"_"),
 
733
             ord(u"-"): ord(u"_")})
708
734
        self.dbus_object_path = (dbus.ObjectPath
709
 
                                 (u"/clients/"
710
 
                                  + self.name.replace(u".", u"_")))
 
735
                                 (u"/clients/" + client_object_name))
711
736
        DBusObjectWithProperties.__init__(self, self.bus,
712
737
                                          self.dbus_object_path)
713
 
 
 
738
        
714
739
    def _get_approvals_pending(self):
715
740
        return self._approvals_pending
716
741
    def _set_approvals_pending(self, value):
720
745
        if (hasattr(self, "dbus_object_path")
721
746
            and bval is not bool(old_value)):
722
747
            dbus_bool = dbus.Boolean(bval, variant_level=1)
723
 
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
748
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
724
749
                                 dbus_bool)
725
750
 
726
751
    approvals_pending = property(_get_approvals_pending,
738
763
        r = Client.enable(self)
739
764
        if oldstate != self.enabled:
740
765
            # Emit D-Bus signals
741
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
766
            self.PropertyChanged(dbus.String(u"Enabled"),
742
767
                                 dbus.Boolean(True, variant_level=1))
743
768
            self.PropertyChanged(
744
 
                dbus.String(u"last_enabled"),
 
769
                dbus.String(u"LastEnabled"),
745
770
                self._datetime_to_dbus(self.last_enabled,
746
771
                                       variant_level=1))
747
772
        return r
751
776
        r = Client.disable(self, quiet=quiet)
752
777
        if not quiet and oldstate != self.enabled:
753
778
            # Emit D-Bus signal
754
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
779
            self.PropertyChanged(dbus.String(u"Enabled"),
755
780
                                 dbus.Boolean(False, variant_level=1))
756
781
        return r
757
782
    
769
794
        self.checker_callback_tag = None
770
795
        self.checker = None
771
796
        # Emit D-Bus signal
772
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
797
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
773
798
                             dbus.Boolean(False, variant_level=1))
774
799
        if os.WIFEXITED(condition):
775
800
            exitstatus = os.WEXITSTATUS(condition)
790
815
        r = Client.checked_ok(self, *args, **kwargs)
791
816
        # Emit D-Bus signal
792
817
        self.PropertyChanged(
793
 
            dbus.String(u"last_checked_ok"),
 
818
            dbus.String(u"LastCheckedOK"),
794
819
            (self._datetime_to_dbus(self.last_checked_ok,
795
820
                                    variant_level=1)))
796
821
        return r
797
822
    
 
823
    def need_approval(self, *args, **kwargs):
 
824
        r = Client.need_approval(self, *args, **kwargs)
 
825
        # Emit D-Bus signal
 
826
        self.PropertyChanged(
 
827
            dbus.String(u"LastApprovalRequest"),
 
828
            (self._datetime_to_dbus(self.last_approval_request,
 
829
                                    variant_level=1)))
 
830
        return r
 
831
    
798
832
    def start_checker(self, *args, **kwargs):
799
833
        old_checker = self.checker
800
834
        if self.checker is not None:
808
842
            # Emit D-Bus signal
809
843
            self.CheckerStarted(self.current_checker_command)
810
844
            self.PropertyChanged(
811
 
                dbus.String(u"checker_running"),
 
845
                dbus.String(u"CheckerRunning"),
812
846
                dbus.Boolean(True, variant_level=1))
813
847
        return r
814
848
    
817
851
        r = Client.stop_checker(self, *args, **kwargs)
818
852
        if (old_checker is not None
819
853
            and getattr(self, u"checker", None) is None):
820
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
854
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
821
855
                                 dbus.Boolean(False, variant_level=1))
822
856
        return r
823
857
 
828
862
    def approve(self, value=True):
829
863
        self.send_changedstate()
830
864
        self._approved = value
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
865
        gobject.timeout_add(self._timedelta_to_milliseconds
 
866
                            (self.approval_duration),
832
867
                            self._reset_approved)
833
868
    
834
869
    
871
906
        pass
872
907
    
873
908
    # NeedApproval - signal
874
 
    @dbus.service.signal(_interface, signature=u"db")
 
909
    @dbus.service.signal(_interface, signature=u"tb")
875
910
    def NeedApproval(self, timeout, default):
876
911
        "D-Bus signal"
877
 
        pass
 
912
        return self.need_approval()
878
913
    
879
914
    ## Methods
880
 
 
 
915
    
881
916
    # Approve - method
882
917
    @dbus.service.method(_interface, in_signature=u"b")
883
918
    def Approve(self, value):
884
919
        self.approve(value)
885
 
 
 
920
    
886
921
    # CheckedOK - method
887
922
    @dbus.service.method(_interface)
888
923
    def CheckedOK(self):
913
948
    
914
949
    ## Properties
915
950
    
916
 
    # approved_pending - property
 
951
    # ApprovalPending - property
917
952
    @dbus_service_property(_interface, signature=u"b", access=u"read")
918
 
    def approved_pending_dbus_property(self):
 
953
    def ApprovalPending_dbus_property(self):
919
954
        return dbus.Boolean(bool(self.approvals_pending))
920
955
    
921
 
    # approved_by_default - property
 
956
    # ApprovedByDefault - property
922
957
    @dbus_service_property(_interface, signature=u"b",
923
958
                           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
 
959
    def ApprovedByDefault_dbus_property(self, value=None):
 
960
        if value is None:       # get
 
961
            return dbus.Boolean(self.approved_by_default)
 
962
        self.approved_by_default = bool(value)
 
963
        # Emit D-Bus signal
 
964
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
965
                             dbus.Boolean(value, variant_level=1))
 
966
    
 
967
    # ApprovalDelay - property
 
968
    @dbus_service_property(_interface, signature=u"t",
 
969
                           access=u"readwrite")
 
970
    def ApprovalDelay_dbus_property(self, value=None):
 
971
        if value is None:       # get
 
972
            return dbus.UInt64(self.approval_delay_milliseconds())
 
973
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
974
        # Emit D-Bus signal
 
975
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
976
                             dbus.UInt64(value, variant_level=1))
 
977
    
 
978
    # ApprovalDuration - property
 
979
    @dbus_service_property(_interface, signature=u"t",
 
980
                           access=u"readwrite")
 
981
    def ApprovalDuration_dbus_property(self, value=None):
 
982
        if value is None:       # get
 
983
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
984
                    self.approval_duration))
 
985
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
986
        # Emit D-Bus signal
 
987
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
988
                             dbus.UInt64(value, variant_level=1))
 
989
    
 
990
    # Name - property
941
991
    @dbus_service_property(_interface, signature=u"s", access=u"read")
942
 
    def name_dbus_property(self):
 
992
    def Name_dbus_property(self):
943
993
        return dbus.String(self.name)
944
994
    
945
 
    # fingerprint - property
 
995
    # Fingerprint - property
946
996
    @dbus_service_property(_interface, signature=u"s", access=u"read")
947
 
    def fingerprint_dbus_property(self):
 
997
    def Fingerprint_dbus_property(self):
948
998
        return dbus.String(self.fingerprint)
949
999
    
950
 
    # host - property
 
1000
    # Host - property
951
1001
    @dbus_service_property(_interface, signature=u"s",
952
1002
                           access=u"readwrite")
953
 
    def host_dbus_property(self, value=None):
 
1003
    def Host_dbus_property(self, value=None):
954
1004
        if value is None:       # get
955
1005
            return dbus.String(self.host)
956
1006
        self.host = value
957
1007
        # Emit D-Bus signal
958
 
        self.PropertyChanged(dbus.String(u"host"),
 
1008
        self.PropertyChanged(dbus.String(u"Host"),
959
1009
                             dbus.String(value, variant_level=1))
960
1010
    
961
 
    # created - property
 
1011
    # Created - property
962
1012
    @dbus_service_property(_interface, signature=u"s", access=u"read")
963
 
    def created_dbus_property(self):
 
1013
    def Created_dbus_property(self):
964
1014
        return dbus.String(self._datetime_to_dbus(self.created))
965
1015
    
966
 
    # last_enabled - property
 
1016
    # LastEnabled - property
967
1017
    @dbus_service_property(_interface, signature=u"s", access=u"read")
968
 
    def last_enabled_dbus_property(self):
 
1018
    def LastEnabled_dbus_property(self):
969
1019
        if self.last_enabled is None:
970
1020
            return dbus.String(u"")
971
1021
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
972
1022
    
973
 
    # enabled - property
 
1023
    # Enabled - property
974
1024
    @dbus_service_property(_interface, signature=u"b",
975
1025
                           access=u"readwrite")
976
 
    def enabled_dbus_property(self, value=None):
 
1026
    def Enabled_dbus_property(self, value=None):
977
1027
        if value is None:       # get
978
1028
            return dbus.Boolean(self.enabled)
979
1029
        if value:
981
1031
        else:
982
1032
            self.disable()
983
1033
    
984
 
    # last_checked_ok - property
 
1034
    # LastCheckedOK - property
985
1035
    @dbus_service_property(_interface, signature=u"s",
986
1036
                           access=u"readwrite")
987
 
    def last_checked_ok_dbus_property(self, value=None):
 
1037
    def LastCheckedOK_dbus_property(self, value=None):
988
1038
        if value is not None:
989
1039
            self.checked_ok()
990
1040
            return
993
1043
        return dbus.String(self._datetime_to_dbus(self
994
1044
                                                  .last_checked_ok))
995
1045
    
996
 
    # timeout - property
 
1046
    # LastApprovalRequest - property
 
1047
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1048
    def LastApprovalRequest_dbus_property(self):
 
1049
        if self.last_approval_request is None:
 
1050
            return dbus.String(u"")
 
1051
        return dbus.String(self.
 
1052
                           _datetime_to_dbus(self
 
1053
                                             .last_approval_request))
 
1054
    
 
1055
    # Timeout - property
997
1056
    @dbus_service_property(_interface, signature=u"t",
998
1057
                           access=u"readwrite")
999
 
    def timeout_dbus_property(self, value=None):
 
1058
    def Timeout_dbus_property(self, value=None):
1000
1059
        if value is None:       # get
1001
1060
            return dbus.UInt64(self.timeout_milliseconds())
1002
1061
        self.timeout = datetime.timedelta(0, 0, 0, value)
1003
1062
        # Emit D-Bus signal
1004
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1063
        self.PropertyChanged(dbus.String(u"Timeout"),
1005
1064
                             dbus.UInt64(value, variant_level=1))
1006
1065
        if getattr(self, u"disable_initiator_tag", None) is None:
1007
1066
            return
1021
1080
            self.disable_initiator_tag = (gobject.timeout_add
1022
1081
                                          (time_to_die, self.disable))
1023
1082
    
1024
 
    # interval - property
 
1083
    # Interval - property
1025
1084
    @dbus_service_property(_interface, signature=u"t",
1026
1085
                           access=u"readwrite")
1027
 
    def interval_dbus_property(self, value=None):
 
1086
    def Interval_dbus_property(self, value=None):
1028
1087
        if value is None:       # get
1029
1088
            return dbus.UInt64(self.interval_milliseconds())
1030
1089
        self.interval = datetime.timedelta(0, 0, 0, value)
1031
1090
        # Emit D-Bus signal
1032
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1091
        self.PropertyChanged(dbus.String(u"Interval"),
1033
1092
                             dbus.UInt64(value, variant_level=1))
1034
1093
        if getattr(self, u"checker_initiator_tag", None) is None:
1035
1094
            return
1039
1098
                                      (value, self.start_checker))
1040
1099
        self.start_checker()    # Start one now, too
1041
1100
 
1042
 
    # checker - property
 
1101
    # Checker - property
1043
1102
    @dbus_service_property(_interface, signature=u"s",
1044
1103
                           access=u"readwrite")
1045
 
    def checker_dbus_property(self, value=None):
 
1104
    def Checker_dbus_property(self, value=None):
1046
1105
        if value is None:       # get
1047
1106
            return dbus.String(self.checker_command)
1048
1107
        self.checker_command = value
1049
1108
        # Emit D-Bus signal
1050
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1109
        self.PropertyChanged(dbus.String(u"Checker"),
1051
1110
                             dbus.String(self.checker_command,
1052
1111
                                         variant_level=1))
1053
1112
    
1054
 
    # checker_running - property
 
1113
    # CheckerRunning - property
1055
1114
    @dbus_service_property(_interface, signature=u"b",
1056
1115
                           access=u"readwrite")
1057
 
    def checker_running_dbus_property(self, value=None):
 
1116
    def CheckerRunning_dbus_property(self, value=None):
1058
1117
        if value is None:       # get
1059
1118
            return dbus.Boolean(self.checker is not None)
1060
1119
        if value:
1062
1121
        else:
1063
1122
            self.stop_checker()
1064
1123
    
1065
 
    # object_path - property
 
1124
    # ObjectPath - property
1066
1125
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1067
 
    def object_path_dbus_property(self):
 
1126
    def ObjectPath_dbus_property(self):
1068
1127
        return self.dbus_object_path # is already a dbus.ObjectPath
1069
1128
    
1070
 
    # secret = property
 
1129
    # Secret = property
1071
1130
    @dbus_service_property(_interface, signature=u"ay",
1072
1131
                           access=u"write", byte_arrays=True)
1073
 
    def secret_dbus_property(self, value):
 
1132
    def Secret_dbus_property(self, value):
1074
1133
        self.secret = str(value)
1075
1134
    
1076
1135
    del _interface
1174
1233
                except KeyError:
1175
1234
                    return
1176
1235
                
1177
 
                if client.approved_delay:
1178
 
                    delay = client.approved_delay
 
1236
                if client.approval_delay:
 
1237
                    delay = client.approval_delay
1179
1238
                    client.approvals_pending += 1
1180
1239
                    approval_required = True
1181
1240
                
1188
1247
                            client.Rejected("Disabled")                    
1189
1248
                        return
1190
1249
                    
1191
 
                    if client._approved or not client.approved_delay:
 
1250
                    if client._approved or not client.approval_delay:
1192
1251
                        #We are approved or approval is disabled
1193
1252
                        break
1194
1253
                    elif client._approved is None:
1195
 
                        logger.info(u"Client %s need approval",
 
1254
                        logger.info(u"Client %s needs approval",
1196
1255
                                    client.name)
1197
1256
                        if self.server.use_dbus:
1198
1257
                            # Emit D-Bus signal
1199
1258
                            client.NeedApproval(
1200
 
                                client.approved_delay_milliseconds(),
 
1259
                                client.approval_delay_milliseconds(),
1201
1260
                                client.approved_by_default)
1202
1261
                    else:
1203
1262
                        logger.warning(u"Client %s was not approved",
1204
1263
                                       client.name)
1205
1264
                        if self.server.use_dbus:
1206
1265
                            # Emit D-Bus signal
1207
 
                            client.Rejected("Disapproved")
 
1266
                            client.Rejected("Denied")
1208
1267
                        return
1209
1268
                    
1210
1269
                    #wait until timeout or approved
1221
1280
                                           client.name)
1222
1281
                            if self.server.use_dbus:
1223
1282
                                # Emit D-Bus signal
1224
 
                                client.Rejected("Time out")
 
1283
                                client.Rejected("Approval timed out")
1225
1284
                            return
1226
1285
                        else:
1227
1286
                            break
1253
1312
                try:
1254
1313
                    session.bye()
1255
1314
                except (gnutls.errors.GNUTLSError), error:
1256
 
                    logger.warning("gnutls bye failed")
 
1315
                    logger.warning("GnuTLS bye failed")
1257
1316
    
1258
1317
    @staticmethod
1259
1318
    def peer_certificate(session):
1465
1524
                                       for cond, name in
1466
1525
                                       condition_names.iteritems()
1467
1526
                                       if cond & condition)
1468
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1469
 
                     conditions_string)
1470
 
 
1471
1527
        # error or the other end of multiprocessing.Pipe has closed
1472
1528
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1473
1529
            return False
1474
1530
        
1475
1531
        # Read a request from the child
1476
1532
        request = parent_pipe.recv()
1477
 
        logger.debug(u"IPC request: %s", repr(request))
1478
1533
        command = request[0]
1479
1534
        
1480
1535
        if command == 'init':
1490
1545
                               u"dress: %s", fpr, address)
1491
1546
                if self.use_dbus:
1492
1547
                    # Emit D-Bus signal
1493
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1548
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1494
1549
                parent_pipe.send(False)
1495
1550
                return False
1496
1551
            
1629
1684
    parser.add_option("--debug", action=u"store_true",
1630
1685
                      help=u"Debug mode; run in foreground and log to"
1631
1686
                      u" terminal")
1632
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1687
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1633
1688
                      help=u"Debug level for stdout output")
1634
1689
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1635
1690
                      u" priority string (see GnuTLS documentation)")
1714
1769
                        u"interval": u"5m",
1715
1770
                        u"checker": u"fping -q -- %%(host)s",
1716
1771
                        u"host": u"",
1717
 
                        u"approved_delay": u"0s",
1718
 
                        u"approved_duration": u"1s",
 
1772
                        u"approval_delay": u"0s",
 
1773
                        u"approval_duration": u"1s",
1719
1774
                        }
1720
1775
    client_config = configparser.SafeConfigParser(client_defaults)
1721
1776
    client_config.read(os.path.join(server_settings[u"configdir"],
1727
1782
    tcp_server = MandosServer((server_settings[u"address"],
1728
1783
                               server_settings[u"port"]),
1729
1784
                              ClientHandler,
1730
 
                              interface=server_settings[u"interface"],
 
1785
                              interface=(server_settings[u"interface"]
 
1786
                                         or None),
1731
1787
                              use_ipv6=use_ipv6,
1732
1788
                              gnutls_priority=
1733
1789
                              server_settings[u"priority"],
1734
1790
                              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)
 
1791
    if not debug:
 
1792
        pidfilename = u"/var/run/mandos.pid"
 
1793
        try:
 
1794
            pidfile = open(pidfilename, u"w")
 
1795
        except IOError:
 
1796
            logger.error(u"Could not open file %r", pidfilename)
1740
1797
    
1741
1798
    try:
1742
1799
        uid = pwd.getpwnam(u"_mandos").pw_uid
1759
1816
        if error[0] != errno.EPERM:
1760
1817
            raise error
1761
1818
    
1762
 
    # Enable all possible GnuTLS debugging
1763
 
 
1764
 
 
1765
1819
    if not debug and not debuglevel:
1766
1820
        syslogger.setLevel(logging.WARNING)
1767
1821
        console.setLevel(logging.WARNING)
1771
1825
        console.setLevel(level)
1772
1826
 
1773
1827
    if debug:
 
1828
        # Enable all possible GnuTLS debugging
 
1829
        
1774
1830
        # "Use a log level over 10 to enable all debugging options."
1775
1831
        # - GnuTLS manual
1776
1832
        gnutls.library.functions.gnutls_global_set_log_level(11)
1781
1837
        
1782
1838
        (gnutls.library.functions
1783
1839
         .gnutls_global_set_log_function(debug_gnutls))
1784
 
 
 
1840
        
1785
1841
        # Redirect stdin so all checkers get /dev/null
1786
1842
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1787
1843
        os.dup2(null, sys.stdin.fileno())
1790
1846
    else:
1791
1847
        # No console logging
1792
1848
        logger.removeHandler(console)
1793
 
 
 
1849
    
1794
1850
    
1795
1851
    global main_loop
1796
1852
    # From the Avahi example code
1845
1901
    if not tcp_server.clients:
1846
1902
        logger.warning(u"No clients defined")
1847
1903
        
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
1904
    if not debug:
 
1905
        try:
 
1906
            with pidfile:
 
1907
                pid = os.getpid()
 
1908
                pidfile.write(str(pid) + "\n")
 
1909
            del pidfile
 
1910
        except IOError:
 
1911
            logger.error(u"Could not write to file %r with PID %d",
 
1912
                         pidfilename, pid)
 
1913
        except NameError:
 
1914
            # "pidfile" was never created
 
1915
            pass
 
1916
        del pidfilename
 
1917
        
1862
1918
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1919
 
1863
1920
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1864
1921
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1865
1922