/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

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

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
55
55
import logging
56
56
import logging.handlers
57
57
import pwd
58
 
from contextlib import closing
 
58
import contextlib
59
59
import struct
60
60
import fcntl
61
61
import functools
 
62
import cPickle as pickle
 
63
import multiprocessing
62
64
 
63
65
import dbus
64
66
import dbus.service
81
83
 
82
84
version = "1.0.14"
83
85
 
 
86
#logger = logging.getLogger(u'mandos')
84
87
logger = logging.Logger(u'mandos')
85
88
syslogger = (logging.handlers.SysLogHandler
86
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
154
157
                            u" after %i retries, exiting.",
155
158
                            self.rename_count)
156
159
            raise AvahiServiceError(u"Too many renames")
157
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
158
161
        logger.info(u"Changing Zeroconf service name to %r ...",
159
 
                    unicode(self.name))
 
162
                    self.name)
160
163
        syslogger.setFormatter(logging.Formatter
161
164
                               (u'Mandos (%s) [%%(process)d]:'
162
165
                                u' %%(levelname)s: %%(message)s'
163
166
                                % self.name))
164
167
        self.remove()
165
 
        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)
166
174
        self.rename_count += 1
167
175
    def remove(self):
168
176
        """Derived from the Avahi example code"""
191
199
        self.group.Commit()
192
200
    def entry_group_state_changed(self, state, error):
193
201
        """Derived from the Avahi example code"""
194
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
195
203
        
196
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
205
            logger.debug(u"Zeroconf service established.")
210
218
            self.group = None
211
219
    def server_state_changed(self, state):
212
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
213
222
        if state == avahi.SERVER_COLLISION:
214
223
            logger.error(u"Zeroconf server name collision")
215
224
            self.remove()
231
240
    """A representation of a client host served by this server.
232
241
    
233
242
    Attributes:
234
 
    name:       string; from the config file, used in log messages and
235
 
                        D-Bus identifiers
236
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
237
 
                 uniquely identify the client
238
 
    secret:     bytestring; sent verbatim (over TLS) to client
239
 
    host:       string; available for use by the checker command
240
 
    created:    datetime.datetime(); (UTC) object creation
241
 
    last_enabled: datetime.datetime(); (UTC)
242
 
    enabled:    bool()
243
 
    last_checked_ok: datetime.datetime(); (UTC) or None
244
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
245
 
                                      until this client is invalid
246
 
    interval:   datetime.timedelta(); How often to start a new checker
247
 
    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
248
246
    checker:    subprocess.Popen(); a running checker process used
249
247
                                    to see if the client lives.
250
248
                                    'None' if no process is running.
251
 
    checker_initiator_tag: a gobject event source tag, or None
252
 
    disable_initiator_tag: - '' -
253
249
    checker_callback_tag:  - '' -
254
 
    checker_command: string; External command which is run to check if
255
 
                     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
256
252
                     runtime with vars(self) as dict, so that for
257
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
258
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.
259
272
    """
260
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
    
261
279
    @staticmethod
262
280
    def _timedelta_to_milliseconds(td):
263
281
        "Convert a datetime.timedelta() to milliseconds"
272
290
    def interval_milliseconds(self):
273
291
        "Return the 'interval' attribute in milliseconds"
274
292
        return self._timedelta_to_milliseconds(self.interval)
 
293
 
 
294
    def approval_delay_milliseconds(self):
 
295
        return self._timedelta_to_milliseconds(self.approval_delay)
275
296
    
276
297
    def __init__(self, name = None, disable_hook=None, config=None):
277
298
        """Note: the 'checker' key in 'config' sets the
290
311
        if u"secret" in config:
291
312
            self.secret = config[u"secret"].decode(u"base64")
292
313
        elif u"secfile" in config:
293
 
            with closing(open(os.path.expanduser
294
 
                              (os.path.expandvars
295
 
                               (config[u"secfile"])),
296
 
                              "rb")) as secfile:
 
314
            with open(os.path.expanduser(os.path.expandvars
 
315
                                         (config[u"secfile"])),
 
316
                      "rb") as secfile:
297
317
                self.secret = secfile.read()
298
318
        else:
299
319
            raise TypeError(u"No secret or secfile for client %s"
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.
325
360
        self.checker_initiator_tag = (gobject.timeout_add
326
361
                                      (self.interval_milliseconds(),
327
362
                                       self.start_checker))
328
 
        # Also start a new checker *right now*.
329
 
        self.start_checker()
330
363
        # Schedule a disable() when 'timeout' has passed
331
364
        self.disable_initiator_tag = (gobject.timeout_add
332
365
                                   (self.timeout_milliseconds(),
333
366
                                    self.disable))
334
367
        self.enabled = True
 
368
        # Also start a new checker *right now*.
 
369
        self.start_checker()
335
370
    
336
 
    def disable(self):
 
371
    def disable(self, quiet=True):
337
372
        """Disable this client."""
338
373
        if not getattr(self, "enabled", False):
339
374
            return False
340
 
        logger.info(u"Disabling client %s", self.name)
 
375
        if not quiet:
 
376
            self.send_changedstate()
 
377
        if not quiet:
 
378
            logger.info(u"Disabling client %s", self.name)
341
379
        if getattr(self, u"disable_initiator_tag", False):
342
380
            gobject.source_remove(self.disable_initiator_tag)
343
381
            self.disable_initiator_tag = None
395
433
        # client would inevitably timeout, since no checker would get
396
434
        # a chance to run to completion.  If we instead leave running
397
435
        # checkers alone, the checker would have to take more time
398
 
        # than 'timeout' for the client to be declared invalid, which
399
 
        # is as it should be.
 
436
        # than 'timeout' for the client to be disabled, which is as it
 
437
        # should be.
400
438
        
401
439
        # If a checker exists, make sure it is not a zombie
402
440
        try:
418
456
                command = self.checker_command % self.host
419
457
            except TypeError:
420
458
                # Escape attributes for the shell
421
 
                escaped_attrs = dict((key,
422
 
                                      re.escape(unicode(str(val),
423
 
                                                        errors=
424
 
                                                        u'replace')))
425
 
                                     for key, val in
426
 
                                     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
 
427
467
                try:
428
468
                    command = self.checker_command % escaped_attrs
429
469
                except TypeError, error:
467
507
        logger.debug(u"Stopping checker for %(name)s", vars(self))
468
508
        try:
469
509
            os.kill(self.checker.pid, signal.SIGTERM)
470
 
            #os.sleep(0.5)
 
510
            #time.sleep(0.5)
471
511
            #if self.checker.poll() is None:
472
512
            #    os.kill(self.checker.pid, signal.SIGKILL)
473
513
        except OSError, error:
474
514
            if error.errno != errno.ESRCH: # No such process
475
515
                raise
476
516
        self.checker = None
477
 
    
478
 
    def still_valid(self):
479
 
        """Has the timeout not yet passed for this client?"""
480
 
        if not getattr(self, u"enabled", False):
481
 
            return False
482
 
        now = datetime.datetime.utcnow()
483
 
        if self.last_checked_ok is None:
484
 
            return now < (self.created + self.timeout)
485
 
        else:
486
 
            return now < (self.last_checked_ok + self.timeout)
487
 
 
488
517
 
489
518
def dbus_service_property(dbus_interface, signature=u"v",
490
519
                          access=u"readwrite", byte_arrays=False):
498
527
    dbus.service.method, except there is only "signature", since the
499
528
    type from Get() and the type sent to Set() is the same.
500
529
    """
 
530
    # Encoding deeply encoded byte arrays is not supported yet by the
 
531
    # "Set" method, so we fail early here:
 
532
    if byte_arrays and signature != u"ay":
 
533
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
534
                         u" signature %r" % signature)
501
535
    def decorator(func):
502
536
        func._dbus_is_property = True
503
537
        func._dbus_interface = dbus_interface
589
623
        if prop._dbus_access == u"read":
590
624
            raise DBusPropertyAccessException(property_name)
591
625
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
626
            # The byte_arrays option is not supported yet on
 
627
            # signatures other than "ay".
 
628
            if prop._dbus_signature != u"ay":
 
629
                raise ValueError
592
630
            value = dbus.ByteArray(''.join(unichr(byte)
593
631
                                           for byte in value))
594
632
        prop(value)
673
711
    dbus_object_path: dbus.ObjectPath
674
712
    bus: dbus.SystemBus()
675
713
    """
 
714
    
 
715
    runtime_expansions = (Client.runtime_expansions
 
716
                          + (u"dbus_object_path",))
 
717
    
676
718
    # dbus.service.Object doesn't use super(), so we can't either.
677
719
    
678
720
    def __init__(self, bus = None, *args, **kwargs):
 
721
        self._approvals_pending = 0
679
722
        self.bus = bus
680
723
        Client.__init__(self, *args, **kwargs)
681
724
        # Only now, when this client is initialized, can it show up on
682
725
        # the D-Bus
 
726
        client_object_name = unicode(self.name).translate(
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
683
729
        self.dbus_object_path = (dbus.ObjectPath
684
 
                                 (u"/clients/"
685
 
                                  + self.name.replace(u".", u"_")))
 
730
                                 (u"/clients/" + client_object_name))
686
731
        DBusObjectWithProperties.__init__(self, self.bus,
687
732
                                          self.dbus_object_path)
 
733
        
 
734
    def _get_approvals_pending(self):
 
735
        return self._approvals_pending
 
736
    def _set_approvals_pending(self, value):
 
737
        old_value = self._approvals_pending
 
738
        self._approvals_pending = value
 
739
        bval = bool(value)
 
740
        if (hasattr(self, "dbus_object_path")
 
741
            and bval is not bool(old_value)):
 
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
744
                                 dbus_bool)
 
745
 
 
746
    approvals_pending = property(_get_approvals_pending,
 
747
                                 _set_approvals_pending)
 
748
    del _get_approvals_pending, _set_approvals_pending
688
749
    
689
750
    @staticmethod
690
751
    def _datetime_to_dbus(dt, variant_level=0):
697
758
        r = Client.enable(self)
698
759
        if oldstate != self.enabled:
699
760
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
701
762
                                 dbus.Boolean(True, variant_level=1))
702
763
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
 
764
                dbus.String(u"LastEnabled"),
704
765
                self._datetime_to_dbus(self.last_enabled,
705
766
                                       variant_level=1))
706
767
        return r
707
768
    
708
 
    def disable(self, signal = True):
 
769
    def disable(self, quiet = False):
709
770
        oldstate = getattr(self, u"enabled", False)
710
 
        r = Client.disable(self)
711
 
        if signal and oldstate != self.enabled:
 
771
        r = Client.disable(self, quiet=quiet)
 
772
        if not quiet and oldstate != self.enabled:
712
773
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
714
775
                                 dbus.Boolean(False, variant_level=1))
715
776
        return r
716
777
    
728
789
        self.checker_callback_tag = None
729
790
        self.checker = None
730
791
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
732
793
                             dbus.Boolean(False, variant_level=1))
733
794
        if os.WIFEXITED(condition):
734
795
            exitstatus = os.WEXITSTATUS(condition)
749
810
        r = Client.checked_ok(self, *args, **kwargs)
750
811
        # Emit D-Bus signal
751
812
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
 
813
            dbus.String(u"LastCheckedOK"),
753
814
            (self._datetime_to_dbus(self.last_checked_ok,
754
815
                                    variant_level=1)))
755
816
        return r
767
828
            # Emit D-Bus signal
768
829
            self.CheckerStarted(self.current_checker_command)
769
830
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
 
831
                dbus.String(u"CheckerRunning"),
771
832
                dbus.Boolean(True, variant_level=1))
772
833
        return r
773
834
    
776
837
        r = Client.stop_checker(self, *args, **kwargs)
777
838
        if (old_checker is not None
778
839
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
780
841
                                 dbus.Boolean(False, variant_level=1))
781
842
        return r
782
 
    
783
 
    ## D-Bus methods & signals
 
843
 
 
844
    def _reset_approved(self):
 
845
        self._approved = None
 
846
        return False
 
847
    
 
848
    def approve(self, value=True):
 
849
        self.send_changedstate()
 
850
        self._approved = value
 
851
        gobject.timeout_add(self._timedelta_to_milliseconds
 
852
                            (self.approval_duration),
 
853
                            self._reset_approved)
 
854
    
 
855
    
 
856
    ## D-Bus methods, signals & properties
784
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
858
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
859
    ## Signals
790
860
    
791
861
    # CheckerCompleted - signal
792
862
    @dbus.service.signal(_interface, signature=u"nxs")
809
879
    # GotSecret - signal
810
880
    @dbus.service.signal(_interface)
811
881
    def GotSecret(self):
812
 
        "D-Bus signal"
 
882
        """D-Bus signal
 
883
        Is sent after a successful transfer of secret from the Mandos
 
884
        server to mandos-client
 
885
        """
813
886
        pass
814
887
    
815
888
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
818
 
        "D-Bus signal"
819
 
        pass
 
889
    @dbus.service.signal(_interface, signature=u"s")
 
890
    def Rejected(self, reason):
 
891
        "D-Bus signal"
 
892
        pass
 
893
    
 
894
    # NeedApproval - signal
 
895
    @dbus.service.signal(_interface, signature=u"tb")
 
896
    def NeedApproval(self, timeout, default):
 
897
        "D-Bus signal"
 
898
        pass
 
899
    
 
900
    ## Methods
 
901
 
 
902
    # Approve - method
 
903
    @dbus.service.method(_interface, in_signature=u"b")
 
904
    def Approve(self, value):
 
905
        self.approve(value)
 
906
 
 
907
    # CheckedOK - method
 
908
    @dbus.service.method(_interface)
 
909
    def CheckedOK(self):
 
910
        return self.checked_ok()
820
911
    
821
912
    # Enable - method
822
913
    @dbus.service.method(_interface)
841
932
    def StopChecker(self):
842
933
        self.stop_checker()
843
934
    
844
 
    # name - property
 
935
    ## Properties
 
936
    
 
937
    # ApprovalPending - property
 
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
939
    def ApprovalPending_dbus_property(self):
 
940
        return dbus.Boolean(bool(self.approvals_pending))
 
941
    
 
942
    # ApprovedByDefault - property
 
943
    @dbus_service_property(_interface, signature=u"b",
 
944
                           access=u"readwrite")
 
945
    def ApprovedByDefault_dbus_property(self, value=None):
 
946
        if value is None:       # get
 
947
            return dbus.Boolean(self.approved_by_default)
 
948
        self.approved_by_default = bool(value)
 
949
        # Emit D-Bus signal
 
950
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
951
                             dbus.Boolean(value, variant_level=1))
 
952
    
 
953
    # ApprovalDelay - property
 
954
    @dbus_service_property(_interface, signature=u"t",
 
955
                           access=u"readwrite")
 
956
    def ApprovalDelay_dbus_property(self, value=None):
 
957
        if value is None:       # get
 
958
            return dbus.UInt64(self.approval_delay_milliseconds())
 
959
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
960
        # Emit D-Bus signal
 
961
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
962
                             dbus.UInt64(value, variant_level=1))
 
963
    
 
964
    # ApprovalDuration - property
 
965
    @dbus_service_property(_interface, signature=u"t",
 
966
                           access=u"readwrite")
 
967
    def ApprovalDuration_dbus_property(self, value=None):
 
968
        if value is None:       # get
 
969
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
970
                    self.approval_duration))
 
971
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
972
        # Emit D-Bus signal
 
973
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
974
                             dbus.UInt64(value, variant_level=1))
 
975
    
 
976
    # Name - property
845
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
978
    def Name_dbus_property(self):
847
979
        return dbus.String(self.name)
848
980
    
849
 
    # fingerprint - property
 
981
    # Fingerprint - property
850
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
983
    def Fingerprint_dbus_property(self):
852
984
        return dbus.String(self.fingerprint)
853
985
    
854
 
    # host - property
 
986
    # Host - property
855
987
    @dbus_service_property(_interface, signature=u"s",
856
988
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
989
    def Host_dbus_property(self, value=None):
858
990
        if value is None:       # get
859
991
            return dbus.String(self.host)
860
992
        self.host = value
861
993
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
 
994
        self.PropertyChanged(dbus.String(u"Host"),
863
995
                             dbus.String(value, variant_level=1))
864
996
    
865
 
    # created - property
 
997
    # Created - property
866
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
 
999
    def Created_dbus_property(self):
868
1000
        return dbus.String(self._datetime_to_dbus(self.created))
869
1001
    
870
 
    # last_enabled - property
 
1002
    # LastEnabled - property
871
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
 
1004
    def LastEnabled_dbus_property(self):
873
1005
        if self.last_enabled is None:
874
1006
            return dbus.String(u"")
875
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
1008
    
877
 
    # enabled - property
 
1009
    # Enabled - property
878
1010
    @dbus_service_property(_interface, signature=u"b",
879
1011
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
1012
    def Enabled_dbus_property(self, value=None):
881
1013
        if value is None:       # get
882
1014
            return dbus.Boolean(self.enabled)
883
1015
        if value:
885
1017
        else:
886
1018
            self.disable()
887
1019
    
888
 
    # last_checked_ok - property
 
1020
    # LastCheckedOK - property
889
1021
    @dbus_service_property(_interface, signature=u"s",
890
1022
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1023
    def LastCheckedOK_dbus_property(self, value=None):
892
1024
        if value is not None:
893
1025
            self.checked_ok()
894
1026
            return
897
1029
        return dbus.String(self._datetime_to_dbus(self
898
1030
                                                  .last_checked_ok))
899
1031
    
900
 
    # timeout - property
 
1032
    # Timeout - property
901
1033
    @dbus_service_property(_interface, signature=u"t",
902
1034
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1035
    def Timeout_dbus_property(self, value=None):
904
1036
        if value is None:       # get
905
1037
            return dbus.UInt64(self.timeout_milliseconds())
906
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
1039
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
909
1041
                             dbus.UInt64(value, variant_level=1))
910
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
911
1043
            return
925
1057
            self.disable_initiator_tag = (gobject.timeout_add
926
1058
                                          (time_to_die, self.disable))
927
1059
    
928
 
    # interval - property
 
1060
    # Interval - property
929
1061
    @dbus_service_property(_interface, signature=u"t",
930
1062
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1063
    def Interval_dbus_property(self, value=None):
932
1064
        if value is None:       # get
933
1065
            return dbus.UInt64(self.interval_milliseconds())
934
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
935
1067
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
937
1069
                             dbus.UInt64(value, variant_level=1))
938
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
939
1071
            return
943
1075
                                      (value, self.start_checker))
944
1076
        self.start_checker()    # Start one now, too
945
1077
 
946
 
    # checker - property
 
1078
    # Checker - property
947
1079
    @dbus_service_property(_interface, signature=u"s",
948
1080
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1081
    def Checker_dbus_property(self, value=None):
950
1082
        if value is None:       # get
951
1083
            return dbus.String(self.checker_command)
952
1084
        self.checker_command = value
953
1085
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
955
1087
                             dbus.String(self.checker_command,
956
1088
                                         variant_level=1))
957
1089
    
958
 
    # checker_running - property
 
1090
    # CheckerRunning - property
959
1091
    @dbus_service_property(_interface, signature=u"b",
960
1092
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1093
    def CheckerRunning_dbus_property(self, value=None):
962
1094
        if value is None:       # get
963
1095
            return dbus.Boolean(self.checker is not None)
964
1096
        if value:
966
1098
        else:
967
1099
            self.stop_checker()
968
1100
    
969
 
    # object_path - property
 
1101
    # ObjectPath - property
970
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1103
    def ObjectPath_dbus_property(self):
972
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1105
    
974
 
    # secret = property
 
1106
    # Secret = property
975
1107
    @dbus_service_property(_interface, signature=u"ay",
976
1108
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1109
    def Secret_dbus_property(self, value):
978
1110
        self.secret = str(value)
979
1111
    
980
1112
    del _interface
981
1113
 
982
1114
 
 
1115
class ProxyClient(object):
 
1116
    def __init__(self, child_pipe, fpr, address):
 
1117
        self._pipe = child_pipe
 
1118
        self._pipe.send(('init', fpr, address))
 
1119
        if not self._pipe.recv():
 
1120
            raise KeyError()
 
1121
 
 
1122
    def __getattribute__(self, name):
 
1123
        if(name == '_pipe'):
 
1124
            return super(ProxyClient, self).__getattribute__(name)
 
1125
        self._pipe.send(('getattr', name))
 
1126
        data = self._pipe.recv()
 
1127
        if data[0] == 'data':
 
1128
            return data[1]
 
1129
        if data[0] == 'function':
 
1130
            def func(*args, **kwargs):
 
1131
                self._pipe.send(('funcall', name, args, kwargs))
 
1132
                return self._pipe.recv()[1]
 
1133
            return func
 
1134
 
 
1135
    def __setattr__(self, name, value):
 
1136
        if(name == '_pipe'):
 
1137
            return super(ProxyClient, self).__setattr__(name, value)
 
1138
        self._pipe.send(('setattr', name, value))
 
1139
 
 
1140
 
983
1141
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1142
    """A class to handle client connections.
985
1143
    
987
1145
    Note: This will run in its own forked process."""
988
1146
    
989
1147
    def handle(self):
990
 
        logger.info(u"TCP connection from: %s",
991
 
                    unicode(self.client_address))
992
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
1148
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1149
            logger.info(u"TCP connection from: %s",
 
1150
                        unicode(self.client_address))
 
1151
            logger.debug(u"Pipe FD: %d",
 
1152
                         self.server.child_pipe.fileno())
 
1153
 
995
1154
            session = (gnutls.connection
996
1155
                       .ClientSession(self.request,
997
1156
                                      gnutls.connection
998
1157
                                      .X509Credentials()))
999
 
            
1000
 
            line = self.request.makefile().readline()
1001
 
            logger.debug(u"Protocol version: %r", line)
1002
 
            try:
1003
 
                if int(line.strip().split()[0]) > 1:
1004
 
                    raise RuntimeError
1005
 
            except (ValueError, IndexError, RuntimeError), error:
1006
 
                logger.error(u"Unknown protocol version: %s", error)
1007
 
                return
1008
 
            
 
1158
 
1009
1159
            # Note: gnutls.connection.X509Credentials is really a
1010
1160
            # generic GnuTLS certificate credentials object so long as
1011
1161
            # no X.509 keys are added to it.  Therefore, we can use it
1012
1162
            # here despite using OpenPGP certificates.
1013
 
            
 
1163
 
1014
1164
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1015
1165
            #                      u"+AES-256-CBC", u"+SHA1",
1016
1166
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1022
1172
            (gnutls.library.functions
1023
1173
             .gnutls_priority_set_direct(session._c_object,
1024
1174
                                         priority, None))
1025
 
            
 
1175
 
 
1176
            # Start communication using the Mandos protocol
 
1177
            # Get protocol number
 
1178
            line = self.request.makefile().readline()
 
1179
            logger.debug(u"Protocol version: %r", line)
 
1180
            try:
 
1181
                if int(line.strip().split()[0]) > 1:
 
1182
                    raise RuntimeError
 
1183
            except (ValueError, IndexError, RuntimeError), error:
 
1184
                logger.error(u"Unknown protocol version: %s", error)
 
1185
                return
 
1186
 
 
1187
            # Start GnuTLS connection
1026
1188
            try:
1027
1189
                session.handshake()
1028
1190
            except gnutls.errors.GNUTLSError, error:
1031
1193
                # established.  Just abandon the request.
1032
1194
                return
1033
1195
            logger.debug(u"Handshake succeeded")
 
1196
 
 
1197
            approval_required = False
1034
1198
            try:
1035
 
                fpr = self.fingerprint(self.peer_certificate(session))
1036
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1037
 
                logger.warning(u"Bad certificate: %s", error)
1038
 
                session.bye()
1039
 
                return
1040
 
            logger.debug(u"Fingerprint: %s", fpr)
 
1199
                try:
 
1200
                    fpr = self.fingerprint(self.peer_certificate
 
1201
                                           (session))
 
1202
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1203
                    logger.warning(u"Bad certificate: %s", error)
 
1204
                    return
 
1205
                logger.debug(u"Fingerprint: %s", fpr)
 
1206
 
 
1207
                try:
 
1208
                    client = ProxyClient(child_pipe, fpr,
 
1209
                                         self.client_address)
 
1210
                except KeyError:
 
1211
                    return
 
1212
                
 
1213
                if client.approval_delay:
 
1214
                    delay = client.approval_delay
 
1215
                    client.approvals_pending += 1
 
1216
                    approval_required = True
 
1217
                
 
1218
                while True:
 
1219
                    if not client.enabled:
 
1220
                        logger.warning(u"Client %s is disabled",
 
1221
                                       client.name)
 
1222
                        if self.server.use_dbus:
 
1223
                            # Emit D-Bus signal
 
1224
                            client.Rejected("Disabled")                    
 
1225
                        return
 
1226
                    
 
1227
                    if client._approved or not client.approval_delay:
 
1228
                        #We are approved or approval is disabled
 
1229
                        break
 
1230
                    elif client._approved is None:
 
1231
                        logger.info(u"Client %s needs approval",
 
1232
                                    client.name)
 
1233
                        if self.server.use_dbus:
 
1234
                            # Emit D-Bus signal
 
1235
                            client.NeedApproval(
 
1236
                                client.approval_delay_milliseconds(),
 
1237
                                client.approved_by_default)
 
1238
                    else:
 
1239
                        logger.warning(u"Client %s was not approved",
 
1240
                                       client.name)
 
1241
                        if self.server.use_dbus:
 
1242
                            # Emit D-Bus signal
 
1243
                            client.Rejected("Denied")
 
1244
                        return
 
1245
                    
 
1246
                    #wait until timeout or approved
 
1247
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1248
                    time = datetime.datetime.now()
 
1249
                    client.changedstate.acquire()
 
1250
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1251
                    client.changedstate.release()
 
1252
                    time2 = datetime.datetime.now()
 
1253
                    if (time2 - time) >= delay:
 
1254
                        if not client.approved_by_default:
 
1255
                            logger.warning("Client %s timed out while"
 
1256
                                           " waiting for approval",
 
1257
                                           client.name)
 
1258
                            if self.server.use_dbus:
 
1259
                                # Emit D-Bus signal
 
1260
                                client.Rejected("Approval timed out")
 
1261
                            return
 
1262
                        else:
 
1263
                            break
 
1264
                    else:
 
1265
                        delay -= time2 - time
 
1266
                
 
1267
                sent_size = 0
 
1268
                while sent_size < len(client.secret):
 
1269
                    try:
 
1270
                        sent = session.send(client.secret[sent_size:])
 
1271
                    except (gnutls.errors.GNUTLSError), error:
 
1272
                        logger.warning("gnutls send failed")
 
1273
                        return
 
1274
                    logger.debug(u"Sent: %d, remaining: %d",
 
1275
                                 sent, len(client.secret)
 
1276
                                 - (sent_size + sent))
 
1277
                    sent_size += sent
 
1278
 
 
1279
                logger.info(u"Sending secret to %s", client.name)
 
1280
                # bump the timeout as if seen
 
1281
                client.checked_ok()
 
1282
                if self.server.use_dbus:
 
1283
                    # Emit D-Bus signal
 
1284
                    client.GotSecret()
1041
1285
            
1042
 
            for c in self.server.clients:
1043
 
                if c.fingerprint == fpr:
1044
 
                    client = c
1045
 
                    break
1046
 
            else:
1047
 
                ipc.write(u"NOTFOUND %s %s\n"
1048
 
                          % (fpr, unicode(self.client_address)))
1049
 
                session.bye()
1050
 
                return
1051
 
            # Have to check if client.still_valid(), since it is
1052
 
            # possible that the client timed out while establishing
1053
 
            # the GnuTLS session.
1054
 
            if not client.still_valid():
1055
 
                ipc.write(u"INVALID %s\n" % client.name)
1056
 
                session.bye()
1057
 
                return
1058
 
            ipc.write(u"SENDING %s\n" % client.name)
1059
 
            sent_size = 0
1060
 
            while sent_size < len(client.secret):
1061
 
                sent = session.send(client.secret[sent_size:])
1062
 
                logger.debug(u"Sent: %d, remaining: %d",
1063
 
                             sent, len(client.secret)
1064
 
                             - (sent_size + sent))
1065
 
                sent_size += sent
1066
 
            session.bye()
 
1286
            finally:
 
1287
                if approval_required:
 
1288
                    client.approvals_pending -= 1
 
1289
                try:
 
1290
                    session.bye()
 
1291
                except (gnutls.errors.GNUTLSError), error:
 
1292
                    logger.warning("GnuTLS bye failed")
1067
1293
    
1068
1294
    @staticmethod
1069
1295
    def peer_certificate(session):
1129
1355
        return hex_fpr
1130
1356
 
1131
1357
 
1132
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
1358
class MultiprocessingMixIn(object):
 
1359
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1360
    def sub_process_main(self, request, address):
 
1361
        try:
 
1362
            self.finish_request(request, address)
 
1363
        except:
 
1364
            self.handle_error(request, address)
 
1365
        self.close_request(request)
 
1366
            
 
1367
    def process_request(self, request, address):
 
1368
        """Start a new process to process the request."""
 
1369
        multiprocessing.Process(target = self.sub_process_main,
 
1370
                                args = (request, address)).start()
 
1371
 
 
1372
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1373
    """ adds a pipe to the MixIn """
1134
1374
    def process_request(self, request, client_address):
1135
1375
        """Overrides and wraps the original process_request().
1136
1376
        
1137
1377
        This function creates a new pipe in self.pipe
1138
1378
        """
1139
 
        self.pipe = os.pipe()
1140
 
        super(ForkingMixInWithPipe,
 
1379
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1380
 
 
1381
        super(MultiprocessingMixInWithPipe,
1141
1382
              self).process_request(request, client_address)
1142
 
        os.close(self.pipe[1])  # close write end
1143
 
        self.add_pipe(self.pipe[0])
1144
 
    def add_pipe(self, pipe):
 
1383
        self.child_pipe.close()
 
1384
        self.add_pipe(parent_pipe)
 
1385
 
 
1386
    def add_pipe(self, parent_pipe):
1145
1387
        """Dummy function; override as necessary"""
1146
 
        os.close(pipe)
1147
 
 
1148
 
 
1149
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1388
        pass
 
1389
 
 
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1150
1391
                     socketserver.TCPServer, object):
1151
1392
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1152
1393
    
1237
1478
            return socketserver.TCPServer.server_activate(self)
1238
1479
    def enable(self):
1239
1480
        self.enabled = True
1240
 
    def add_pipe(self, pipe):
 
1481
    def add_pipe(self, parent_pipe):
1241
1482
        # Call "handle_ipc" for both data and EOF events
1242
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1243
 
                             self.handle_ipc)
1244
 
    def handle_ipc(self, source, condition, file_objects={}):
 
1483
        gobject.io_add_watch(parent_pipe.fileno(),
 
1484
                             gobject.IO_IN | gobject.IO_HUP,
 
1485
                             functools.partial(self.handle_ipc,
 
1486
                                               parent_pipe = parent_pipe))
 
1487
        
 
1488
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1489
                   client_object=None):
1245
1490
        condition_names = {
1246
1491
            gobject.IO_IN: u"IN",   # There is data to read.
1247
1492
            gobject.IO_OUT: u"OUT", # Data can be written (without
1256
1501
                                       for cond, name in
1257
1502
                                       condition_names.iteritems()
1258
1503
                                       if cond & condition)
1259
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1260
 
                     conditions_string)
1261
 
        
1262
 
        # Turn the pipe file descriptor into a Python file object
1263
 
        if source not in file_objects:
1264
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1265
 
        
1266
 
        # Read a line from the file object
1267
 
        cmdline = file_objects[source].readline()
1268
 
        if not cmdline:             # Empty line means end of file
1269
 
            # close the IPC pipe
1270
 
            file_objects[source].close()
1271
 
            del file_objects[source]
1272
 
            
1273
 
            # Stop calling this function
1274
 
            return False
1275
 
        
1276
 
        logger.debug(u"IPC command: %r", cmdline)
1277
 
        
1278
 
        # Parse and act on command
1279
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1280
 
        
1281
 
        if cmd == u"NOTFOUND":
1282
 
            logger.warning(u"Client not found for fingerprint: %s",
1283
 
                           args)
1284
 
            if self.use_dbus:
1285
 
                # Emit D-Bus signal
1286
 
                mandos_dbus_service.ClientNotFound(args)
1287
 
        elif cmd == u"INVALID":
1288
 
            for client in self.clients:
1289
 
                if client.name == args:
1290
 
                    logger.warning(u"Client %s is invalid", args)
1291
 
                    if self.use_dbus:
1292
 
                        # Emit D-Bus signal
1293
 
                        client.Rejected()
1294
 
                    break
1295
 
            else:
1296
 
                logger.error(u"Unknown client %s is invalid", args)
1297
 
        elif cmd == u"SENDING":
1298
 
            for client in self.clients:
1299
 
                if client.name == args:
1300
 
                    logger.info(u"Sending secret to %s", client.name)
1301
 
                    client.checked_ok()
1302
 
                    if self.use_dbus:
1303
 
                        # Emit D-Bus signal
1304
 
                        client.GotSecret()
1305
 
                    break
1306
 
            else:
1307
 
                logger.error(u"Sending secret to unknown client %s",
1308
 
                             args)
1309
 
        else:
1310
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1311
 
        
1312
 
        # Keep calling this function
 
1504
        # error or the other end of multiprocessing.Pipe has closed
 
1505
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1506
            return False
 
1507
        
 
1508
        # Read a request from the child
 
1509
        request = parent_pipe.recv()
 
1510
        command = request[0]
 
1511
        
 
1512
        if command == 'init':
 
1513
            fpr = request[1]
 
1514
            address = request[2]
 
1515
            
 
1516
            for c in self.clients:
 
1517
                if c.fingerprint == fpr:
 
1518
                    client = c
 
1519
                    break
 
1520
            else:
 
1521
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1522
                               u"dress: %s", fpr, address)
 
1523
                if self.use_dbus:
 
1524
                    # Emit D-Bus signal
 
1525
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1526
                parent_pipe.send(False)
 
1527
                return False
 
1528
            
 
1529
            gobject.io_add_watch(parent_pipe.fileno(),
 
1530
                                 gobject.IO_IN | gobject.IO_HUP,
 
1531
                                 functools.partial(self.handle_ipc,
 
1532
                                                   parent_pipe = parent_pipe,
 
1533
                                                   client_object = client))
 
1534
            parent_pipe.send(True)
 
1535
            # remove the old hook in favor of the new above hook on same fileno
 
1536
            return False
 
1537
        if command == 'funcall':
 
1538
            funcname = request[1]
 
1539
            args = request[2]
 
1540
            kwargs = request[3]
 
1541
            
 
1542
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1543
 
 
1544
        if command == 'getattr':
 
1545
            attrname = request[1]
 
1546
            if callable(client_object.__getattribute__(attrname)):
 
1547
                parent_pipe.send(('function',))
 
1548
            else:
 
1549
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1550
        
 
1551
        if command == 'setattr':
 
1552
            attrname = request[1]
 
1553
            value = request[2]
 
1554
            setattr(client_object, attrname, value)
 
1555
 
1313
1556
        return True
1314
1557
 
1315
1558
 
1345
1588
            elif suffix == u"w":
1346
1589
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1347
1590
            else:
1348
 
                raise ValueError
1349
 
        except (ValueError, IndexError):
1350
 
            raise ValueError
 
1591
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1592
        except (ValueError, IndexError), e:
 
1593
            raise ValueError(e.message)
1351
1594
        timevalue += delta
1352
1595
    return timevalue
1353
1596
 
1366
1609
        def if_nametoindex(interface):
1367
1610
            "Get an interface index the hard way, i.e. using fcntl()"
1368
1611
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1369
 
            with closing(socket.socket()) as s:
 
1612
            with contextlib.closing(socket.socket()) as s:
1370
1613
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1371
1614
                                    struct.pack(str(u"16s16x"),
1372
1615
                                                interface))
1418
1661
    parser.add_option("--debug", action=u"store_true",
1419
1662
                      help=u"Debug mode; run in foreground and log to"
1420
1663
                      u" terminal")
 
1664
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1665
                      help=u"Debug level for stdout output")
1421
1666
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1422
1667
                      u" priority string (see GnuTLS documentation)")
1423
1668
    parser.add_option("--servicename", type=u"string",
1448
1693
                        u"servicename": u"Mandos",
1449
1694
                        u"use_dbus": u"True",
1450
1695
                        u"use_ipv6": u"True",
 
1696
                        u"debuglevel": u"",
1451
1697
                        }
1452
1698
    
1453
1699
    # Parse config file for server-global settings
1470
1716
    # options, if set.
1471
1717
    for option in (u"interface", u"address", u"port", u"debug",
1472
1718
                   u"priority", u"servicename", u"configdir",
1473
 
                   u"use_dbus", u"use_ipv6"):
 
1719
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1474
1720
        value = getattr(options, option)
1475
1721
        if value is not None:
1476
1722
            server_settings[option] = value
1485
1731
    
1486
1732
    # For convenience
1487
1733
    debug = server_settings[u"debug"]
 
1734
    debuglevel = server_settings[u"debuglevel"]
1488
1735
    use_dbus = server_settings[u"use_dbus"]
1489
1736
    use_ipv6 = server_settings[u"use_ipv6"]
1490
 
    
1491
 
    if not debug:
1492
 
        syslogger.setLevel(logging.WARNING)
1493
 
        console.setLevel(logging.WARNING)
1494
 
    
 
1737
 
1495
1738
    if server_settings[u"servicename"] != u"Mandos":
1496
1739
        syslogger.setFormatter(logging.Formatter
1497
1740
                               (u'Mandos (%s) [%%(process)d]:'
1503
1746
                        u"interval": u"5m",
1504
1747
                        u"checker": u"fping -q -- %%(host)s",
1505
1748
                        u"host": u"",
 
1749
                        u"approval_delay": u"0s",
 
1750
                        u"approval_duration": u"1s",
1506
1751
                        }
1507
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1508
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
1514
1759
    tcp_server = MandosServer((server_settings[u"address"],
1515
1760
                               server_settings[u"port"]),
1516
1761
                              ClientHandler,
1517
 
                              interface=server_settings[u"interface"],
 
1762
                              interface=(server_settings[u"interface"]
 
1763
                                         or None),
1518
1764
                              use_ipv6=use_ipv6,
1519
1765
                              gnutls_priority=
1520
1766
                              server_settings[u"priority"],
1521
1767
                              use_dbus=use_dbus)
1522
 
    pidfilename = u"/var/run/mandos.pid"
1523
 
    try:
1524
 
        pidfile = open(pidfilename, u"w")
1525
 
    except IOError:
1526
 
        logger.error(u"Could not open file %r", pidfilename)
 
1768
    if not debug:
 
1769
        pidfilename = u"/var/run/mandos.pid"
 
1770
        try:
 
1771
            pidfile = open(pidfilename, u"w")
 
1772
        except IOError:
 
1773
            logger.error(u"Could not open file %r", pidfilename)
1527
1774
    
1528
1775
    try:
1529
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
1546
1793
        if error[0] != errno.EPERM:
1547
1794
            raise error
1548
1795
    
1549
 
    # Enable all possible GnuTLS debugging
 
1796
    if not debug and not debuglevel:
 
1797
        syslogger.setLevel(logging.WARNING)
 
1798
        console.setLevel(logging.WARNING)
 
1799
    if debuglevel:
 
1800
        level = getattr(logging, debuglevel.upper())
 
1801
        syslogger.setLevel(level)
 
1802
        console.setLevel(level)
 
1803
 
1550
1804
    if debug:
 
1805
        # Enable all possible GnuTLS debugging
 
1806
        
1551
1807
        # "Use a log level over 10 to enable all debugging options."
1552
1808
        # - GnuTLS manual
1553
1809
        gnutls.library.functions.gnutls_global_set_log_level(11)
1558
1814
        
1559
1815
        (gnutls.library.functions
1560
1816
         .gnutls_global_set_log_function(debug_gnutls))
 
1817
        
 
1818
        # Redirect stdin so all checkers get /dev/null
 
1819
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1820
        os.dup2(null, sys.stdin.fileno())
 
1821
        if null > 2:
 
1822
            os.close(null)
 
1823
    else:
 
1824
        # No console logging
 
1825
        logger.removeHandler(console)
 
1826
    
1561
1827
    
1562
1828
    global main_loop
1563
1829
    # From the Avahi example code
1566
1832
    bus = dbus.SystemBus()
1567
1833
    # End of Avahi example code
1568
1834
    if use_dbus:
1569
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1835
        try:
 
1836
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1837
                                            bus, do_not_queue=True)
 
1838
        except dbus.exceptions.NameExistsException, e:
 
1839
            logger.error(unicode(e) + u", disabling D-Bus")
 
1840
            use_dbus = False
 
1841
            server_settings[u"use_dbus"] = False
 
1842
            tcp_server.use_dbus = False
1570
1843
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1571
1844
    service = AvahiService(name = server_settings[u"servicename"],
1572
1845
                           servicetype = u"_mandos._tcp",
1574
1847
    if server_settings["interface"]:
1575
1848
        service.interface = (if_nametoindex
1576
1849
                             (str(server_settings[u"interface"])))
 
1850
 
 
1851
    if not debug:
 
1852
        # Close all input and output, do double fork, etc.
 
1853
        daemon()
 
1854
        
 
1855
    global multiprocessing_manager
 
1856
    multiprocessing_manager = multiprocessing.Manager()
1577
1857
    
1578
1858
    client_class = Client
1579
1859
    if use_dbus:
1580
1860
        client_class = functools.partial(ClientDBus, bus = bus)
 
1861
    def client_config_items(config, section):
 
1862
        special_settings = {
 
1863
            "approved_by_default":
 
1864
                lambda: config.getboolean(section,
 
1865
                                          "approved_by_default"),
 
1866
            }
 
1867
        for name, value in config.items(section):
 
1868
            try:
 
1869
                yield (name, special_settings[name]())
 
1870
            except KeyError:
 
1871
                yield (name, value)
 
1872
    
1581
1873
    tcp_server.clients.update(set(
1582
1874
            client_class(name = section,
1583
 
                         config= dict(client_config.items(section)))
 
1875
                         config= dict(client_config_items(
 
1876
                        client_config, section)))
1584
1877
            for section in client_config.sections()))
1585
1878
    if not tcp_server.clients:
1586
1879
        logger.warning(u"No clients defined")
1587
 
    
1588
 
    if debug:
1589
 
        # Redirect stdin so all checkers get /dev/null
1590
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
 
        os.dup2(null, sys.stdin.fileno())
1592
 
        if null > 2:
1593
 
            os.close(null)
1594
 
    else:
1595
 
        # No console logging
1596
 
        logger.removeHandler(console)
1597
 
        # Close all input and output, do double fork, etc.
1598
 
        daemon()
1599
 
    
1600
 
    try:
1601
 
        with closing(pidfile):
1602
 
            pid = os.getpid()
1603
 
            pidfile.write(str(pid) + "\n")
1604
 
        del pidfile
1605
 
    except IOError:
1606
 
        logger.error(u"Could not write to file %r with PID %d",
1607
 
                     pidfilename, pid)
1608
 
    except NameError:
1609
 
        # "pidfile" was never created
1610
 
        pass
1611
 
    del pidfilename
1612
 
    
1613
 
    def cleanup():
1614
 
        "Cleanup function; run on exit"
1615
 
        service.cleanup()
1616
1880
        
1617
 
        while tcp_server.clients:
1618
 
            client = tcp_server.clients.pop()
1619
 
            client.disable_hook = None
1620
 
            client.disable()
1621
 
    
1622
 
    atexit.register(cleanup)
1623
 
    
1624
1881
    if not debug:
 
1882
        try:
 
1883
            with pidfile:
 
1884
                pid = os.getpid()
 
1885
                pidfile.write(str(pid) + "\n")
 
1886
            del pidfile
 
1887
        except IOError:
 
1888
            logger.error(u"Could not write to file %r with PID %d",
 
1889
                         pidfilename, pid)
 
1890
        except NameError:
 
1891
            # "pidfile" was never created
 
1892
            pass
 
1893
        del pidfilename
 
1894
        
1625
1895
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1896
 
1626
1897
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1627
1898
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1628
1899
    
1633
1904
                dbus.service.Object.__init__(self, bus, u"/")
1634
1905
            _interface = u"se.bsnet.fukt.Mandos"
1635
1906
            
1636
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1637
 
            def ClientAdded(self, objpath, properties):
 
1907
            @dbus.service.signal(_interface, signature=u"o")
 
1908
            def ClientAdded(self, objpath):
1638
1909
                "D-Bus signal"
1639
1910
                pass
1640
1911
            
1641
 
            @dbus.service.signal(_interface, signature=u"s")
1642
 
            def ClientNotFound(self, fingerprint):
 
1912
            @dbus.service.signal(_interface, signature=u"ss")
 
1913
            def ClientNotFound(self, fingerprint, address):
1643
1914
                "D-Bus signal"
1644
1915
                pass
1645
1916
            
1671
1942
                        tcp_server.clients.remove(c)
1672
1943
                        c.remove_from_connection()
1673
1944
                        # Don't signal anything except ClientRemoved
1674
 
                        c.disable(signal=False)
 
1945
                        c.disable(quiet=True)
1675
1946
                        # Emit D-Bus signal
1676
1947
                        self.ClientRemoved(object_path, c.name)
1677
1948
                        return
1678
 
                raise KeyError
 
1949
                raise KeyError(object_path)
1679
1950
            
1680
1951
            del _interface
1681
1952
        
1682
1953
        mandos_dbus_service = MandosDBusService()
1683
1954
    
 
1955
    def cleanup():
 
1956
        "Cleanup function; run on exit"
 
1957
        service.cleanup()
 
1958
        
 
1959
        while tcp_server.clients:
 
1960
            client = tcp_server.clients.pop()
 
1961
            if use_dbus:
 
1962
                client.remove_from_connection()
 
1963
            client.disable_hook = None
 
1964
            # Don't signal anything except ClientRemoved
 
1965
            client.disable(quiet=True)
 
1966
            if use_dbus:
 
1967
                # Emit D-Bus signal
 
1968
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1969
                                                  client.name)
 
1970
    
 
1971
    atexit.register(cleanup)
 
1972
    
1684
1973
    for client in tcp_server.clients:
1685
1974
        if use_dbus:
1686
1975
            # Emit D-Bus signal
1687
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1688
 
                                            client.GetAll(u""))
 
1976
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1689
1977
        client.enable()
1690
1978
    
1691
1979
    tcp_server.enable()
1709
1997
            service.activate()
1710
1998
        except dbus.exceptions.DBusException, error:
1711
1999
            logger.critical(u"DBusException: %s", error)
 
2000
            cleanup()
1712
2001
            sys.exit(1)
1713
2002
        # End of Avahi example code
1714
2003
        
1721
2010
        main_loop.run()
1722
2011
    except AvahiError, error:
1723
2012
        logger.critical(u"AvahiError: %s", error)
 
2013
        cleanup()
1724
2014
        sys.exit(1)
1725
2015
    except KeyboardInterrupt:
1726
2016
        if debug:
1727
2017
            print >> sys.stderr
1728
2018
        logger.debug(u"Server received KeyboardInterrupt")
1729
2019
    logger.debug(u"Server exiting")
 
2020
    # Must run before the D-Bus bus name gets deregistered
 
2021
    cleanup()
1730
2022
 
1731
2023
if __name__ == '__main__':
1732
2024
    main()