/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

* plugins.d/mandos-client.c: Some white space fixes.
  (runnable_hook): Simplify name rule.  More debug messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2010 Teddy Hogeborn
15
 
# Copyright © 2008-2010 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, absolute_import, unicode_literals
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
61
62
import functools
62
63
import cPickle as pickle
63
64
import multiprocessing
 
65
import types
64
66
 
65
67
import dbus
66
68
import dbus.service
81
83
        SO_BINDTODEVICE = None
82
84
 
83
85
 
84
 
version = "1.2.3"
 
86
version = "1.4.1"
85
87
 
86
88
#logger = logging.getLogger('mandos')
87
89
logger = logging.Logger('mandos')
88
90
syslogger = (logging.handlers.SysLogHandler
89
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
 
92
              address = str("/dev/log")))
91
93
syslogger.setFormatter(logging.Formatter
92
94
                       ('Mandos [%(process)d]: %(levelname)s:'
93
95
                        ' %(message)s'))
150
152
        self.group = None       # our entry group
151
153
        self.server = None
152
154
        self.bus = bus
 
155
        self.entry_group_state_changed_match = None
153
156
    def rename(self):
154
157
        """Derived from the Avahi example code"""
155
158
        if self.rename_count >= self.max_renames:
157
160
                            " after %i retries, exiting.",
158
161
                            self.rename_count)
159
162
            raise AvahiServiceError("Too many renames")
160
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
163
        self.name = unicode(self.server
 
164
                            .GetAlternativeServiceName(self.name))
161
165
        logger.info("Changing Zeroconf service name to %r ...",
162
166
                    self.name)
163
167
        syslogger.setFormatter(logging.Formatter
167
171
        self.remove()
168
172
        try:
169
173
            self.add()
170
 
        except dbus.exceptions.DBusException, error:
 
174
        except dbus.exceptions.DBusException as error:
171
175
            logger.critical("DBusException: %s", error)
172
176
            self.cleanup()
173
177
            os._exit(1)
174
178
        self.rename_count += 1
175
179
    def remove(self):
176
180
        """Derived from the Avahi example code"""
 
181
        if self.entry_group_state_changed_match is not None:
 
182
            self.entry_group_state_changed_match.remove()
 
183
            self.entry_group_state_changed_match = None
177
184
        if self.group is not None:
178
185
            self.group.Reset()
179
186
    def add(self):
180
187
        """Derived from the Avahi example code"""
 
188
        self.remove()
181
189
        if self.group is None:
182
190
            self.group = dbus.Interface(
183
191
                self.bus.get_object(avahi.DBUS_NAME,
184
192
                                    self.server.EntryGroupNew()),
185
193
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
 
            self.group.connect_to_signal('StateChanged',
187
 
                                         self
188
 
                                         .entry_group_state_changed)
 
194
        self.entry_group_state_changed_match = (
 
195
            self.group.connect_to_signal(
 
196
                'StateChanged', self .entry_group_state_changed))
189
197
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
198
                     self.name, self.type)
191
199
        self.group.AddService(
214
222
    def cleanup(self):
215
223
        """Derived from the Avahi example code"""
216
224
        if self.group is not None:
217
 
            self.group.Free()
 
225
            try:
 
226
                self.group.Free()
 
227
            except (dbus.exceptions.UnknownMethodException,
 
228
                    dbus.exceptions.DBusException) as e:
 
229
                pass
218
230
            self.group = None
219
 
    def server_state_changed(self, state):
 
231
        self.remove()
 
232
    def server_state_changed(self, state, error=None):
220
233
        """Derived from the Avahi example code"""
221
234
        logger.debug("Avahi server state change: %i", state)
222
 
        if state == avahi.SERVER_COLLISION:
223
 
            logger.error("Zeroconf server name collision")
224
 
            self.remove()
 
235
        bad_states = { avahi.SERVER_INVALID:
 
236
                           "Zeroconf server invalid",
 
237
                       avahi.SERVER_REGISTERING: None,
 
238
                       avahi.SERVER_COLLISION:
 
239
                           "Zeroconf server name collision",
 
240
                       avahi.SERVER_FAILURE:
 
241
                           "Zeroconf server failure" }
 
242
        if state in bad_states:
 
243
            if bad_states[state] is not None:
 
244
                if error is None:
 
245
                    logger.error(bad_states[state])
 
246
                else:
 
247
                    logger.error(bad_states[state] + ": %r", error)
 
248
            self.cleanup()
225
249
        elif state == avahi.SERVER_RUNNING:
226
250
            self.add()
 
251
        else:
 
252
            if error is None:
 
253
                logger.debug("Unknown state: %r", state)
 
254
            else:
 
255
                logger.debug("Unknown state: %r: %r", state, error)
227
256
    def activate(self):
228
257
        """Derived from the Avahi example code"""
229
258
        if self.server is None:
230
259
            self.server = dbus.Interface(
231
260
                self.bus.get_object(avahi.DBUS_NAME,
232
 
                                    avahi.DBUS_PATH_SERVER),
 
261
                                    avahi.DBUS_PATH_SERVER,
 
262
                                    follow_name_owner_changes=True),
233
263
                avahi.DBUS_INTERFACE_SERVER)
234
264
        self.server.connect_to_signal("StateChanged",
235
265
                                 self.server_state_changed)
236
266
        self.server_state_changed(self.server.GetState())
237
267
 
238
268
 
 
269
def _timedelta_to_milliseconds(td):
 
270
    "Convert a datetime.timedelta() to milliseconds"
 
271
    return ((td.days * 24 * 60 * 60 * 1000)
 
272
            + (td.seconds * 1000)
 
273
            + (td.microseconds // 1000))
 
274
        
239
275
class Client(object):
240
276
    """A representation of a client host served by this server.
241
277
    
269
305
    secret:     bytestring; sent verbatim (over TLS) to client
270
306
    timeout:    datetime.timedelta(); How long from last_checked_ok
271
307
                                      until this client is disabled
 
308
    extended_timeout:   extra long timeout when password has been sent
272
309
    runtime_expansions: Allowed attributes for runtime expansion.
 
310
    expires:    datetime.datetime(); time (UTC) when a client will be
 
311
                disabled, or None
273
312
    """
274
313
    
275
314
    runtime_expansions = ("approval_delay", "approval_duration",
277
316
                          "host", "interval", "last_checked_ok",
278
317
                          "last_enabled", "name", "timeout")
279
318
    
280
 
    @staticmethod
281
 
    def _timedelta_to_milliseconds(td):
282
 
        "Convert a datetime.timedelta() to milliseconds"
283
 
        return ((td.days * 24 * 60 * 60 * 1000)
284
 
                + (td.seconds * 1000)
285
 
                + (td.microseconds // 1000))
286
 
    
287
319
    def timeout_milliseconds(self):
288
320
        "Return the 'timeout' attribute in milliseconds"
289
 
        return self._timedelta_to_milliseconds(self.timeout)
 
321
        return _timedelta_to_milliseconds(self.timeout)
 
322
    
 
323
    def extended_timeout_milliseconds(self):
 
324
        "Return the 'extended_timeout' attribute in milliseconds"
 
325
        return _timedelta_to_milliseconds(self.extended_timeout)
290
326
    
291
327
    def interval_milliseconds(self):
292
328
        "Return the 'interval' attribute in milliseconds"
293
 
        return self._timedelta_to_milliseconds(self.interval)
294
 
 
 
329
        return _timedelta_to_milliseconds(self.interval)
 
330
    
295
331
    def approval_delay_milliseconds(self):
296
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
332
        return _timedelta_to_milliseconds(self.approval_delay)
297
333
    
298
334
    def __init__(self, name = None, disable_hook=None, config=None):
299
335
        """Note: the 'checker' key in 'config' sets the
326
362
        self.last_enabled = None
327
363
        self.last_checked_ok = None
328
364
        self.timeout = string_to_delta(config["timeout"])
 
365
        self.extended_timeout = string_to_delta(config
 
366
                                                ["extended_timeout"])
329
367
        self.interval = string_to_delta(config["interval"])
330
368
        self.disable_hook = disable_hook
331
369
        self.checker = None
332
370
        self.checker_initiator_tag = None
333
371
        self.disable_initiator_tag = None
 
372
        self.expires = None
334
373
        self.checker_callback_tag = None
335
374
        self.checker_command = config["checker"]
336
375
        self.current_checker_command = None
343
382
            config["approval_delay"])
344
383
        self.approval_duration = string_to_delta(
345
384
            config["approval_duration"])
346
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
385
        self.changedstate = (multiprocessing_manager
 
386
                             .Condition(multiprocessing_manager
 
387
                                        .Lock()))
347
388
    
348
389
    def send_changedstate(self):
349
390
        self.changedstate.acquire()
350
391
        self.changedstate.notify_all()
351
392
        self.changedstate.release()
352
 
        
 
393
    
353
394
    def enable(self):
354
395
        """Start this client's checker and timeout hooks"""
355
396
        if getattr(self, "enabled", False):
356
397
            # Already enabled
357
398
            return
358
399
        self.send_changedstate()
359
 
        self.last_enabled = datetime.datetime.utcnow()
360
400
        # Schedule a new checker to be started an 'interval' from now,
361
401
        # and every interval from then on.
362
402
        self.checker_initiator_tag = (gobject.timeout_add
363
403
                                      (self.interval_milliseconds(),
364
404
                                       self.start_checker))
365
405
        # Schedule a disable() when 'timeout' has passed
 
406
        self.expires = datetime.datetime.utcnow() + self.timeout
366
407
        self.disable_initiator_tag = (gobject.timeout_add
367
408
                                   (self.timeout_milliseconds(),
368
409
                                    self.disable))
369
410
        self.enabled = True
 
411
        self.last_enabled = datetime.datetime.utcnow()
370
412
        # Also start a new checker *right now*.
371
413
        self.start_checker()
372
414
    
381
423
        if getattr(self, "disable_initiator_tag", False):
382
424
            gobject.source_remove(self.disable_initiator_tag)
383
425
            self.disable_initiator_tag = None
 
426
        self.expires = None
384
427
        if getattr(self, "checker_initiator_tag", False):
385
428
            gobject.source_remove(self.checker_initiator_tag)
386
429
            self.checker_initiator_tag = None
412
455
            logger.warning("Checker for %(name)s crashed?",
413
456
                           vars(self))
414
457
    
415
 
    def checked_ok(self):
 
458
    def checked_ok(self, timeout=None):
416
459
        """Bump up the timeout for this client.
417
460
        
418
461
        This should only be called when the client has been seen,
419
462
        alive and well.
420
463
        """
 
464
        if timeout is None:
 
465
            timeout = self.timeout
421
466
        self.last_checked_ok = datetime.datetime.utcnow()
422
 
        gobject.source_remove(self.disable_initiator_tag)
423
 
        self.disable_initiator_tag = (gobject.timeout_add
424
 
                                      (self.timeout_milliseconds(),
425
 
                                       self.disable))
 
467
        if self.disable_initiator_tag is not None:
 
468
            gobject.source_remove(self.disable_initiator_tag)
 
469
        if getattr(self, "enabled", False):
 
470
            self.disable_initiator_tag = (gobject.timeout_add
 
471
                                          (_timedelta_to_milliseconds
 
472
                                           (timeout), self.disable))
 
473
            self.expires = datetime.datetime.utcnow() + timeout
426
474
    
427
475
    def need_approval(self):
428
476
        self.last_approval_request = datetime.datetime.utcnow()
444
492
        # If a checker exists, make sure it is not a zombie
445
493
        try:
446
494
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
447
 
        except (AttributeError, OSError), error:
 
495
        except (AttributeError, OSError) as error:
448
496
            if (isinstance(error, OSError)
449
497
                and error.errno != errno.ECHILD):
450
498
                raise error
468
516
                                       'replace')))
469
517
                    for attr in
470
518
                    self.runtime_expansions)
471
 
 
 
519
                
472
520
                try:
473
521
                    command = self.checker_command % escaped_attrs
474
 
                except TypeError, error:
 
522
                except TypeError as error:
475
523
                    logger.error('Could not format string "%s":'
476
524
                                 ' %s', self.checker_command, error)
477
525
                    return True # Try again later
496
544
                if pid:
497
545
                    gobject.source_remove(self.checker_callback_tag)
498
546
                    self.checker_callback(pid, status, command)
499
 
            except OSError, error:
 
547
            except OSError as error:
500
548
                logger.error("Failed to start subprocess: %s",
501
549
                             error)
502
550
        # Re-run this periodically if run by gobject.timeout_add
515
563
            #time.sleep(0.5)
516
564
            #if self.checker.poll() is None:
517
565
            #    os.kill(self.checker.pid, signal.SIGKILL)
518
 
        except OSError, error:
 
566
        except OSError as error:
519
567
            if error.errno != errno.ESRCH: # No such process
520
568
                raise
521
569
        self.checker = None
522
570
 
 
571
 
523
572
def dbus_service_property(dbus_interface, signature="v",
524
573
                          access="readwrite", byte_arrays=False):
525
574
    """Decorators for marking methods of a DBusObjectWithProperties to
571
620
 
572
621
class DBusObjectWithProperties(dbus.service.Object):
573
622
    """A D-Bus object with properties.
574
 
 
 
623
    
575
624
    Classes inheriting from this can use the dbus_service_property
576
625
    decorator to expose methods as D-Bus properties.  It exposes the
577
626
    standard Get(), Set(), and GetAll() methods on the D-Bus.
584
633
    def _get_all_dbus_properties(self):
585
634
        """Returns a generator of (name, attribute) pairs
586
635
        """
587
 
        return ((prop._dbus_name, prop)
 
636
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
637
                for cls in self.__class__.__mro__
588
638
                for name, prop in
589
 
                inspect.getmembers(self, self._is_dbus_property))
 
639
                inspect.getmembers(cls, self._is_dbus_property))
590
640
    
591
641
    def _get_dbus_property(self, interface_name, property_name):
592
642
        """Returns a bound method if one exists which is a D-Bus
593
643
        property with the specified name and interface.
594
644
        """
595
 
        for name in (property_name,
596
 
                     property_name + "_dbus_property"):
597
 
            prop = getattr(self, name, None)
598
 
            if (prop is None
599
 
                or not self._is_dbus_property(prop)
600
 
                or prop._dbus_name != property_name
601
 
                or (interface_name and prop._dbus_interface
602
 
                    and interface_name != prop._dbus_interface)):
603
 
                continue
604
 
            return prop
 
645
        for cls in  self.__class__.__mro__:
 
646
            for name, value in (inspect.getmembers
 
647
                                (cls, self._is_dbus_property)):
 
648
                if (value._dbus_name == property_name
 
649
                    and value._dbus_interface == interface_name):
 
650
                    return value.__get__(self)
 
651
        
605
652
        # No such property
606
653
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
607
654
                                   + interface_name + "."
641
688
    def GetAll(self, interface_name):
642
689
        """Standard D-Bus property GetAll() method, see D-Bus
643
690
        standard.
644
 
 
 
691
        
645
692
        Note: Will not include properties with access="write".
646
693
        """
647
694
        all = {}
703
750
            xmlstring = document.toxml("utf-8")
704
751
            document.unlink()
705
752
        except (AttributeError, xml.dom.DOMException,
706
 
                xml.parsers.expat.ExpatError), error:
 
753
                xml.parsers.expat.ExpatError) as error:
707
754
            logger.error("Failed to override Introspection method",
708
755
                         error)
709
756
        return xmlstring
710
757
 
711
758
 
 
759
def datetime_to_dbus (dt, variant_level=0):
 
760
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
761
    if dt is None:
 
762
        return dbus.String("", variant_level = variant_level)
 
763
    return dbus.String(dt.isoformat(),
 
764
                       variant_level=variant_level)
 
765
 
 
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
767
                                  .__metaclass__):
 
768
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
769
    will add additional D-Bus attributes matching a certain pattern.
 
770
    """
 
771
    def __new__(mcs, name, bases, attr):
 
772
        # Go through all the base classes which could have D-Bus
 
773
        # methods, signals, or properties in them
 
774
        for base in (b for b in bases
 
775
                     if issubclass(b, dbus.service.Object)):
 
776
            # Go though all attributes of the base class
 
777
            for attrname, attribute in inspect.getmembers(base):
 
778
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
779
                # with the wrong interface name
 
780
                if (not hasattr(attribute, "_dbus_interface")
 
781
                    or not attribute._dbus_interface
 
782
                    .startswith("se.recompile.Mandos")):
 
783
                    continue
 
784
                # Create an alternate D-Bus interface name based on
 
785
                # the current name
 
786
                alt_interface = (attribute._dbus_interface
 
787
                                 .replace("se.recompile.Mandos",
 
788
                                          "se.bsnet.fukt.Mandos"))
 
789
                # Is this a D-Bus signal?
 
790
                if getattr(attribute, "_dbus_is_signal", False):
 
791
                    # Extract the original non-method function by
 
792
                    # black magic
 
793
                    nonmethod_func = (dict(
 
794
                            zip(attribute.func_code.co_freevars,
 
795
                                attribute.__closure__))["func"]
 
796
                                      .cell_contents)
 
797
                    # Create a new, but exactly alike, function
 
798
                    # object, and decorate it to be a new D-Bus signal
 
799
                    # with the alternate D-Bus interface name
 
800
                    new_function = (dbus.service.signal
 
801
                                    (alt_interface,
 
802
                                     attribute._dbus_signature)
 
803
                                    (types.FunctionType(
 
804
                                nonmethod_func.func_code,
 
805
                                nonmethod_func.func_globals,
 
806
                                nonmethod_func.func_name,
 
807
                                nonmethod_func.func_defaults,
 
808
                                nonmethod_func.func_closure)))
 
809
                    # Define a creator of a function to call both the
 
810
                    # old and new functions, so both the old and new
 
811
                    # signals gets sent when the function is called
 
812
                    def fixscope(func1, func2):
 
813
                        """This function is a scope container to pass
 
814
                        func1 and func2 to the "call_both" function
 
815
                        outside of its arguments"""
 
816
                        def call_both(*args, **kwargs):
 
817
                            """This function will emit two D-Bus
 
818
                            signals by calling func1 and func2"""
 
819
                            func1(*args, **kwargs)
 
820
                            func2(*args, **kwargs)
 
821
                        return call_both
 
822
                    # Create the "call_both" function and add it to
 
823
                    # the class
 
824
                    attr[attrname] = fixscope(attribute,
 
825
                                              new_function)
 
826
                # Is this a D-Bus method?
 
827
                elif getattr(attribute, "_dbus_is_method", False):
 
828
                    # Create a new, but exactly alike, function
 
829
                    # object.  Decorate it to be a new D-Bus method
 
830
                    # with the alternate D-Bus interface name.  Add it
 
831
                    # to the class.
 
832
                    attr[attrname] = (dbus.service.method
 
833
                                      (alt_interface,
 
834
                                       attribute._dbus_in_signature,
 
835
                                       attribute._dbus_out_signature)
 
836
                                      (types.FunctionType
 
837
                                       (attribute.func_code,
 
838
                                        attribute.func_globals,
 
839
                                        attribute.func_name,
 
840
                                        attribute.func_defaults,
 
841
                                        attribute.func_closure)))
 
842
                # Is this a D-Bus property?
 
843
                elif getattr(attribute, "_dbus_is_property", False):
 
844
                    # Create a new, but exactly alike, function
 
845
                    # object, and decorate it to be a new D-Bus
 
846
                    # property with the alternate D-Bus interface
 
847
                    # name.  Add it to the class.
 
848
                    attr[attrname] = (dbus_service_property
 
849
                                      (alt_interface,
 
850
                                       attribute._dbus_signature,
 
851
                                       attribute._dbus_access,
 
852
                                       attribute
 
853
                                       ._dbus_get_args_options
 
854
                                       ["byte_arrays"])
 
855
                                      (types.FunctionType
 
856
                                       (attribute.func_code,
 
857
                                        attribute.func_globals,
 
858
                                        attribute.func_name,
 
859
                                        attribute.func_defaults,
 
860
                                        attribute.func_closure)))
 
861
        return type.__new__(mcs, name, bases, attr)
 
862
 
712
863
class ClientDBus(Client, DBusObjectWithProperties):
713
864
    """A Client class using D-Bus
714
865
    
736
887
        DBusObjectWithProperties.__init__(self, self.bus,
737
888
                                          self.dbus_object_path)
738
889
        
739
 
    def _get_approvals_pending(self):
740
 
        return self._approvals_pending
741
 
    def _set_approvals_pending(self, value):
742
 
        old_value = self._approvals_pending
743
 
        self._approvals_pending = value
744
 
        bval = bool(value)
745
 
        if (hasattr(self, "dbus_object_path")
746
 
            and bval is not bool(old_value)):
747
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
748
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
749
 
                                 dbus_bool)
 
890
    def notifychangeproperty(transform_func,
 
891
                             dbus_name, type_func=lambda x: x,
 
892
                             variant_level=1):
 
893
        """ Modify a variable so that it's a property which announces
 
894
        its changes to DBus.
750
895
 
751
 
    approvals_pending = property(_get_approvals_pending,
752
 
                                 _set_approvals_pending)
753
 
    del _get_approvals_pending, _set_approvals_pending
754
 
    
755
 
    @staticmethod
756
 
    def _datetime_to_dbus(dt, variant_level=0):
757
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
758
 
        return dbus.String(dt.isoformat(),
759
 
                           variant_level=variant_level)
760
 
    
761
 
    def enable(self):
762
 
        oldstate = getattr(self, "enabled", False)
763
 
        r = Client.enable(self)
764
 
        if oldstate != self.enabled:
765
 
            # Emit D-Bus signals
766
 
            self.PropertyChanged(dbus.String("Enabled"),
767
 
                                 dbus.Boolean(True, variant_level=1))
768
 
            self.PropertyChanged(
769
 
                dbus.String("LastEnabled"),
770
 
                self._datetime_to_dbus(self.last_enabled,
771
 
                                       variant_level=1))
772
 
        return r
773
 
    
774
 
    def disable(self, quiet = False):
775
 
        oldstate = getattr(self, "enabled", False)
776
 
        r = Client.disable(self, quiet=quiet)
777
 
        if not quiet and oldstate != self.enabled:
778
 
            # Emit D-Bus signal
779
 
            self.PropertyChanged(dbus.String("Enabled"),
780
 
                                 dbus.Boolean(False, variant_level=1))
781
 
        return r
 
896
        transform_fun: Function that takes a value and a variant_level
 
897
                       and transforms it to a D-Bus type.
 
898
        dbus_name: D-Bus name of the variable
 
899
        type_func: Function that transform the value before sending it
 
900
                   to the D-Bus.  Default: no transform
 
901
        variant_level: D-Bus variant level.  Default: 1
 
902
        """
 
903
        attrname = "_{0}".format(dbus_name)
 
904
        def setter(self, value):
 
905
            if hasattr(self, "dbus_object_path"):
 
906
                if (not hasattr(self, attrname) or
 
907
                    type_func(getattr(self, attrname, None))
 
908
                    != type_func(value)):
 
909
                    dbus_value = transform_func(type_func(value),
 
910
                                                variant_level
 
911
                                                =variant_level)
 
912
                    self.PropertyChanged(dbus.String(dbus_name),
 
913
                                         dbus_value)
 
914
            setattr(self, attrname, value)
 
915
        
 
916
        return property(lambda self: getattr(self, attrname), setter)
 
917
    
 
918
    
 
919
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
920
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
921
                                             "ApprovalPending",
 
922
                                             type_func = bool)
 
923
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
924
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
925
                                        "LastEnabled")
 
926
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
927
                                   type_func = lambda checker:
 
928
                                       checker is not None)
 
929
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
930
                                           "LastCheckedOK")
 
931
    last_approval_request = notifychangeproperty(
 
932
        datetime_to_dbus, "LastApprovalRequest")
 
933
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
934
                                               "ApprovedByDefault")
 
935
    approval_delay = notifychangeproperty(dbus.UInt16,
 
936
                                          "ApprovalDelay",
 
937
                                          type_func =
 
938
                                          _timedelta_to_milliseconds)
 
939
    approval_duration = notifychangeproperty(
 
940
        dbus.UInt16, "ApprovalDuration",
 
941
        type_func = _timedelta_to_milliseconds)
 
942
    host = notifychangeproperty(dbus.String, "Host")
 
943
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
944
                                   type_func =
 
945
                                   _timedelta_to_milliseconds)
 
946
    extended_timeout = notifychangeproperty(
 
947
        dbus.UInt16, "ExtendedTimeout",
 
948
        type_func = _timedelta_to_milliseconds)
 
949
    interval = notifychangeproperty(dbus.UInt16,
 
950
                                    "Interval",
 
951
                                    type_func =
 
952
                                    _timedelta_to_milliseconds)
 
953
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
954
    
 
955
    del notifychangeproperty
782
956
    
783
957
    def __del__(self, *args, **kwargs):
784
958
        try:
793
967
                         *args, **kwargs):
794
968
        self.checker_callback_tag = None
795
969
        self.checker = None
796
 
        # Emit D-Bus signal
797
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
798
 
                             dbus.Boolean(False, variant_level=1))
799
970
        if os.WIFEXITED(condition):
800
971
            exitstatus = os.WEXITSTATUS(condition)
801
972
            # Emit D-Bus signal
811
982
        return Client.checker_callback(self, pid, condition, command,
812
983
                                       *args, **kwargs)
813
984
    
814
 
    def checked_ok(self, *args, **kwargs):
815
 
        r = Client.checked_ok(self, *args, **kwargs)
816
 
        # Emit D-Bus signal
817
 
        self.PropertyChanged(
818
 
            dbus.String("LastCheckedOK"),
819
 
            (self._datetime_to_dbus(self.last_checked_ok,
820
 
                                    variant_level=1)))
821
 
        return r
822
 
    
823
 
    def need_approval(self, *args, **kwargs):
824
 
        r = Client.need_approval(self, *args, **kwargs)
825
 
        # Emit D-Bus signal
826
 
        self.PropertyChanged(
827
 
            dbus.String("LastApprovalRequest"),
828
 
            (self._datetime_to_dbus(self.last_approval_request,
829
 
                                    variant_level=1)))
830
 
        return r
831
 
    
832
985
    def start_checker(self, *args, **kwargs):
833
986
        old_checker = self.checker
834
987
        if self.checker is not None:
841
994
            and old_checker_pid != self.checker.pid):
842
995
            # Emit D-Bus signal
843
996
            self.CheckerStarted(self.current_checker_command)
844
 
            self.PropertyChanged(
845
 
                dbus.String("CheckerRunning"),
846
 
                dbus.Boolean(True, variant_level=1))
847
997
        return r
848
998
    
849
 
    def stop_checker(self, *args, **kwargs):
850
 
        old_checker = getattr(self, "checker", None)
851
 
        r = Client.stop_checker(self, *args, **kwargs)
852
 
        if (old_checker is not None
853
 
            and getattr(self, "checker", None) is None):
854
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
855
 
                                 dbus.Boolean(False, variant_level=1))
856
 
        return r
857
 
 
858
999
    def _reset_approved(self):
859
1000
        self._approved = None
860
1001
        return False
862
1003
    def approve(self, value=True):
863
1004
        self.send_changedstate()
864
1005
        self._approved = value
865
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1006
        gobject.timeout_add(_timedelta_to_milliseconds
866
1007
                            (self.approval_duration),
867
1008
                            self._reset_approved)
868
1009
    
869
1010
    
870
1011
    ## D-Bus methods, signals & properties
871
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1012
    _interface = "se.recompile.Mandos.Client"
872
1013
    
873
1014
    ## Signals
874
1015
    
921
1062
    # CheckedOK - method
922
1063
    @dbus.service.method(_interface)
923
1064
    def CheckedOK(self):
924
 
        return self.checked_ok()
 
1065
        self.checked_ok()
925
1066
    
926
1067
    # Enable - method
927
1068
    @dbus.service.method(_interface)
960
1101
        if value is None:       # get
961
1102
            return dbus.Boolean(self.approved_by_default)
962
1103
        self.approved_by_default = bool(value)
963
 
        # Emit D-Bus signal
964
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
965
 
                             dbus.Boolean(value, variant_level=1))
966
1104
    
967
1105
    # ApprovalDelay - property
968
1106
    @dbus_service_property(_interface, signature="t",
971
1109
        if value is None:       # get
972
1110
            return dbus.UInt64(self.approval_delay_milliseconds())
973
1111
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
 
        # Emit D-Bus signal
975
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
976
 
                             dbus.UInt64(value, variant_level=1))
977
1112
    
978
1113
    # ApprovalDuration - property
979
1114
    @dbus_service_property(_interface, signature="t",
980
1115
                           access="readwrite")
981
1116
    def ApprovalDuration_dbus_property(self, value=None):
982
1117
        if value is None:       # get
983
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1118
            return dbus.UInt64(_timedelta_to_milliseconds(
984
1119
                    self.approval_duration))
985
1120
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
 
        # Emit D-Bus signal
987
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
988
 
                             dbus.UInt64(value, variant_level=1))
989
1121
    
990
1122
    # Name - property
991
1123
    @dbus_service_property(_interface, signature="s", access="read")
1004
1136
        if value is None:       # get
1005
1137
            return dbus.String(self.host)
1006
1138
        self.host = value
1007
 
        # Emit D-Bus signal
1008
 
        self.PropertyChanged(dbus.String("Host"),
1009
 
                             dbus.String(value, variant_level=1))
1010
1139
    
1011
1140
    # Created - property
1012
1141
    @dbus_service_property(_interface, signature="s", access="read")
1013
1142
    def Created_dbus_property(self):
1014
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1143
        return dbus.String(datetime_to_dbus(self.created))
1015
1144
    
1016
1145
    # LastEnabled - property
1017
1146
    @dbus_service_property(_interface, signature="s", access="read")
1018
1147
    def LastEnabled_dbus_property(self):
1019
 
        if self.last_enabled is None:
1020
 
            return dbus.String("")
1021
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1148
        return datetime_to_dbus(self.last_enabled)
1022
1149
    
1023
1150
    # Enabled - property
1024
1151
    @dbus_service_property(_interface, signature="b",
1038
1165
        if value is not None:
1039
1166
            self.checked_ok()
1040
1167
            return
1041
 
        if self.last_checked_ok is None:
1042
 
            return dbus.String("")
1043
 
        return dbus.String(self._datetime_to_dbus(self
1044
 
                                                  .last_checked_ok))
 
1168
        return datetime_to_dbus(self.last_checked_ok)
 
1169
    
 
1170
    # Expires - property
 
1171
    @dbus_service_property(_interface, signature="s", access="read")
 
1172
    def Expires_dbus_property(self):
 
1173
        return datetime_to_dbus(self.expires)
1045
1174
    
1046
1175
    # LastApprovalRequest - property
1047
1176
    @dbus_service_property(_interface, signature="s", access="read")
1048
1177
    def LastApprovalRequest_dbus_property(self):
1049
 
        if self.last_approval_request is None:
1050
 
            return dbus.String("")
1051
 
        return dbus.String(self.
1052
 
                           _datetime_to_dbus(self
1053
 
                                             .last_approval_request))
 
1178
        return datetime_to_dbus(self.last_approval_request)
1054
1179
    
1055
1180
    # Timeout - property
1056
1181
    @dbus_service_property(_interface, signature="t",
1059
1184
        if value is None:       # get
1060
1185
            return dbus.UInt64(self.timeout_milliseconds())
1061
1186
        self.timeout = datetime.timedelta(0, 0, 0, value)
1062
 
        # Emit D-Bus signal
1063
 
        self.PropertyChanged(dbus.String("Timeout"),
1064
 
                             dbus.UInt64(value, variant_level=1))
1065
1187
        if getattr(self, "disable_initiator_tag", None) is None:
1066
1188
            return
1067
1189
        # Reschedule timeout
1068
1190
        gobject.source_remove(self.disable_initiator_tag)
1069
1191
        self.disable_initiator_tag = None
1070
 
        time_to_die = (self.
1071
 
                       _timedelta_to_milliseconds((self
1072
 
                                                   .last_checked_ok
1073
 
                                                   + self.timeout)
1074
 
                                                  - datetime.datetime
1075
 
                                                  .utcnow()))
 
1192
        self.expires = None
 
1193
        time_to_die = _timedelta_to_milliseconds((self
 
1194
                                                  .last_checked_ok
 
1195
                                                  + self.timeout)
 
1196
                                                 - datetime.datetime
 
1197
                                                 .utcnow())
1076
1198
        if time_to_die <= 0:
1077
1199
            # The timeout has passed
1078
1200
            self.disable()
1079
1201
        else:
 
1202
            self.expires = (datetime.datetime.utcnow()
 
1203
                            + datetime.timedelta(milliseconds =
 
1204
                                                 time_to_die))
1080
1205
            self.disable_initiator_tag = (gobject.timeout_add
1081
1206
                                          (time_to_die, self.disable))
1082
1207
    
 
1208
    # ExtendedTimeout - property
 
1209
    @dbus_service_property(_interface, signature="t",
 
1210
                           access="readwrite")
 
1211
    def ExtendedTimeout_dbus_property(self, value=None):
 
1212
        if value is None:       # get
 
1213
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1214
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1215
    
1083
1216
    # Interval - property
1084
1217
    @dbus_service_property(_interface, signature="t",
1085
1218
                           access="readwrite")
1087
1220
        if value is None:       # get
1088
1221
            return dbus.UInt64(self.interval_milliseconds())
1089
1222
        self.interval = datetime.timedelta(0, 0, 0, value)
1090
 
        # Emit D-Bus signal
1091
 
        self.PropertyChanged(dbus.String("Interval"),
1092
 
                             dbus.UInt64(value, variant_level=1))
1093
1223
        if getattr(self, "checker_initiator_tag", None) is None:
1094
1224
            return
1095
1225
        # Reschedule checker run
1097
1227
        self.checker_initiator_tag = (gobject.timeout_add
1098
1228
                                      (value, self.start_checker))
1099
1229
        self.start_checker()    # Start one now, too
1100
 
 
 
1230
    
1101
1231
    # Checker - property
1102
1232
    @dbus_service_property(_interface, signature="s",
1103
1233
                           access="readwrite")
1105
1235
        if value is None:       # get
1106
1236
            return dbus.String(self.checker_command)
1107
1237
        self.checker_command = value
1108
 
        # Emit D-Bus signal
1109
 
        self.PropertyChanged(dbus.String("Checker"),
1110
 
                             dbus.String(self.checker_command,
1111
 
                                         variant_level=1))
1112
1238
    
1113
1239
    # CheckerRunning - property
1114
1240
    @dbus_service_property(_interface, signature="b",
1141
1267
        self._pipe.send(('init', fpr, address))
1142
1268
        if not self._pipe.recv():
1143
1269
            raise KeyError()
1144
 
 
 
1270
    
1145
1271
    def __getattribute__(self, name):
1146
1272
        if(name == '_pipe'):
1147
1273
            return super(ProxyClient, self).__getattribute__(name)
1154
1280
                self._pipe.send(('funcall', name, args, kwargs))
1155
1281
                return self._pipe.recv()[1]
1156
1282
            return func
1157
 
 
 
1283
    
1158
1284
    def __setattr__(self, name, value):
1159
1285
        if(name == '_pipe'):
1160
1286
            return super(ProxyClient, self).__setattr__(name, value)
1161
1287
        self._pipe.send(('setattr', name, value))
1162
1288
 
 
1289
class ClientDBusTransitional(ClientDBus):
 
1290
    __metaclass__ = AlternateDBusNamesMetaclass
1163
1291
 
1164
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
1165
1293
    """A class to handle client connections.
1173
1301
                        unicode(self.client_address))
1174
1302
            logger.debug("Pipe FD: %d",
1175
1303
                         self.server.child_pipe.fileno())
1176
 
 
 
1304
            
1177
1305
            session = (gnutls.connection
1178
1306
                       .ClientSession(self.request,
1179
1307
                                      gnutls.connection
1180
1308
                                      .X509Credentials()))
1181
 
 
 
1309
            
1182
1310
            # Note: gnutls.connection.X509Credentials is really a
1183
1311
            # generic GnuTLS certificate credentials object so long as
1184
1312
            # no X.509 keys are added to it.  Therefore, we can use it
1185
1313
            # here despite using OpenPGP certificates.
1186
 
 
 
1314
            
1187
1315
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1188
1316
            #                      "+AES-256-CBC", "+SHA1",
1189
1317
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1195
1323
            (gnutls.library.functions
1196
1324
             .gnutls_priority_set_direct(session._c_object,
1197
1325
                                         priority, None))
1198
 
 
 
1326
            
1199
1327
            # Start communication using the Mandos protocol
1200
1328
            # Get protocol number
1201
1329
            line = self.request.makefile().readline()
1203
1331
            try:
1204
1332
                if int(line.strip().split()[0]) > 1:
1205
1333
                    raise RuntimeError
1206
 
            except (ValueError, IndexError, RuntimeError), error:
 
1334
            except (ValueError, IndexError, RuntimeError) as error:
1207
1335
                logger.error("Unknown protocol version: %s", error)
1208
1336
                return
1209
 
 
 
1337
            
1210
1338
            # Start GnuTLS connection
1211
1339
            try:
1212
1340
                session.handshake()
1213
 
            except gnutls.errors.GNUTLSError, error:
 
1341
            except gnutls.errors.GNUTLSError as error:
1214
1342
                logger.warning("Handshake failed: %s", error)
1215
1343
                # Do not run session.bye() here: the session is not
1216
1344
                # established.  Just abandon the request.
1217
1345
                return
1218
1346
            logger.debug("Handshake succeeded")
1219
 
 
 
1347
            
1220
1348
            approval_required = False
1221
1349
            try:
1222
1350
                try:
1223
1351
                    fpr = self.fingerprint(self.peer_certificate
1224
1352
                                           (session))
1225
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1353
                except (TypeError,
 
1354
                        gnutls.errors.GNUTLSError) as error:
1226
1355
                    logger.warning("Bad certificate: %s", error)
1227
1356
                    return
1228
1357
                logger.debug("Fingerprint: %s", fpr)
1229
 
 
 
1358
                
1230
1359
                try:
1231
1360
                    client = ProxyClient(child_pipe, fpr,
1232
1361
                                         self.client_address)
1240
1369
                
1241
1370
                while True:
1242
1371
                    if not client.enabled:
1243
 
                        logger.warning("Client %s is disabled",
 
1372
                        logger.info("Client %s is disabled",
1244
1373
                                       client.name)
1245
1374
                        if self.server.use_dbus:
1246
1375
                            # Emit D-Bus signal
1247
 
                            client.Rejected("Disabled")                    
 
1376
                            client.Rejected("Disabled")
1248
1377
                        return
1249
1378
                    
1250
1379
                    if client._approved or not client.approval_delay:
1267
1396
                        return
1268
1397
                    
1269
1398
                    #wait until timeout or approved
1270
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1271
1399
                    time = datetime.datetime.now()
1272
1400
                    client.changedstate.acquire()
1273
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1401
                    (client.changedstate.wait
 
1402
                     (float(client._timedelta_to_milliseconds(delay)
 
1403
                            / 1000)))
1274
1404
                    client.changedstate.release()
1275
1405
                    time2 = datetime.datetime.now()
1276
1406
                    if (time2 - time) >= delay:
1291
1421
                while sent_size < len(client.secret):
1292
1422
                    try:
1293
1423
                        sent = session.send(client.secret[sent_size:])
1294
 
                    except (gnutls.errors.GNUTLSError), error:
 
1424
                    except gnutls.errors.GNUTLSError as error:
1295
1425
                        logger.warning("gnutls send failed")
1296
1426
                        return
1297
1427
                    logger.debug("Sent: %d, remaining: %d",
1298
1428
                                 sent, len(client.secret)
1299
1429
                                 - (sent_size + sent))
1300
1430
                    sent_size += sent
1301
 
 
 
1431
                
1302
1432
                logger.info("Sending secret to %s", client.name)
1303
 
                # bump the timeout as if seen
1304
 
                client.checked_ok()
 
1433
                # bump the timeout using extended_timeout
 
1434
                client.checked_ok(client.extended_timeout)
1305
1435
                if self.server.use_dbus:
1306
1436
                    # Emit D-Bus signal
1307
1437
                    client.GotSecret()
1311
1441
                    client.approvals_pending -= 1
1312
1442
                try:
1313
1443
                    session.bye()
1314
 
                except (gnutls.errors.GNUTLSError), error:
 
1444
                except gnutls.errors.GNUTLSError as error:
1315
1445
                    logger.warning("GnuTLS bye failed")
1316
1446
    
1317
1447
    @staticmethod
1386
1516
        except:
1387
1517
            self.handle_error(request, address)
1388
1518
        self.close_request(request)
1389
 
            
 
1519
    
1390
1520
    def process_request(self, request, address):
1391
1521
        """Start a new process to process the request."""
1392
 
        multiprocessing.Process(target = self.sub_process_main,
1393
 
                                args = (request, address)).start()
 
1522
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1523
                                       args = (request,
 
1524
                                               address))
 
1525
        proc.start()
 
1526
        return proc
 
1527
 
1394
1528
 
1395
1529
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1396
1530
    """ adds a pipe to the MixIn """
1400
1534
        This function creates a new pipe in self.pipe
1401
1535
        """
1402
1536
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1403
 
 
1404
 
        super(MultiprocessingMixInWithPipe,
1405
 
              self).process_request(request, client_address)
 
1537
        
 
1538
        proc = MultiprocessingMixIn.process_request(self, request,
 
1539
                                                    client_address)
1406
1540
        self.child_pipe.close()
1407
 
        self.add_pipe(parent_pipe)
1408
 
 
1409
 
    def add_pipe(self, parent_pipe):
 
1541
        self.add_pipe(parent_pipe, proc)
 
1542
    
 
1543
    def add_pipe(self, parent_pipe, proc):
1410
1544
        """Dummy function; override as necessary"""
1411
 
        pass
 
1545
        raise NotImplementedError
 
1546
 
1412
1547
 
1413
1548
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1549
                     socketserver.TCPServer, object):
1441
1576
                                           SO_BINDTODEVICE,
1442
1577
                                           str(self.interface
1443
1578
                                               + '\0'))
1444
 
                except socket.error, error:
 
1579
                except socket.error as error:
1445
1580
                    if error[0] == errno.EPERM:
1446
1581
                        logger.error("No permission to"
1447
1582
                                     " bind to interface %s",
1499
1634
    def server_activate(self):
1500
1635
        if self.enabled:
1501
1636
            return socketserver.TCPServer.server_activate(self)
 
1637
    
1502
1638
    def enable(self):
1503
1639
        self.enabled = True
1504
 
    def add_pipe(self, parent_pipe):
 
1640
    
 
1641
    def add_pipe(self, parent_pipe, proc):
1505
1642
        # Call "handle_ipc" for both data and EOF events
1506
1643
        gobject.io_add_watch(parent_pipe.fileno(),
1507
1644
                             gobject.IO_IN | gobject.IO_HUP,
1508
1645
                             functools.partial(self.handle_ipc,
1509
 
                                               parent_pipe = parent_pipe))
1510
 
        
 
1646
                                               parent_pipe =
 
1647
                                               parent_pipe,
 
1648
                                               proc = proc))
 
1649
    
1511
1650
    def handle_ipc(self, source, condition, parent_pipe=None,
1512
 
                   client_object=None):
 
1651
                   proc = None, client_object=None):
1513
1652
        condition_names = {
1514
1653
            gobject.IO_IN: "IN",   # There is data to read.
1515
1654
            gobject.IO_OUT: "OUT", # Data can be written (without
1524
1663
                                       for cond, name in
1525
1664
                                       condition_names.iteritems()
1526
1665
                                       if cond & condition)
1527
 
        # error or the other end of multiprocessing.Pipe has closed
 
1666
        # error, or the other end of multiprocessing.Pipe has closed
1528
1667
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1668
            # Wait for other process to exit
 
1669
            proc.join()
1529
1670
            return False
1530
1671
        
1531
1672
        # Read a request from the child
1541
1682
                    client = c
1542
1683
                    break
1543
1684
            else:
1544
 
                logger.warning("Client not found for fingerprint: %s, ad"
1545
 
                               "dress: %s", fpr, address)
 
1685
                logger.info("Client not found for fingerprint: %s, ad"
 
1686
                            "dress: %s", fpr, address)
1546
1687
                if self.use_dbus:
1547
1688
                    # Emit D-Bus signal
1548
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1689
                    mandos_dbus_service.ClientNotFound(fpr,
 
1690
                                                       address[0])
1549
1691
                parent_pipe.send(False)
1550
1692
                return False
1551
1693
            
1552
1694
            gobject.io_add_watch(parent_pipe.fileno(),
1553
1695
                                 gobject.IO_IN | gobject.IO_HUP,
1554
1696
                                 functools.partial(self.handle_ipc,
1555
 
                                                   parent_pipe = parent_pipe,
1556
 
                                                   client_object = client))
 
1697
                                                   parent_pipe =
 
1698
                                                   parent_pipe,
 
1699
                                                   proc = proc,
 
1700
                                                   client_object =
 
1701
                                                   client))
1557
1702
            parent_pipe.send(True)
1558
 
            # remove the old hook in favor of the new above hook on same fileno
 
1703
            # remove the old hook in favor of the new above hook on
 
1704
            # same fileno
1559
1705
            return False
1560
1706
        if command == 'funcall':
1561
1707
            funcname = request[1]
1562
1708
            args = request[2]
1563
1709
            kwargs = request[3]
1564
1710
            
1565
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1566
 
 
 
1711
            parent_pipe.send(('data', getattr(client_object,
 
1712
                                              funcname)(*args,
 
1713
                                                         **kwargs)))
 
1714
        
1567
1715
        if command == 'getattr':
1568
1716
            attrname = request[1]
1569
1717
            if callable(client_object.__getattribute__(attrname)):
1570
1718
                parent_pipe.send(('function',))
1571
1719
            else:
1572
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1720
                parent_pipe.send(('data', client_object
 
1721
                                  .__getattribute__(attrname)))
1573
1722
        
1574
1723
        if command == 'setattr':
1575
1724
            attrname = request[1]
1576
1725
            value = request[2]
1577
1726
            setattr(client_object, attrname, value)
1578
 
 
 
1727
        
1579
1728
        return True
1580
1729
 
1581
1730
 
1612
1761
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1762
            else:
1614
1763
                raise ValueError("Unknown suffix %r" % suffix)
1615
 
        except (ValueError, IndexError), e:
1616
 
            raise ValueError(e.message)
 
1764
        except (ValueError, IndexError) as e:
 
1765
            raise ValueError(*(e.args))
1617
1766
        timevalue += delta
1618
1767
    return timevalue
1619
1768
 
1672
1821
    ##################################################################
1673
1822
    # Parsing of options, both command line and config file
1674
1823
    
1675
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
 
    parser.add_option("-i", "--interface", type="string",
1677
 
                      metavar="IF", help="Bind to interface IF")
1678
 
    parser.add_option("-a", "--address", type="string",
1679
 
                      help="Address to listen for requests on")
1680
 
    parser.add_option("-p", "--port", type="int",
1681
 
                      help="Port number to receive requests on")
1682
 
    parser.add_option("--check", action="store_true",
1683
 
                      help="Run self-test")
1684
 
    parser.add_option("--debug", action="store_true",
1685
 
                      help="Debug mode; run in foreground and log to"
1686
 
                      " terminal")
1687
 
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1688
 
                      help="Debug level for stdout output")
1689
 
    parser.add_option("--priority", type="string", help="GnuTLS"
1690
 
                      " priority string (see GnuTLS documentation)")
1691
 
    parser.add_option("--servicename", type="string",
1692
 
                      metavar="NAME", help="Zeroconf service name")
1693
 
    parser.add_option("--configdir", type="string",
1694
 
                      default="/etc/mandos", metavar="DIR",
1695
 
                      help="Directory to search for configuration"
1696
 
                      " files")
1697
 
    parser.add_option("--no-dbus", action="store_false",
1698
 
                      dest="use_dbus", help="Do not provide D-Bus"
1699
 
                      " system bus interface")
1700
 
    parser.add_option("--no-ipv6", action="store_false",
1701
 
                      dest="use_ipv6", help="Do not use IPv6")
1702
 
    options = parser.parse_args()[0]
 
1824
    parser = argparse.ArgumentParser()
 
1825
    parser.add_argument("-v", "--version", action="version",
 
1826
                        version = "%%(prog)s %s" % version,
 
1827
                        help="show version number and exit")
 
1828
    parser.add_argument("-i", "--interface", metavar="IF",
 
1829
                        help="Bind to interface IF")
 
1830
    parser.add_argument("-a", "--address",
 
1831
                        help="Address to listen for requests on")
 
1832
    parser.add_argument("-p", "--port", type=int,
 
1833
                        help="Port number to receive requests on")
 
1834
    parser.add_argument("--check", action="store_true",
 
1835
                        help="Run self-test")
 
1836
    parser.add_argument("--debug", action="store_true",
 
1837
                        help="Debug mode; run in foreground and log"
 
1838
                        " to terminal")
 
1839
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1840
                        help="Debug level for stdout output")
 
1841
    parser.add_argument("--priority", help="GnuTLS"
 
1842
                        " priority string (see GnuTLS documentation)")
 
1843
    parser.add_argument("--servicename",
 
1844
                        metavar="NAME", help="Zeroconf service name")
 
1845
    parser.add_argument("--configdir",
 
1846
                        default="/etc/mandos", metavar="DIR",
 
1847
                        help="Directory to search for configuration"
 
1848
                        " files")
 
1849
    parser.add_argument("--no-dbus", action="store_false",
 
1850
                        dest="use_dbus", help="Do not provide D-Bus"
 
1851
                        " system bus interface")
 
1852
    parser.add_argument("--no-ipv6", action="store_false",
 
1853
                        dest="use_ipv6", help="Do not use IPv6")
 
1854
    options = parser.parse_args()
1703
1855
    
1704
1856
    if options.check:
1705
1857
        import doctest
1757
1909
    debuglevel = server_settings["debuglevel"]
1758
1910
    use_dbus = server_settings["use_dbus"]
1759
1911
    use_ipv6 = server_settings["use_ipv6"]
1760
 
 
 
1912
    
1761
1913
    if server_settings["servicename"] != "Mandos":
1762
1914
        syslogger.setFormatter(logging.Formatter
1763
1915
                               ('Mandos (%s) [%%(process)d]:'
1765
1917
                                % server_settings["servicename"]))
1766
1918
    
1767
1919
    # Parse config file with clients
1768
 
    client_defaults = { "timeout": "1h",
1769
 
                        "interval": "5m",
 
1920
    client_defaults = { "timeout": "5m",
 
1921
                        "extended_timeout": "15m",
 
1922
                        "interval": "2m",
1770
1923
                        "checker": "fping -q -- %%(host)s",
1771
1924
                        "host": "",
1772
1925
                        "approval_delay": "0s",
1812
1965
    try:
1813
1966
        os.setgid(gid)
1814
1967
        os.setuid(uid)
1815
 
    except OSError, error:
 
1968
    except OSError as error:
1816
1969
        if error[0] != errno.EPERM:
1817
1970
            raise error
1818
1971
    
1823
1976
        level = getattr(logging, debuglevel.upper())
1824
1977
        syslogger.setLevel(level)
1825
1978
        console.setLevel(level)
1826
 
 
 
1979
    
1827
1980
    if debug:
1828
1981
        # Enable all possible GnuTLS debugging
1829
1982
        
1860
2013
    # End of Avahi example code
1861
2014
    if use_dbus:
1862
2015
        try:
1863
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2016
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
2017
                                            bus, do_not_queue=True)
1865
 
        except dbus.exceptions.NameExistsException, e:
 
2018
            old_bus_name = (dbus.service.BusName
 
2019
                            ("se.bsnet.fukt.Mandos", bus,
 
2020
                             do_not_queue=True))
 
2021
        except dbus.exceptions.NameExistsException as e:
1866
2022
            logger.error(unicode(e) + ", disabling D-Bus")
1867
2023
            use_dbus = False
1868
2024
            server_settings["use_dbus"] = False
1880
2036
    
1881
2037
    client_class = Client
1882
2038
    if use_dbus:
1883
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2039
        client_class = functools.partial(ClientDBusTransitional,
 
2040
                                         bus = bus)
1884
2041
    def client_config_items(config, section):
1885
2042
        special_settings = {
1886
2043
            "approved_by_default":
1916
2073
        del pidfilename
1917
2074
        
1918
2075
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1919
 
 
 
2076
    
1920
2077
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
2078
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1922
2079
    
1925
2082
            """A D-Bus proxy object"""
1926
2083
            def __init__(self):
1927
2084
                dbus.service.Object.__init__(self, bus, "/")
1928
 
            _interface = "se.bsnet.fukt.Mandos"
 
2085
            _interface = "se.recompile.Mandos"
1929
2086
            
1930
2087
            @dbus.service.signal(_interface, signature="o")
1931
2088
            def ClientAdded(self, objpath):
1973
2130
            
1974
2131
            del _interface
1975
2132
        
1976
 
        mandos_dbus_service = MandosDBusService()
 
2133
        class MandosDBusServiceTransitional(MandosDBusService):
 
2134
            __metaclass__ = AlternateDBusNamesMetaclass
 
2135
        mandos_dbus_service = MandosDBusServiceTransitional()
1977
2136
    
1978
2137
    def cleanup():
1979
2138
        "Cleanup function; run on exit"
1980
2139
        service.cleanup()
1981
2140
        
 
2141
        multiprocessing.active_children()
1982
2142
        while tcp_server.clients:
1983
2143
            client = tcp_server.clients.pop()
1984
2144
            if use_dbus:
1988
2148
            client.disable(quiet=True)
1989
2149
            if use_dbus:
1990
2150
                # Emit D-Bus signal
1991
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2151
                mandos_dbus_service.ClientRemoved(client
 
2152
                                                  .dbus_object_path,
1992
2153
                                                  client.name)
1993
2154
    
1994
2155
    atexit.register(cleanup)
2018
2179
        # From the Avahi example code
2019
2180
        try:
2020
2181
            service.activate()
2021
 
        except dbus.exceptions.DBusException, error:
 
2182
        except dbus.exceptions.DBusException as error:
2022
2183
            logger.critical("DBusException: %s", error)
2023
2184
            cleanup()
2024
2185
            sys.exit(1)
2031
2192
        
2032
2193
        logger.debug("Starting main loop")
2033
2194
        main_loop.run()
2034
 
    except AvahiError, error:
 
2195
    except AvahiError as error:
2035
2196
        logger.critical("AvahiError: %s", error)
2036
2197
        cleanup()
2037
2198
        sys.exit(1)
2038
2199
    except KeyboardInterrupt:
2039
2200
        if debug:
2040
 
            print >> sys.stderr
 
2201
            print("", file=sys.stderr)
2041
2202
        logger.debug("Server received KeyboardInterrupt")
2042
2203
    logger.debug("Server exiting")
2043
2204
    # Must run before the D-Bus bus name gets deregistered
2044
2205
    cleanup()
2045
2206
 
 
2207
 
2046
2208
if __name__ == '__main__':
2047
2209
    main()