/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Do not write pid file if --debug is passed.
* mandos.xml (FILES): Pid file only records pid of latest server.

Show diffs side-by-side

added added

removed removed

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