/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
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
80
81
        SO_BINDTODEVICE = None
81
82
 
82
83
 
83
 
version = "1.0.14"
 
84
version = "1.2.1"
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
 
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()
237
260
    fingerprint: string (40 or 32 hexadecimal digits); used to
238
261
                 uniquely identify the client
239
 
    secret:     bytestring; sent verbatim (over TLS) to client
240
262
    host:       string; available for use by the checker command
241
 
    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
242
266
    last_enabled: datetime.datetime(); (UTC)
243
 
    enabled:    bool()
244
 
    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
245
270
    timeout:    datetime.timedelta(); How long from last_checked_ok
246
271
                                      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)
249
 
    checker:    subprocess.Popen(); a running checker process used
250
 
                                    to see if the client lives.
251
 
                                    'None' if no process is running.
252
 
    checker_initiator_tag: a gobject event source tag, or None
253
 
    disable_initiator_tag: - '' -
254
 
    checker_callback_tag:  - '' -
255
 
    checker_command: string; External command which is run to check if
256
 
                     client lives.  %() expansions are done at
257
 
                     runtime with vars(self) as dict, so that for
258
 
                     instance %(name)s can be used in the command.
259
 
    current_checker_command: string; current running checker_command
 
272
    runtime_expansions: Allowed attributes for runtime expansion.
260
273
    """
261
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
    
262
280
    @staticmethod
263
281
    def _timedelta_to_milliseconds(td):
264
282
        "Convert a datetime.timedelta() to milliseconds"
273
291
    def interval_milliseconds(self):
274
292
        "Return the 'interval' attribute in milliseconds"
275
293
        return self._timedelta_to_milliseconds(self.interval)
 
294
 
 
295
    def approval_delay_milliseconds(self):
 
296
        return self._timedelta_to_milliseconds(self.approval_delay)
276
297
    
277
298
    def __init__(self, name = None, disable_hook=None, config=None):
278
299
        """Note: the 'checker' key in 'config' sets the
301
322
        self.host = config.get(u"host", u"")
302
323
        self.created = datetime.datetime.utcnow()
303
324
        self.enabled = False
 
325
        self.last_approval_request = None
304
326
        self.last_enabled = None
305
327
        self.last_checked_ok = None
306
328
        self.timeout = string_to_delta(config[u"timeout"])
313
335
        self.checker_command = config[u"checker"]
314
336
        self.current_checker_command = None
315
337
        self.last_connect = None
 
338
        self._approved = None
 
339
        self.approved_by_default = config.get(u"approved_by_default",
 
340
                                              True)
 
341
        self.approvals_pending = 0
 
342
        self.approval_delay = string_to_delta(
 
343
            config[u"approval_delay"])
 
344
        self.approval_duration = string_to_delta(
 
345
            config[u"approval_duration"])
 
346
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
316
347
    
 
348
    def send_changedstate(self):
 
349
        self.changedstate.acquire()
 
350
        self.changedstate.notify_all()
 
351
        self.changedstate.release()
 
352
        
317
353
    def enable(self):
318
354
        """Start this client's checker and timeout hooks"""
319
355
        if getattr(self, u"enabled", False):
320
356
            # Already enabled
321
357
            return
 
358
        self.send_changedstate()
322
359
        self.last_enabled = datetime.datetime.utcnow()
323
360
        # Schedule a new checker to be started an 'interval' from now,
324
361
        # and every interval from then on.
338
375
        if not getattr(self, "enabled", False):
339
376
            return False
340
377
        if not quiet:
 
378
            self.send_changedstate()
 
379
        if not quiet:
341
380
            logger.info(u"Disabling client %s", self.name)
342
381
        if getattr(self, u"disable_initiator_tag", False):
343
382
            gobject.source_remove(self.disable_initiator_tag)
385
424
                                      (self.timeout_milliseconds(),
386
425
                                       self.disable))
387
426
    
 
427
    def need_approval(self):
 
428
        self.last_approval_request = datetime.datetime.utcnow()
 
429
    
388
430
    def start_checker(self):
389
431
        """Start a new checker subprocess if one is not running.
390
432
        
419
461
                command = self.checker_command % self.host
420
462
            except TypeError:
421
463
                # 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())
 
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
 
428
472
                try:
429
473
                    command = self.checker_command % escaped_attrs
430
474
                except TypeError, error:
476
520
                raise
477
521
        self.checker = None
478
522
 
479
 
 
480
523
def dbus_service_property(dbus_interface, signature=u"v",
481
524
                          access=u"readwrite", byte_arrays=False):
482
525
    """Decorators for marking methods of a DBusObjectWithProperties to
673
716
    dbus_object_path: dbus.ObjectPath
674
717
    bus: dbus.SystemBus()
675
718
    """
 
719
    
 
720
    runtime_expansions = (Client.runtime_expansions
 
721
                          + (u"dbus_object_path",))
 
722
    
676
723
    # dbus.service.Object doesn't use super(), so we can't either.
677
724
    
678
725
    def __init__(self, bus = None, *args, **kwargs):
 
726
        self._approvals_pending = 0
679
727
        self.bus = bus
680
728
        Client.__init__(self, *args, **kwargs)
681
729
        # Only now, when this client is initialized, can it show up on
682
730
        # the D-Bus
 
731
        client_object_name = unicode(self.name).translate(
 
732
            {ord(u"."): ord(u"_"),
 
733
             ord(u"-"): ord(u"_")})
683
734
        self.dbus_object_path = (dbus.ObjectPath
684
 
                                 (u"/clients/"
685
 
                                  + self.name.replace(u".", u"_")))
 
735
                                 (u"/clients/" + client_object_name))
686
736
        DBusObjectWithProperties.__init__(self, self.bus,
687
737
                                          self.dbus_object_path)
 
738
        
 
739
    def _get_approvals_pending(self):
 
740
        return self._approvals_pending
 
741
    def _set_approvals_pending(self, value):
 
742
        old_value = self._approvals_pending
 
743
        self._approvals_pending = value
 
744
        bval = bool(value)
 
745
        if (hasattr(self, "dbus_object_path")
 
746
            and bval is not bool(old_value)):
 
747
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
748
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
749
                                 dbus_bool)
 
750
 
 
751
    approvals_pending = property(_get_approvals_pending,
 
752
                                 _set_approvals_pending)
 
753
    del _get_approvals_pending, _set_approvals_pending
688
754
    
689
755
    @staticmethod
690
756
    def _datetime_to_dbus(dt, variant_level=0):
697
763
        r = Client.enable(self)
698
764
        if oldstate != self.enabled:
699
765
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
766
            self.PropertyChanged(dbus.String(u"Enabled"),
701
767
                                 dbus.Boolean(True, variant_level=1))
702
768
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
 
769
                dbus.String(u"LastEnabled"),
704
770
                self._datetime_to_dbus(self.last_enabled,
705
771
                                       variant_level=1))
706
772
        return r
710
776
        r = Client.disable(self, quiet=quiet)
711
777
        if not quiet and oldstate != self.enabled:
712
778
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
779
            self.PropertyChanged(dbus.String(u"Enabled"),
714
780
                                 dbus.Boolean(False, variant_level=1))
715
781
        return r
716
782
    
728
794
        self.checker_callback_tag = None
729
795
        self.checker = None
730
796
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
797
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
732
798
                             dbus.Boolean(False, variant_level=1))
733
799
        if os.WIFEXITED(condition):
734
800
            exitstatus = os.WEXITSTATUS(condition)
749
815
        r = Client.checked_ok(self, *args, **kwargs)
750
816
        # Emit D-Bus signal
751
817
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
 
818
            dbus.String(u"LastCheckedOK"),
753
819
            (self._datetime_to_dbus(self.last_checked_ok,
754
820
                                    variant_level=1)))
755
821
        return r
756
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
    
757
832
    def start_checker(self, *args, **kwargs):
758
833
        old_checker = self.checker
759
834
        if self.checker is not None:
767
842
            # Emit D-Bus signal
768
843
            self.CheckerStarted(self.current_checker_command)
769
844
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
 
845
                dbus.String(u"CheckerRunning"),
771
846
                dbus.Boolean(True, variant_level=1))
772
847
        return r
773
848
    
776
851
        r = Client.stop_checker(self, *args, **kwargs)
777
852
        if (old_checker is not None
778
853
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
854
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
780
855
                                 dbus.Boolean(False, variant_level=1))
781
856
        return r
782
 
    
783
 
    ## D-Bus methods & signals
 
857
 
 
858
    def _reset_approved(self):
 
859
        self._approved = None
 
860
        return False
 
861
    
 
862
    def approve(self, value=True):
 
863
        self.send_changedstate()
 
864
        self._approved = value
 
865
        gobject.timeout_add(self._timedelta_to_milliseconds
 
866
                            (self.approval_duration),
 
867
                            self._reset_approved)
 
868
    
 
869
    
 
870
    ## D-Bus methods, signals & properties
784
871
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
872
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
873
    ## Signals
790
874
    
791
875
    # CheckerCompleted - signal
792
876
    @dbus.service.signal(_interface, signature=u"nxs")
809
893
    # GotSecret - signal
810
894
    @dbus.service.signal(_interface)
811
895
    def GotSecret(self):
812
 
        "D-Bus signal"
 
896
        """D-Bus signal
 
897
        Is sent after a successful transfer of secret from the Mandos
 
898
        server to mandos-client
 
899
        """
813
900
        pass
814
901
    
815
902
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
 
903
    @dbus.service.signal(_interface, signature=u"s")
 
904
    def Rejected(self, reason):
818
905
        "D-Bus signal"
819
906
        pass
820
907
    
 
908
    # NeedApproval - signal
 
909
    @dbus.service.signal(_interface, signature=u"tb")
 
910
    def NeedApproval(self, timeout, default):
 
911
        "D-Bus signal"
 
912
        return self.need_approval()
 
913
    
 
914
    ## Methods
 
915
    
 
916
    # Approve - method
 
917
    @dbus.service.method(_interface, in_signature=u"b")
 
918
    def Approve(self, value):
 
919
        self.approve(value)
 
920
    
 
921
    # CheckedOK - method
 
922
    @dbus.service.method(_interface)
 
923
    def CheckedOK(self):
 
924
        return self.checked_ok()
 
925
    
821
926
    # Enable - method
822
927
    @dbus.service.method(_interface)
823
928
    def Enable(self):
841
946
    def StopChecker(self):
842
947
        self.stop_checker()
843
948
    
844
 
    # name - property
 
949
    ## Properties
 
950
    
 
951
    # ApprovalPending - property
 
952
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
953
    def ApprovalPending_dbus_property(self):
 
954
        return dbus.Boolean(bool(self.approvals_pending))
 
955
    
 
956
    # ApprovedByDefault - property
 
957
    @dbus_service_property(_interface, signature=u"b",
 
958
                           access=u"readwrite")
 
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
845
991
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
992
    def Name_dbus_property(self):
847
993
        return dbus.String(self.name)
848
994
    
849
 
    # fingerprint - property
 
995
    # Fingerprint - property
850
996
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
997
    def Fingerprint_dbus_property(self):
852
998
        return dbus.String(self.fingerprint)
853
999
    
854
 
    # host - property
 
1000
    # Host - property
855
1001
    @dbus_service_property(_interface, signature=u"s",
856
1002
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
1003
    def Host_dbus_property(self, value=None):
858
1004
        if value is None:       # get
859
1005
            return dbus.String(self.host)
860
1006
        self.host = value
861
1007
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
 
1008
        self.PropertyChanged(dbus.String(u"Host"),
863
1009
                             dbus.String(value, variant_level=1))
864
1010
    
865
 
    # created - property
 
1011
    # Created - property
866
1012
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
 
1013
    def Created_dbus_property(self):
868
1014
        return dbus.String(self._datetime_to_dbus(self.created))
869
1015
    
870
 
    # last_enabled - property
 
1016
    # LastEnabled - property
871
1017
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
 
1018
    def LastEnabled_dbus_property(self):
873
1019
        if self.last_enabled is None:
874
1020
            return dbus.String(u"")
875
1021
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
1022
    
877
 
    # enabled - property
 
1023
    # Enabled - property
878
1024
    @dbus_service_property(_interface, signature=u"b",
879
1025
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
1026
    def Enabled_dbus_property(self, value=None):
881
1027
        if value is None:       # get
882
1028
            return dbus.Boolean(self.enabled)
883
1029
        if value:
885
1031
        else:
886
1032
            self.disable()
887
1033
    
888
 
    # last_checked_ok - property
 
1034
    # LastCheckedOK - property
889
1035
    @dbus_service_property(_interface, signature=u"s",
890
1036
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1037
    def LastCheckedOK_dbus_property(self, value=None):
892
1038
        if value is not None:
893
1039
            self.checked_ok()
894
1040
            return
897
1043
        return dbus.String(self._datetime_to_dbus(self
898
1044
                                                  .last_checked_ok))
899
1045
    
900
 
    # 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
901
1056
    @dbus_service_property(_interface, signature=u"t",
902
1057
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1058
    def Timeout_dbus_property(self, value=None):
904
1059
        if value is None:       # get
905
1060
            return dbus.UInt64(self.timeout_milliseconds())
906
1061
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
1062
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1063
        self.PropertyChanged(dbus.String(u"Timeout"),
909
1064
                             dbus.UInt64(value, variant_level=1))
910
1065
        if getattr(self, u"disable_initiator_tag", None) is None:
911
1066
            return
925
1080
            self.disable_initiator_tag = (gobject.timeout_add
926
1081
                                          (time_to_die, self.disable))
927
1082
    
928
 
    # interval - property
 
1083
    # Interval - property
929
1084
    @dbus_service_property(_interface, signature=u"t",
930
1085
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1086
    def Interval_dbus_property(self, value=None):
932
1087
        if value is None:       # get
933
1088
            return dbus.UInt64(self.interval_milliseconds())
934
1089
        self.interval = datetime.timedelta(0, 0, 0, value)
935
1090
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1091
        self.PropertyChanged(dbus.String(u"Interval"),
937
1092
                             dbus.UInt64(value, variant_level=1))
938
1093
        if getattr(self, u"checker_initiator_tag", None) is None:
939
1094
            return
943
1098
                                      (value, self.start_checker))
944
1099
        self.start_checker()    # Start one now, too
945
1100
 
946
 
    # checker - property
 
1101
    # Checker - property
947
1102
    @dbus_service_property(_interface, signature=u"s",
948
1103
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1104
    def Checker_dbus_property(self, value=None):
950
1105
        if value is None:       # get
951
1106
            return dbus.String(self.checker_command)
952
1107
        self.checker_command = value
953
1108
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1109
        self.PropertyChanged(dbus.String(u"Checker"),
955
1110
                             dbus.String(self.checker_command,
956
1111
                                         variant_level=1))
957
1112
    
958
 
    # checker_running - property
 
1113
    # CheckerRunning - property
959
1114
    @dbus_service_property(_interface, signature=u"b",
960
1115
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1116
    def CheckerRunning_dbus_property(self, value=None):
962
1117
        if value is None:       # get
963
1118
            return dbus.Boolean(self.checker is not None)
964
1119
        if value:
966
1121
        else:
967
1122
            self.stop_checker()
968
1123
    
969
 
    # object_path - property
 
1124
    # ObjectPath - property
970
1125
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1126
    def ObjectPath_dbus_property(self):
972
1127
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1128
    
974
 
    # secret = property
 
1129
    # Secret = property
975
1130
    @dbus_service_property(_interface, signature=u"ay",
976
1131
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1132
    def Secret_dbus_property(self, value):
978
1133
        self.secret = str(value)
979
1134
    
980
1135
    del _interface
981
1136
 
982
1137
 
 
1138
class ProxyClient(object):
 
1139
    def __init__(self, child_pipe, fpr, address):
 
1140
        self._pipe = child_pipe
 
1141
        self._pipe.send(('init', fpr, address))
 
1142
        if not self._pipe.recv():
 
1143
            raise KeyError()
 
1144
 
 
1145
    def __getattribute__(self, name):
 
1146
        if(name == '_pipe'):
 
1147
            return super(ProxyClient, self).__getattribute__(name)
 
1148
        self._pipe.send(('getattr', name))
 
1149
        data = self._pipe.recv()
 
1150
        if data[0] == 'data':
 
1151
            return data[1]
 
1152
        if data[0] == 'function':
 
1153
            def func(*args, **kwargs):
 
1154
                self._pipe.send(('funcall', name, args, kwargs))
 
1155
                return self._pipe.recv()[1]
 
1156
            return func
 
1157
 
 
1158
    def __setattr__(self, name, value):
 
1159
        if(name == '_pipe'):
 
1160
            return super(ProxyClient, self).__setattr__(name, value)
 
1161
        self._pipe.send(('setattr', name, value))
 
1162
 
 
1163
 
983
1164
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1165
    """A class to handle client connections.
985
1166
    
987
1168
    Note: This will run in its own forked process."""
988
1169
    
989
1170
    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):
 
1171
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1172
            logger.info(u"TCP connection from: %s",
 
1173
                        unicode(self.client_address))
 
1174
            logger.debug(u"Pipe FD: %d",
 
1175
                         self.server.child_pipe.fileno())
 
1176
 
999
1177
            session = (gnutls.connection
1000
1178
                       .ClientSession(self.request,
1001
1179
                                      gnutls.connection
1002
1180
                                      .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
 
            
 
1181
 
1013
1182
            # Note: gnutls.connection.X509Credentials is really a
1014
1183
            # generic GnuTLS certificate credentials object so long as
1015
1184
            # no X.509 keys are added to it.  Therefore, we can use it
1016
1185
            # here despite using OpenPGP certificates.
1017
 
            
 
1186
 
1018
1187
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1019
1188
            #                      u"+AES-256-CBC", u"+SHA1",
1020
1189
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1026
1195
            (gnutls.library.functions
1027
1196
             .gnutls_priority_set_direct(session._c_object,
1028
1197
                                         priority, None))
1029
 
            
 
1198
 
 
1199
            # Start communication using the Mandos protocol
 
1200
            # Get protocol number
 
1201
            line = self.request.makefile().readline()
 
1202
            logger.debug(u"Protocol version: %r", line)
 
1203
            try:
 
1204
                if int(line.strip().split()[0]) > 1:
 
1205
                    raise RuntimeError
 
1206
            except (ValueError, IndexError, RuntimeError), error:
 
1207
                logger.error(u"Unknown protocol version: %s", error)
 
1208
                return
 
1209
 
 
1210
            # Start GnuTLS connection
1030
1211
            try:
1031
1212
                session.handshake()
1032
1213
            except gnutls.errors.GNUTLSError, error:
1035
1216
                # established.  Just abandon the request.
1036
1217
                return
1037
1218
            logger.debug(u"Handshake succeeded")
 
1219
 
 
1220
            approval_required = False
1038
1221
            try:
1039
1222
                try:
1040
1223
                    fpr = self.fingerprint(self.peer_certificate
1044
1227
                    return
1045
1228
                logger.debug(u"Fingerprint: %s", fpr)
1046
1229
 
1047
 
                for c in self.server.clients:
1048
 
                    if c.fingerprint == fpr:
1049
 
                        client = c
 
1230
                try:
 
1231
                    client = ProxyClient(child_pipe, fpr,
 
1232
                                         self.client_address)
 
1233
                except KeyError:
 
1234
                    return
 
1235
                
 
1236
                if client.approval_delay:
 
1237
                    delay = client.approval_delay
 
1238
                    client.approvals_pending += 1
 
1239
                    approval_required = True
 
1240
                
 
1241
                while True:
 
1242
                    if not client.enabled:
 
1243
                        logger.warning(u"Client %s is disabled",
 
1244
                                       client.name)
 
1245
                        if self.server.use_dbus:
 
1246
                            # Emit D-Bus signal
 
1247
                            client.Rejected("Disabled")                    
 
1248
                        return
 
1249
                    
 
1250
                    if client._approved or not client.approval_delay:
 
1251
                        #We are approved or approval is disabled
1050
1252
                        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)
 
1253
                    elif client._approved is None:
 
1254
                        logger.info(u"Client %s needs approval",
 
1255
                                    client.name)
 
1256
                        if self.server.use_dbus:
 
1257
                            # Emit D-Bus signal
 
1258
                            client.NeedApproval(
 
1259
                                client.approval_delay_milliseconds(),
 
1260
                                client.approved_by_default)
 
1261
                    else:
 
1262
                        logger.warning(u"Client %s was not approved",
 
1263
                                       client.name)
 
1264
                        if self.server.use_dbus:
 
1265
                            # Emit D-Bus signal
 
1266
                            client.Rejected("Denied")
 
1267
                        return
 
1268
                    
 
1269
                    #wait until timeout or approved
 
1270
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1271
                    time = datetime.datetime.now()
 
1272
                    client.changedstate.acquire()
 
1273
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1274
                    client.changedstate.release()
 
1275
                    time2 = datetime.datetime.now()
 
1276
                    if (time2 - time) >= delay:
 
1277
                        if not client.approved_by_default:
 
1278
                            logger.warning("Client %s timed out while"
 
1279
                                           " waiting for approval",
 
1280
                                           client.name)
 
1281
                            if self.server.use_dbus:
 
1282
                                # Emit D-Bus signal
 
1283
                                client.Rejected("Approval timed out")
 
1284
                            return
 
1285
                        else:
 
1286
                            break
 
1287
                    else:
 
1288
                        delay -= time2 - time
 
1289
                
1064
1290
                sent_size = 0
1065
1291
                while sent_size < len(client.secret):
1066
 
                    sent = session.send(client.secret[sent_size:])
 
1292
                    try:
 
1293
                        sent = session.send(client.secret[sent_size:])
 
1294
                    except (gnutls.errors.GNUTLSError), error:
 
1295
                        logger.warning("gnutls send failed")
 
1296
                        return
1067
1297
                    logger.debug(u"Sent: %d, remaining: %d",
1068
1298
                                 sent, len(client.secret)
1069
1299
                                 - (sent_size + sent))
1070
1300
                    sent_size += sent
 
1301
 
 
1302
                logger.info(u"Sending secret to %s", client.name)
 
1303
                # bump the timeout as if seen
 
1304
                client.checked_ok()
 
1305
                if self.server.use_dbus:
 
1306
                    # Emit D-Bus signal
 
1307
                    client.GotSecret()
 
1308
            
1071
1309
            finally:
1072
 
                session.bye()
 
1310
                if approval_required:
 
1311
                    client.approvals_pending -= 1
 
1312
                try:
 
1313
                    session.bye()
 
1314
                except (gnutls.errors.GNUTLSError), error:
 
1315
                    logger.warning("GnuTLS bye failed")
1073
1316
    
1074
1317
    @staticmethod
1075
1318
    def peer_certificate(session):
1135
1378
        return hex_fpr
1136
1379
 
1137
1380
 
1138
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1139
 
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
1381
class MultiprocessingMixIn(object):
 
1382
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1383
    def sub_process_main(self, request, address):
 
1384
        try:
 
1385
            self.finish_request(request, address)
 
1386
        except:
 
1387
            self.handle_error(request, address)
 
1388
        self.close_request(request)
 
1389
            
 
1390
    def process_request(self, request, address):
 
1391
        """Start a new process to process the request."""
 
1392
        multiprocessing.Process(target = self.sub_process_main,
 
1393
                                args = (request, address)).start()
 
1394
 
 
1395
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1396
    """ adds a pipe to the MixIn """
1140
1397
    def process_request(self, request, client_address):
1141
1398
        """Overrides and wraps the original process_request().
1142
1399
        
1143
1400
        This function creates a new pipe in self.pipe
1144
1401
        """
1145
 
        self.child_pipe = os.pipe() # Child writes here
1146
 
        self.parent_pipe = os.pipe() # Parent writes here
1147
 
        super(ForkingMixInWithPipes,
 
1402
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1403
 
 
1404
        super(MultiprocessingMixInWithPipe,
1148
1405
              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):
 
1406
        self.child_pipe.close()
 
1407
        self.add_pipe(parent_pipe)
 
1408
 
 
1409
    def add_pipe(self, parent_pipe):
1154
1410
        """Dummy function; override as necessary"""
1155
 
        os.close(child_pipe_fd)
1156
 
        os.close(parent_pipe_fd)
1157
 
 
1158
 
 
1159
 
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1411
        pass
 
1412
 
 
1413
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1160
1414
                     socketserver.TCPServer, object):
1161
1415
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1162
1416
    
1247
1501
            return socketserver.TCPServer.server_activate(self)
1248
1502
    def enable(self):
1249
1503
        self.enabled = True
1250
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1504
    def add_pipe(self, parent_pipe):
1251
1505
        # Call "handle_ipc" for both data and EOF events
1252
 
        gobject.io_add_watch(child_pipe_fd,
 
1506
        gobject.io_add_watch(parent_pipe.fileno(),
1253
1507
                             gobject.IO_IN | gobject.IO_HUP,
1254
1508
                             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={}):
 
1509
                                               parent_pipe = parent_pipe))
 
1510
        
 
1511
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1512
                   client_object=None):
1259
1513
        condition_names = {
1260
1514
            gobject.IO_IN: u"IN",   # There is data to read.
1261
1515
            gobject.IO_OUT: u"OUT", # Data can be written (without
1270
1524
                                       for cond, name in
1271
1525
                                       condition_names.iteritems()
1272
1526
                                       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
 
1527
        # error or the other end of multiprocessing.Pipe has closed
 
1528
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1529
            return False
 
1530
        
 
1531
        # Read a request from the child
 
1532
        request = parent_pipe.recv()
 
1533
        command = request[0]
 
1534
        
 
1535
        if command == 'init':
 
1536
            fpr = request[1]
 
1537
            address = request[2]
 
1538
            
 
1539
            for c in self.clients:
 
1540
                if c.fingerprint == fpr:
 
1541
                    client = c
 
1542
                    break
 
1543
            else:
 
1544
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1545
                               u"dress: %s", fpr, address)
 
1546
                if self.use_dbus:
 
1547
                    # Emit D-Bus signal
 
1548
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1549
                parent_pipe.send(False)
 
1550
                return False
 
1551
            
 
1552
            gobject.io_add_watch(parent_pipe.fileno(),
 
1553
                                 gobject.IO_IN | gobject.IO_HUP,
 
1554
                                 functools.partial(self.handle_ipc,
 
1555
                                                   parent_pipe = parent_pipe,
 
1556
                                                   client_object = client))
 
1557
            parent_pipe.send(True)
 
1558
            # remove the old hook in favor of the new above hook on same fileno
 
1559
            return False
 
1560
        if command == 'funcall':
 
1561
            funcname = request[1]
 
1562
            args = request[2]
 
1563
            kwargs = request[3]
 
1564
            
 
1565
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1566
 
 
1567
        if command == 'getattr':
 
1568
            attrname = request[1]
 
1569
            if callable(client_object.__getattribute__(attrname)):
 
1570
                parent_pipe.send(('function',))
 
1571
            else:
 
1572
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1573
        
 
1574
        if command == 'setattr':
 
1575
            attrname = request[1]
 
1576
            value = request[2]
 
1577
            setattr(client_object, attrname, value)
 
1578
 
1345
1579
        return True
1346
1580
 
1347
1581
 
1450
1684
    parser.add_option("--debug", action=u"store_true",
1451
1685
                      help=u"Debug mode; run in foreground and log to"
1452
1686
                      u" terminal")
 
1687
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
 
1688
                      help=u"Debug level for stdout output")
1453
1689
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1454
1690
                      u" priority string (see GnuTLS documentation)")
1455
1691
    parser.add_option("--servicename", type=u"string",
1480
1716
                        u"servicename": u"Mandos",
1481
1717
                        u"use_dbus": u"True",
1482
1718
                        u"use_ipv6": u"True",
 
1719
                        u"debuglevel": u"",
1483
1720
                        }
1484
1721
    
1485
1722
    # Parse config file for server-global settings
1502
1739
    # options, if set.
1503
1740
    for option in (u"interface", u"address", u"port", u"debug",
1504
1741
                   u"priority", u"servicename", u"configdir",
1505
 
                   u"use_dbus", u"use_ipv6"):
 
1742
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1506
1743
        value = getattr(options, option)
1507
1744
        if value is not None:
1508
1745
            server_settings[option] = value
1517
1754
    
1518
1755
    # For convenience
1519
1756
    debug = server_settings[u"debug"]
 
1757
    debuglevel = server_settings[u"debuglevel"]
1520
1758
    use_dbus = server_settings[u"use_dbus"]
1521
1759
    use_ipv6 = server_settings[u"use_ipv6"]
1522
 
    
1523
 
    if not debug:
1524
 
        syslogger.setLevel(logging.WARNING)
1525
 
        console.setLevel(logging.WARNING)
1526
 
    
 
1760
 
1527
1761
    if server_settings[u"servicename"] != u"Mandos":
1528
1762
        syslogger.setFormatter(logging.Formatter
1529
1763
                               (u'Mandos (%s) [%%(process)d]:'
1535
1769
                        u"interval": u"5m",
1536
1770
                        u"checker": u"fping -q -- %%(host)s",
1537
1771
                        u"host": u"",
 
1772
                        u"approval_delay": u"0s",
 
1773
                        u"approval_duration": u"1s",
1538
1774
                        }
1539
1775
    client_config = configparser.SafeConfigParser(client_defaults)
1540
1776
    client_config.read(os.path.join(server_settings[u"configdir"],
1546
1782
    tcp_server = MandosServer((server_settings[u"address"],
1547
1783
                               server_settings[u"port"]),
1548
1784
                              ClientHandler,
1549
 
                              interface=server_settings[u"interface"],
 
1785
                              interface=(server_settings[u"interface"]
 
1786
                                         or None),
1550
1787
                              use_ipv6=use_ipv6,
1551
1788
                              gnutls_priority=
1552
1789
                              server_settings[u"priority"],
1553
1790
                              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)
 
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)
1559
1797
    
1560
1798
    try:
1561
1799
        uid = pwd.getpwnam(u"_mandos").pw_uid
1578
1816
        if error[0] != errno.EPERM:
1579
1817
            raise error
1580
1818
    
1581
 
    # Enable all possible GnuTLS debugging
 
1819
    if not debug and not debuglevel:
 
1820
        syslogger.setLevel(logging.WARNING)
 
1821
        console.setLevel(logging.WARNING)
 
1822
    if debuglevel:
 
1823
        level = getattr(logging, debuglevel.upper())
 
1824
        syslogger.setLevel(level)
 
1825
        console.setLevel(level)
 
1826
 
1582
1827
    if debug:
 
1828
        # Enable all possible GnuTLS debugging
 
1829
        
1583
1830
        # "Use a log level over 10 to enable all debugging options."
1584
1831
        # - GnuTLS manual
1585
1832
        gnutls.library.functions.gnutls_global_set_log_level(11)
1590
1837
        
1591
1838
        (gnutls.library.functions
1592
1839
         .gnutls_global_set_log_function(debug_gnutls))
 
1840
        
 
1841
        # Redirect stdin so all checkers get /dev/null
 
1842
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1843
        os.dup2(null, sys.stdin.fileno())
 
1844
        if null > 2:
 
1845
            os.close(null)
 
1846
    else:
 
1847
        # No console logging
 
1848
        logger.removeHandler(console)
 
1849
    
1593
1850
    
1594
1851
    global main_loop
1595
1852
    # From the Avahi example code
1613
1870
    if server_settings["interface"]:
1614
1871
        service.interface = (if_nametoindex
1615
1872
                             (str(server_settings[u"interface"])))
 
1873
 
 
1874
    if not debug:
 
1875
        # Close all input and output, do double fork, etc.
 
1876
        daemon()
 
1877
        
 
1878
    global multiprocessing_manager
 
1879
    multiprocessing_manager = multiprocessing.Manager()
1616
1880
    
1617
1881
    client_class = Client
1618
1882
    if use_dbus:
1619
1883
        client_class = functools.partial(ClientDBus, bus = bus)
 
1884
    def client_config_items(config, section):
 
1885
        special_settings = {
 
1886
            "approved_by_default":
 
1887
                lambda: config.getboolean(section,
 
1888
                                          "approved_by_default"),
 
1889
            }
 
1890
        for name, value in config.items(section):
 
1891
            try:
 
1892
                yield (name, special_settings[name]())
 
1893
            except KeyError:
 
1894
                yield (name, value)
 
1895
    
1620
1896
    tcp_server.clients.update(set(
1621
1897
            client_class(name = section,
1622
 
                         config= dict(client_config.items(section)))
 
1898
                         config= dict(client_config_items(
 
1899
                        client_config, section)))
1623
1900
            for section in client_config.sections()))
1624
1901
    if not tcp_server.clients:
1625
1902
        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
 
    
 
1903
        
1652
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
        
1653
1918
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1919
 
1654
1920
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1655
1921
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1656
1922