/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
79
81
        SO_BINDTODEVICE = None
80
82
 
81
83
 
82
 
version = "1.0.12"
 
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"])))) as secfile:
 
314
            with open(os.path.expanduser(os.path.expandvars
 
315
                                         (config[u"secfile"])),
 
316
                      "rb") as secfile:
296
317
                self.secret = secfile.read()
297
318
        else:
298
319
            raise TypeError(u"No secret or secfile for client %s"
312
333
        self.checker_command = config[u"checker"]
313
334
        self.current_checker_command = None
314
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())
315
345
    
 
346
    def send_changedstate(self):
 
347
        self.changedstate.acquire()
 
348
        self.changedstate.notify_all()
 
349
        self.changedstate.release()
 
350
        
316
351
    def enable(self):
317
352
        """Start this client's checker and timeout hooks"""
318
353
        if getattr(self, u"enabled", False):
319
354
            # Already enabled
320
355
            return
 
356
        self.send_changedstate()
321
357
        self.last_enabled = datetime.datetime.utcnow()
322
358
        # Schedule a new checker to be started an 'interval' from now,
323
359
        # and every interval from then on.
324
360
        self.checker_initiator_tag = (gobject.timeout_add
325
361
                                      (self.interval_milliseconds(),
326
362
                                       self.start_checker))
327
 
        # Also start a new checker *right now*.
328
 
        self.start_checker()
329
363
        # Schedule a disable() when 'timeout' has passed
330
364
        self.disable_initiator_tag = (gobject.timeout_add
331
365
                                   (self.timeout_milliseconds(),
332
366
                                    self.disable))
333
367
        self.enabled = True
 
368
        # Also start a new checker *right now*.
 
369
        self.start_checker()
334
370
    
335
 
    def disable(self):
 
371
    def disable(self, quiet=True):
336
372
        """Disable this client."""
337
373
        if not getattr(self, "enabled", False):
338
374
            return False
339
 
        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)
340
379
        if getattr(self, u"disable_initiator_tag", False):
341
380
            gobject.source_remove(self.disable_initiator_tag)
342
381
            self.disable_initiator_tag = None
394
433
        # client would inevitably timeout, since no checker would get
395
434
        # a chance to run to completion.  If we instead leave running
396
435
        # checkers alone, the checker would have to take more time
397
 
        # than 'timeout' for the client to be declared invalid, which
398
 
        # is as it should be.
 
436
        # than 'timeout' for the client to be disabled, which is as it
 
437
        # should be.
399
438
        
400
439
        # If a checker exists, make sure it is not a zombie
401
 
        if self.checker is not None:
 
440
        try:
402
441
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
442
        except (AttributeError, OSError), error:
 
443
            if (isinstance(error, OSError)
 
444
                and error.errno != errno.ECHILD):
 
445
                raise error
 
446
        else:
403
447
            if pid:
404
448
                logger.warning(u"Checker was a zombie")
405
449
                gobject.source_remove(self.checker_callback_tag)
412
456
                command = self.checker_command % self.host
413
457
            except TypeError:
414
458
                # Escape attributes for the shell
415
 
                escaped_attrs = dict((key,
416
 
                                      re.escape(unicode(str(val),
417
 
                                                        errors=
418
 
                                                        u'replace')))
419
 
                                     for key, val in
420
 
                                     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
 
421
467
                try:
422
468
                    command = self.checker_command % escaped_attrs
423
469
                except TypeError, error:
461
507
        logger.debug(u"Stopping checker for %(name)s", vars(self))
462
508
        try:
463
509
            os.kill(self.checker.pid, signal.SIGTERM)
464
 
            #os.sleep(0.5)
 
510
            #time.sleep(0.5)
465
511
            #if self.checker.poll() is None:
466
512
            #    os.kill(self.checker.pid, signal.SIGKILL)
467
513
        except OSError, error:
468
514
            if error.errno != errno.ESRCH: # No such process
469
515
                raise
470
516
        self.checker = None
471
 
    
472
 
    def still_valid(self):
473
 
        """Has the timeout not yet passed for this client?"""
474
 
        if not getattr(self, u"enabled", False):
475
 
            return False
476
 
        now = datetime.datetime.utcnow()
477
 
        if self.last_checked_ok is None:
478
 
            return now < (self.created + self.timeout)
479
 
        else:
480
 
            return now < (self.last_checked_ok + self.timeout)
481
 
 
482
517
 
483
518
def dbus_service_property(dbus_interface, signature=u"v",
484
519
                          access=u"readwrite", byte_arrays=False):
492
527
    dbus.service.method, except there is only "signature", since the
493
528
    type from Get() and the type sent to Set() is the same.
494
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)
495
535
    def decorator(func):
496
536
        func._dbus_is_property = True
497
537
        func._dbus_interface = dbus_interface
583
623
        if prop._dbus_access == u"read":
584
624
            raise DBusPropertyAccessException(property_name)
585
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
586
630
            value = dbus.ByteArray(''.join(unichr(byte)
587
631
                                           for byte in value))
588
632
        prop(value)
620
664
        """Standard D-Bus method, overloaded to insert property tags.
621
665
        """
622
666
        xmlstring = dbus.service.Object.Introspect(self, object_path,
623
 
                                           connection)
624
 
        document = xml.dom.minidom.parseString(xmlstring)
625
 
        del xmlstring
626
 
        def make_tag(document, name, prop):
627
 
            e = document.createElement(u"property")
628
 
            e.setAttribute(u"name", name)
629
 
            e.setAttribute(u"type", prop._dbus_signature)
630
 
            e.setAttribute(u"access", prop._dbus_access)
631
 
            return e
632
 
        for if_tag in document.getElementsByTagName(u"interface"):
633
 
            for tag in (make_tag(document, name, prop)
634
 
                        for name, prop
635
 
                        in self._get_all_dbus_properties()
636
 
                        if prop._dbus_interface
637
 
                        == if_tag.getAttribute(u"name")):
638
 
                if_tag.appendChild(tag)
639
 
        xmlstring = document.toxml(u"utf-8")
640
 
        document.unlink()
 
667
                                                   connection)
 
668
        try:
 
669
            document = xml.dom.minidom.parseString(xmlstring)
 
670
            def make_tag(document, name, prop):
 
671
                e = document.createElement(u"property")
 
672
                e.setAttribute(u"name", name)
 
673
                e.setAttribute(u"type", prop._dbus_signature)
 
674
                e.setAttribute(u"access", prop._dbus_access)
 
675
                return e
 
676
            for if_tag in document.getElementsByTagName(u"interface"):
 
677
                for tag in (make_tag(document, name, prop)
 
678
                            for name, prop
 
679
                            in self._get_all_dbus_properties()
 
680
                            if prop._dbus_interface
 
681
                            == if_tag.getAttribute(u"name")):
 
682
                    if_tag.appendChild(tag)
 
683
                # Add the names to the return values for the
 
684
                # "org.freedesktop.DBus.Properties" methods
 
685
                if (if_tag.getAttribute(u"name")
 
686
                    == u"org.freedesktop.DBus.Properties"):
 
687
                    for cn in if_tag.getElementsByTagName(u"method"):
 
688
                        if cn.getAttribute(u"name") == u"Get":
 
689
                            for arg in cn.getElementsByTagName(u"arg"):
 
690
                                if (arg.getAttribute(u"direction")
 
691
                                    == u"out"):
 
692
                                    arg.setAttribute(u"name", u"value")
 
693
                        elif cn.getAttribute(u"name") == u"GetAll":
 
694
                            for arg in cn.getElementsByTagName(u"arg"):
 
695
                                if (arg.getAttribute(u"direction")
 
696
                                    == u"out"):
 
697
                                    arg.setAttribute(u"name", u"props")
 
698
            xmlstring = document.toxml(u"utf-8")
 
699
            document.unlink()
 
700
        except (AttributeError, xml.dom.DOMException,
 
701
                xml.parsers.expat.ExpatError), error:
 
702
            logger.error(u"Failed to override Introspection method",
 
703
                         error)
641
704
        return xmlstring
642
705
 
643
706
 
648
711
    dbus_object_path: dbus.ObjectPath
649
712
    bus: dbus.SystemBus()
650
713
    """
 
714
    
 
715
    runtime_expansions = (Client.runtime_expansions
 
716
                          + (u"dbus_object_path",))
 
717
    
651
718
    # dbus.service.Object doesn't use super(), so we can't either.
652
719
    
653
720
    def __init__(self, bus = None, *args, **kwargs):
 
721
        self._approvals_pending = 0
654
722
        self.bus = bus
655
723
        Client.__init__(self, *args, **kwargs)
656
724
        # Only now, when this client is initialized, can it show up on
657
725
        # the D-Bus
 
726
        client_object_name = unicode(self.name).translate(
 
727
            {ord(u"."): ord(u"_"),
 
728
             ord(u"-"): ord(u"_")})
658
729
        self.dbus_object_path = (dbus.ObjectPath
659
 
                                 (u"/clients/"
660
 
                                  + self.name.replace(u".", u"_")))
 
730
                                 (u"/clients/" + client_object_name))
661
731
        DBusObjectWithProperties.__init__(self, self.bus,
662
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
663
749
    
664
750
    @staticmethod
665
751
    def _datetime_to_dbus(dt, variant_level=0):
672
758
        r = Client.enable(self)
673
759
        if oldstate != self.enabled:
674
760
            # Emit D-Bus signals
675
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
676
762
                                 dbus.Boolean(True, variant_level=1))
677
763
            self.PropertyChanged(
678
 
                dbus.String(u"last_enabled"),
 
764
                dbus.String(u"LastEnabled"),
679
765
                self._datetime_to_dbus(self.last_enabled,
680
766
                                       variant_level=1))
681
767
        return r
682
768
    
683
 
    def disable(self, signal = True):
 
769
    def disable(self, quiet = False):
684
770
        oldstate = getattr(self, u"enabled", False)
685
 
        r = Client.disable(self)
686
 
        if signal and oldstate != self.enabled:
 
771
        r = Client.disable(self, quiet=quiet)
 
772
        if not quiet and oldstate != self.enabled:
687
773
            # Emit D-Bus signal
688
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
689
775
                                 dbus.Boolean(False, variant_level=1))
690
776
        return r
691
777
    
703
789
        self.checker_callback_tag = None
704
790
        self.checker = None
705
791
        # Emit D-Bus signal
706
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
707
793
                             dbus.Boolean(False, variant_level=1))
708
794
        if os.WIFEXITED(condition):
709
795
            exitstatus = os.WEXITSTATUS(condition)
724
810
        r = Client.checked_ok(self, *args, **kwargs)
725
811
        # Emit D-Bus signal
726
812
        self.PropertyChanged(
727
 
            dbus.String(u"last_checked_ok"),
 
813
            dbus.String(u"LastCheckedOK"),
728
814
            (self._datetime_to_dbus(self.last_checked_ok,
729
815
                                    variant_level=1)))
730
816
        return r
742
828
            # Emit D-Bus signal
743
829
            self.CheckerStarted(self.current_checker_command)
744
830
            self.PropertyChanged(
745
 
                dbus.String(u"checker_running"),
 
831
                dbus.String(u"CheckerRunning"),
746
832
                dbus.Boolean(True, variant_level=1))
747
833
        return r
748
834
    
751
837
        r = Client.stop_checker(self, *args, **kwargs)
752
838
        if (old_checker is not None
753
839
            and getattr(self, u"checker", None) is None):
754
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
755
841
                                 dbus.Boolean(False, variant_level=1))
756
842
        return r
757
 
    
758
 
    ## 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
759
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
760
858
    
761
 
    # CheckedOK - method
762
 
    @dbus.service.method(_interface)
763
 
    def CheckedOK(self):
764
 
        return self.checked_ok()
 
859
    ## Signals
765
860
    
766
861
    # CheckerCompleted - signal
767
862
    @dbus.service.signal(_interface, signature=u"nxs")
781
876
        "D-Bus signal"
782
877
        pass
783
878
    
784
 
    # ReceivedSecret - signal
 
879
    # GotSecret - signal
785
880
    @dbus.service.signal(_interface)
786
 
    def ReceivedSecret(self):
787
 
        "D-Bus signal"
 
881
    def GotSecret(self):
 
882
        """D-Bus signal
 
883
        Is sent after a successful transfer of secret from the Mandos
 
884
        server to mandos-client
 
885
        """
788
886
        pass
789
887
    
790
888
    # Rejected - signal
791
 
    @dbus.service.signal(_interface)
792
 
    def Rejected(self):
793
 
        "D-Bus signal"
794
 
        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()
795
911
    
796
912
    # Enable - method
797
913
    @dbus.service.method(_interface)
816
932
    def StopChecker(self):
817
933
        self.stop_checker()
818
934
    
819
 
    # 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
820
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
821
 
    def name_dbus_property(self):
 
978
    def Name_dbus_property(self):
822
979
        return dbus.String(self.name)
823
980
    
824
 
    # fingerprint - property
 
981
    # Fingerprint - property
825
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
826
 
    def fingerprint_dbus_property(self):
 
983
    def Fingerprint_dbus_property(self):
827
984
        return dbus.String(self.fingerprint)
828
985
    
829
 
    # host - property
 
986
    # Host - property
830
987
    @dbus_service_property(_interface, signature=u"s",
831
988
                           access=u"readwrite")
832
 
    def host_dbus_property(self, value=None):
 
989
    def Host_dbus_property(self, value=None):
833
990
        if value is None:       # get
834
991
            return dbus.String(self.host)
835
992
        self.host = value
836
993
        # Emit D-Bus signal
837
 
        self.PropertyChanged(dbus.String(u"host"),
 
994
        self.PropertyChanged(dbus.String(u"Host"),
838
995
                             dbus.String(value, variant_level=1))
839
996
    
840
 
    # created - property
 
997
    # Created - property
841
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
842
 
    def created_dbus_property(self):
 
999
    def Created_dbus_property(self):
843
1000
        return dbus.String(self._datetime_to_dbus(self.created))
844
1001
    
845
 
    # last_enabled - property
 
1002
    # LastEnabled - property
846
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
847
 
    def last_enabled_dbus_property(self):
 
1004
    def LastEnabled_dbus_property(self):
848
1005
        if self.last_enabled is None:
849
1006
            return dbus.String(u"")
850
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
851
1008
    
852
 
    # enabled - property
 
1009
    # Enabled - property
853
1010
    @dbus_service_property(_interface, signature=u"b",
854
1011
                           access=u"readwrite")
855
 
    def enabled_dbus_property(self, value=None):
 
1012
    def Enabled_dbus_property(self, value=None):
856
1013
        if value is None:       # get
857
1014
            return dbus.Boolean(self.enabled)
858
1015
        if value:
860
1017
        else:
861
1018
            self.disable()
862
1019
    
863
 
    # last_checked_ok - property
 
1020
    # LastCheckedOK - property
864
1021
    @dbus_service_property(_interface, signature=u"s",
865
1022
                           access=u"readwrite")
866
 
    def last_checked_ok_dbus_property(self, value=None):
 
1023
    def LastCheckedOK_dbus_property(self, value=None):
867
1024
        if value is not None:
868
1025
            self.checked_ok()
869
1026
            return
872
1029
        return dbus.String(self._datetime_to_dbus(self
873
1030
                                                  .last_checked_ok))
874
1031
    
875
 
    # timeout - property
 
1032
    # Timeout - property
876
1033
    @dbus_service_property(_interface, signature=u"t",
877
1034
                           access=u"readwrite")
878
 
    def timeout_dbus_property(self, value=None):
 
1035
    def Timeout_dbus_property(self, value=None):
879
1036
        if value is None:       # get
880
1037
            return dbus.UInt64(self.timeout_milliseconds())
881
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
882
1039
        # Emit D-Bus signal
883
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
884
1041
                             dbus.UInt64(value, variant_level=1))
885
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
886
1043
            return
900
1057
            self.disable_initiator_tag = (gobject.timeout_add
901
1058
                                          (time_to_die, self.disable))
902
1059
    
903
 
    # interval - property
 
1060
    # Interval - property
904
1061
    @dbus_service_property(_interface, signature=u"t",
905
1062
                           access=u"readwrite")
906
 
    def interval_dbus_property(self, value=None):
 
1063
    def Interval_dbus_property(self, value=None):
907
1064
        if value is None:       # get
908
1065
            return dbus.UInt64(self.interval_milliseconds())
909
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
910
1067
        # Emit D-Bus signal
911
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
912
1069
                             dbus.UInt64(value, variant_level=1))
913
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
914
1071
            return
918
1075
                                      (value, self.start_checker))
919
1076
        self.start_checker()    # Start one now, too
920
1077
 
921
 
    # checker - property
 
1078
    # Checker - property
922
1079
    @dbus_service_property(_interface, signature=u"s",
923
1080
                           access=u"readwrite")
924
 
    def checker_dbus_property(self, value=None):
 
1081
    def Checker_dbus_property(self, value=None):
925
1082
        if value is None:       # get
926
1083
            return dbus.String(self.checker_command)
927
1084
        self.checker_command = value
928
1085
        # Emit D-Bus signal
929
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
930
1087
                             dbus.String(self.checker_command,
931
1088
                                         variant_level=1))
932
1089
    
933
 
    # checker_running - property
 
1090
    # CheckerRunning - property
934
1091
    @dbus_service_property(_interface, signature=u"b",
935
1092
                           access=u"readwrite")
936
 
    def checker_running_dbus_property(self, value=None):
 
1093
    def CheckerRunning_dbus_property(self, value=None):
937
1094
        if value is None:       # get
938
1095
            return dbus.Boolean(self.checker is not None)
939
1096
        if value:
941
1098
        else:
942
1099
            self.stop_checker()
943
1100
    
944
 
    # object_path - property
 
1101
    # ObjectPath - property
945
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
946
 
    def object_path_dbus_property(self):
 
1103
    def ObjectPath_dbus_property(self):
947
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
948
1105
    
949
 
    # secret = property
 
1106
    # Secret = property
950
1107
    @dbus_service_property(_interface, signature=u"ay",
951
1108
                           access=u"write", byte_arrays=True)
952
 
    def secret_dbus_property(self, value):
 
1109
    def Secret_dbus_property(self, value):
953
1110
        self.secret = str(value)
954
1111
    
955
1112
    del _interface
956
1113
 
957
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
 
958
1141
class ClientHandler(socketserver.BaseRequestHandler, object):
959
1142
    """A class to handle client connections.
960
1143
    
962
1145
    Note: This will run in its own forked process."""
963
1146
    
964
1147
    def handle(self):
965
 
        logger.info(u"TCP connection from: %s",
966
 
                    unicode(self.client_address))
967
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
968
 
        # Open IPC pipe to parent process
969
 
        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
 
970
1154
            session = (gnutls.connection
971
1155
                       .ClientSession(self.request,
972
1156
                                      gnutls.connection
973
1157
                                      .X509Credentials()))
974
 
            
975
 
            line = self.request.makefile().readline()
976
 
            logger.debug(u"Protocol version: %r", line)
977
 
            try:
978
 
                if int(line.strip().split()[0]) > 1:
979
 
                    raise RuntimeError
980
 
            except (ValueError, IndexError, RuntimeError), error:
981
 
                logger.error(u"Unknown protocol version: %s", error)
982
 
                return
983
 
            
 
1158
 
984
1159
            # Note: gnutls.connection.X509Credentials is really a
985
1160
            # generic GnuTLS certificate credentials object so long as
986
1161
            # no X.509 keys are added to it.  Therefore, we can use it
987
1162
            # here despite using OpenPGP certificates.
988
 
            
 
1163
 
989
1164
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
990
1165
            #                      u"+AES-256-CBC", u"+SHA1",
991
1166
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
997
1172
            (gnutls.library.functions
998
1173
             .gnutls_priority_set_direct(session._c_object,
999
1174
                                         priority, None))
1000
 
            
 
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
1001
1188
            try:
1002
1189
                session.handshake()
1003
1190
            except gnutls.errors.GNUTLSError, error:
1006
1193
                # established.  Just abandon the request.
1007
1194
                return
1008
1195
            logger.debug(u"Handshake succeeded")
 
1196
 
 
1197
            approval_required = False
1009
1198
            try:
1010
 
                fpr = self.fingerprint(self.peer_certificate(session))
1011
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1012
 
                logger.warning(u"Bad certificate: %s", error)
1013
 
                session.bye()
1014
 
                return
1015
 
            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()
1016
1285
            
1017
 
            for c in self.server.clients:
1018
 
                if c.fingerprint == fpr:
1019
 
                    client = c
1020
 
                    break
1021
 
            else:
1022
 
                ipc.write(u"NOTFOUND %s %s\n"
1023
 
                          % (fpr, unicode(self.client_address)))
1024
 
                session.bye()
1025
 
                return
1026
 
            # Have to check if client.still_valid(), since it is
1027
 
            # possible that the client timed out while establishing
1028
 
            # the GnuTLS session.
1029
 
            if not client.still_valid():
1030
 
                ipc.write(u"INVALID %s\n" % client.name)
1031
 
                session.bye()
1032
 
                return
1033
 
            ipc.write(u"SENDING %s\n" % client.name)
1034
 
            sent_size = 0
1035
 
            while sent_size < len(client.secret):
1036
 
                sent = session.send(client.secret[sent_size:])
1037
 
                logger.debug(u"Sent: %d, remaining: %d",
1038
 
                             sent, len(client.secret)
1039
 
                             - (sent_size + sent))
1040
 
                sent_size += sent
1041
 
            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")
1042
1293
    
1043
1294
    @staticmethod
1044
1295
    def peer_certificate(session):
1104
1355
        return hex_fpr
1105
1356
 
1106
1357
 
1107
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1108
 
    """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 """
1109
1374
    def process_request(self, request, client_address):
1110
1375
        """Overrides and wraps the original process_request().
1111
1376
        
1112
1377
        This function creates a new pipe in self.pipe
1113
1378
        """
1114
 
        self.pipe = os.pipe()
1115
 
        super(ForkingMixInWithPipe,
 
1379
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1380
 
 
1381
        super(MultiprocessingMixInWithPipe,
1116
1382
              self).process_request(request, client_address)
1117
 
        os.close(self.pipe[1])  # close write end
1118
 
        self.add_pipe(self.pipe[0])
1119
 
    def add_pipe(self, pipe):
 
1383
        self.child_pipe.close()
 
1384
        self.add_pipe(parent_pipe)
 
1385
 
 
1386
    def add_pipe(self, parent_pipe):
1120
1387
        """Dummy function; override as necessary"""
1121
 
        os.close(pipe)
1122
 
 
1123
 
 
1124
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1388
        pass
 
1389
 
 
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1125
1391
                     socketserver.TCPServer, object):
1126
1392
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1127
1393
    
1212
1478
            return socketserver.TCPServer.server_activate(self)
1213
1479
    def enable(self):
1214
1480
        self.enabled = True
1215
 
    def add_pipe(self, pipe):
 
1481
    def add_pipe(self, parent_pipe):
1216
1482
        # Call "handle_ipc" for both data and EOF events
1217
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1218
 
                             self.handle_ipc)
1219
 
    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):
1220
1490
        condition_names = {
1221
1491
            gobject.IO_IN: u"IN",   # There is data to read.
1222
1492
            gobject.IO_OUT: u"OUT", # Data can be written (without
1231
1501
                                       for cond, name in
1232
1502
                                       condition_names.iteritems()
1233
1503
                                       if cond & condition)
1234
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1235
 
                     conditions_string)
1236
 
        
1237
 
        # Turn the pipe file descriptor into a Python file object
1238
 
        if source not in file_objects:
1239
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1240
 
        
1241
 
        # Read a line from the file object
1242
 
        cmdline = file_objects[source].readline()
1243
 
        if not cmdline:             # Empty line means end of file
1244
 
            # close the IPC pipe
1245
 
            file_objects[source].close()
1246
 
            del file_objects[source]
1247
 
            
1248
 
            # Stop calling this function
1249
 
            return False
1250
 
        
1251
 
        logger.debug(u"IPC command: %r", cmdline)
1252
 
        
1253
 
        # Parse and act on command
1254
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1255
 
        
1256
 
        if cmd == u"NOTFOUND":
1257
 
            logger.warning(u"Client not found for fingerprint: %s",
1258
 
                           args)
1259
 
            if self.use_dbus:
1260
 
                # Emit D-Bus signal
1261
 
                mandos_dbus_service.ClientNotFound(args)
1262
 
        elif cmd == u"INVALID":
1263
 
            for client in self.clients:
1264
 
                if client.name == args:
1265
 
                    logger.warning(u"Client %s is invalid", args)
1266
 
                    if self.use_dbus:
1267
 
                        # Emit D-Bus signal
1268
 
                        client.Rejected()
1269
 
                    break
1270
 
            else:
1271
 
                logger.error(u"Unknown client %s is invalid", args)
1272
 
        elif cmd == u"SENDING":
1273
 
            for client in self.clients:
1274
 
                if client.name == args:
1275
 
                    logger.info(u"Sending secret to %s", client.name)
1276
 
                    client.checked_ok()
1277
 
                    if self.use_dbus:
1278
 
                        # Emit D-Bus signal
1279
 
                        client.ReceivedSecret()
1280
 
                    break
1281
 
            else:
1282
 
                logger.error(u"Sending secret to unknown client %s",
1283
 
                             args)
1284
 
        else:
1285
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1286
 
        
1287
 
        # 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
 
1288
1556
        return True
1289
1557
 
1290
1558
 
1320
1588
            elif suffix == u"w":
1321
1589
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1322
1590
            else:
1323
 
                raise ValueError
1324
 
        except (ValueError, IndexError):
1325
 
            raise ValueError
 
1591
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1592
        except (ValueError, IndexError), e:
 
1593
            raise ValueError(e.message)
1326
1594
        timevalue += delta
1327
1595
    return timevalue
1328
1596
 
1341
1609
        def if_nametoindex(interface):
1342
1610
            "Get an interface index the hard way, i.e. using fcntl()"
1343
1611
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1344
 
            with closing(socket.socket()) as s:
 
1612
            with contextlib.closing(socket.socket()) as s:
1345
1613
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1346
1614
                                    struct.pack(str(u"16s16x"),
1347
1615
                                                interface))
1367
1635
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1368
1636
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1369
1637
            raise OSError(errno.ENODEV,
1370
 
                          u"/dev/null not a character device")
 
1638
                          u"%s not a character device"
 
1639
                          % os.path.devnull)
1371
1640
        os.dup2(null, sys.stdin.fileno())
1372
1641
        os.dup2(null, sys.stdout.fileno())
1373
1642
        os.dup2(null, sys.stderr.fileno())
1392
1661
    parser.add_option("--debug", action=u"store_true",
1393
1662
                      help=u"Debug mode; run in foreground and log to"
1394
1663
                      u" terminal")
 
1664
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1665
                      help=u"Debug level for stdout output")
1395
1666
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1396
1667
                      u" priority string (see GnuTLS documentation)")
1397
1668
    parser.add_option("--servicename", type=u"string",
1422
1693
                        u"servicename": u"Mandos",
1423
1694
                        u"use_dbus": u"True",
1424
1695
                        u"use_ipv6": u"True",
 
1696
                        u"debuglevel": u"",
1425
1697
                        }
1426
1698
    
1427
1699
    # Parse config file for server-global settings
1444
1716
    # options, if set.
1445
1717
    for option in (u"interface", u"address", u"port", u"debug",
1446
1718
                   u"priority", u"servicename", u"configdir",
1447
 
                   u"use_dbus", u"use_ipv6"):
 
1719
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1448
1720
        value = getattr(options, option)
1449
1721
        if value is not None:
1450
1722
            server_settings[option] = value
1459
1731
    
1460
1732
    # For convenience
1461
1733
    debug = server_settings[u"debug"]
 
1734
    debuglevel = server_settings[u"debuglevel"]
1462
1735
    use_dbus = server_settings[u"use_dbus"]
1463
1736
    use_ipv6 = server_settings[u"use_ipv6"]
1464
 
    
1465
 
    if not debug:
1466
 
        syslogger.setLevel(logging.WARNING)
1467
 
        console.setLevel(logging.WARNING)
1468
 
    
 
1737
 
1469
1738
    if server_settings[u"servicename"] != u"Mandos":
1470
1739
        syslogger.setFormatter(logging.Formatter
1471
1740
                               (u'Mandos (%s) [%%(process)d]:'
1477
1746
                        u"interval": u"5m",
1478
1747
                        u"checker": u"fping -q -- %%(host)s",
1479
1748
                        u"host": u"",
 
1749
                        u"approval_delay": u"0s",
 
1750
                        u"approval_duration": u"1s",
1480
1751
                        }
1481
1752
    client_config = configparser.SafeConfigParser(client_defaults)
1482
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
1488
1759
    tcp_server = MandosServer((server_settings[u"address"],
1489
1760
                               server_settings[u"port"]),
1490
1761
                              ClientHandler,
1491
 
                              interface=server_settings[u"interface"],
 
1762
                              interface=(server_settings[u"interface"]
 
1763
                                         or None),
1492
1764
                              use_ipv6=use_ipv6,
1493
1765
                              gnutls_priority=
1494
1766
                              server_settings[u"priority"],
1495
1767
                              use_dbus=use_dbus)
1496
 
    pidfilename = u"/var/run/mandos.pid"
1497
 
    try:
1498
 
        pidfile = open(pidfilename, u"w")
1499
 
    except IOError:
1500
 
        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)
1501
1774
    
1502
1775
    try:
1503
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
1520
1793
        if error[0] != errno.EPERM:
1521
1794
            raise error
1522
1795
    
1523
 
    # 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
 
1524
1804
    if debug:
 
1805
        # Enable all possible GnuTLS debugging
 
1806
        
1525
1807
        # "Use a log level over 10 to enable all debugging options."
1526
1808
        # - GnuTLS manual
1527
1809
        gnutls.library.functions.gnutls_global_set_log_level(11)
1532
1814
        
1533
1815
        (gnutls.library.functions
1534
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
    
1535
1827
    
1536
1828
    global main_loop
1537
1829
    # From the Avahi example code
1540
1832
    bus = dbus.SystemBus()
1541
1833
    # End of Avahi example code
1542
1834
    if use_dbus:
1543
 
        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
1544
1843
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1545
1844
    service = AvahiService(name = server_settings[u"servicename"],
1546
1845
                           servicetype = u"_mandos._tcp",
1548
1847
    if server_settings["interface"]:
1549
1848
        service.interface = (if_nametoindex
1550
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()
1551
1857
    
1552
1858
    client_class = Client
1553
1859
    if use_dbus:
1554
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
    
1555
1873
    tcp_server.clients.update(set(
1556
1874
            client_class(name = section,
1557
 
                         config= dict(client_config.items(section)))
 
1875
                         config= dict(client_config_items(
 
1876
                        client_config, section)))
1558
1877
            for section in client_config.sections()))
1559
1878
    if not tcp_server.clients:
1560
1879
        logger.warning(u"No clients defined")
1561
 
    
1562
 
    if debug:
1563
 
        # Redirect stdin so all checkers get /dev/null
1564
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1565
 
        os.dup2(null, sys.stdin.fileno())
1566
 
        if null > 2:
1567
 
            os.close(null)
1568
 
    else:
1569
 
        # No console logging
1570
 
        logger.removeHandler(console)
1571
 
        # Close all input and output, do double fork, etc.
1572
 
        daemon()
1573
 
    
1574
 
    try:
1575
 
        with closing(pidfile):
1576
 
            pid = os.getpid()
1577
 
            pidfile.write(str(pid) + "\n")
1578
 
        del pidfile
1579
 
    except IOError:
1580
 
        logger.error(u"Could not write to file %r with PID %d",
1581
 
                     pidfilename, pid)
1582
 
    except NameError:
1583
 
        # "pidfile" was never created
1584
 
        pass
1585
 
    del pidfilename
1586
 
    
1587
 
    def cleanup():
1588
 
        "Cleanup function; run on exit"
1589
 
        service.cleanup()
1590
1880
        
1591
 
        while tcp_server.clients:
1592
 
            client = tcp_server.clients.pop()
1593
 
            client.disable_hook = None
1594
 
            client.disable()
1595
 
    
1596
 
    atexit.register(cleanup)
1597
 
    
1598
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
        
1599
1895
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1896
 
1600
1897
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1601
1898
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1602
1899
    
1607
1904
                dbus.service.Object.__init__(self, bus, u"/")
1608
1905
            _interface = u"se.bsnet.fukt.Mandos"
1609
1906
            
1610
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1611
 
            def ClientAdded(self, objpath, properties):
 
1907
            @dbus.service.signal(_interface, signature=u"o")
 
1908
            def ClientAdded(self, objpath):
1612
1909
                "D-Bus signal"
1613
1910
                pass
1614
1911
            
1615
 
            @dbus.service.signal(_interface, signature=u"s")
1616
 
            def ClientNotFound(self, fingerprint):
 
1912
            @dbus.service.signal(_interface, signature=u"ss")
 
1913
            def ClientNotFound(self, fingerprint, address):
1617
1914
                "D-Bus signal"
1618
1915
                pass
1619
1916
            
1645
1942
                        tcp_server.clients.remove(c)
1646
1943
                        c.remove_from_connection()
1647
1944
                        # Don't signal anything except ClientRemoved
1648
 
                        c.disable(signal=False)
 
1945
                        c.disable(quiet=True)
1649
1946
                        # Emit D-Bus signal
1650
1947
                        self.ClientRemoved(object_path, c.name)
1651
1948
                        return
1652
 
                raise KeyError
 
1949
                raise KeyError(object_path)
1653
1950
            
1654
1951
            del _interface
1655
1952
        
1656
1953
        mandos_dbus_service = MandosDBusService()
1657
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
    
1658
1973
    for client in tcp_server.clients:
1659
1974
        if use_dbus:
1660
1975
            # Emit D-Bus signal
1661
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1662
 
                                            client.GetAll(u""))
 
1976
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1663
1977
        client.enable()
1664
1978
    
1665
1979
    tcp_server.enable()
1683
1997
            service.activate()
1684
1998
        except dbus.exceptions.DBusException, error:
1685
1999
            logger.critical(u"DBusException: %s", error)
 
2000
            cleanup()
1686
2001
            sys.exit(1)
1687
2002
        # End of Avahi example code
1688
2003
        
1695
2010
        main_loop.run()
1696
2011
    except AvahiError, error:
1697
2012
        logger.critical(u"AvahiError: %s", error)
 
2013
        cleanup()
1698
2014
        sys.exit(1)
1699
2015
    except KeyboardInterrupt:
1700
2016
        if debug:
1701
2017
            print >> sys.stderr
1702
2018
        logger.debug(u"Server received KeyboardInterrupt")
1703
2019
    logger.debug(u"Server exiting")
 
2020
    # Must run before the D-Bus bus name gets deregistered
 
2021
    cleanup()
1704
2022
 
1705
2023
if __name__ == '__main__':
1706
2024
    main()