81
82
        SO_BINDTODEVICE = None
 
86
 
#logger = logging.getLogger(u'mandos')
 
87
 
logger = logging.Logger(u'mandos')
 
 
87
#logger = logging.getLogger('mandos')
 
 
88
logger = logging.Logger('mandos')
 
88
89
syslogger = (logging.handlers.SysLogHandler
 
89
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
90
 
              address = "/dev/log"))
 
 
91
              address = str("/dev/log")))
 
91
92
syslogger.setFormatter(logging.Formatter
 
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
95
logger.addHandler(syslogger)
 
96
97
console = logging.StreamHandler()
 
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
100
101
logger.addHandler(console)
 
102
103
class AvahiError(Exception):
 
 
150
151
        self.group = None       # our entry group
 
151
152
        self.server = None
 
 
154
        self.entry_group_state_changed_match = None
 
153
155
    def rename(self):
 
154
156
        """Derived from the Avahi example code"""
 
155
157
        if self.rename_count >= self.max_renames:
 
156
 
            logger.critical(u"No suitable Zeroconf service name found"
 
157
 
                            u" after %i retries, exiting.",
 
 
158
            logger.critical("No suitable Zeroconf service name found"
 
 
159
                            " after %i retries, exiting.",
 
158
160
                            self.rename_count)
 
159
 
            raise AvahiServiceError(u"Too many renames")
 
 
161
            raise AvahiServiceError("Too many renames")
 
160
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
 
163
        logger.info("Changing Zeroconf service name to %r ...",
 
163
165
        syslogger.setFormatter(logging.Formatter
 
164
 
                               (u'Mandos (%s) [%%(process)d]:'
 
165
 
                                u' %%(levelname)s: %%(message)s'
 
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
 
167
                                ' %%(levelname)s: %%(message)s'
 
170
 
        except dbus.exceptions.DBusException, error:
 
171
 
            logger.critical(u"DBusException: %s", error)
 
 
172
        except dbus.exceptions.DBusException as error:
 
 
173
            logger.critical("DBusException: %s", error)
 
174
176
        self.rename_count += 1
 
175
177
    def remove(self):
 
176
178
        """Derived from the Avahi example code"""
 
 
179
        if self.entry_group_state_changed_match is not None:
 
 
180
            self.entry_group_state_changed_match.remove()
 
 
181
            self.entry_group_state_changed_match = None
 
177
182
        if self.group is not None:
 
178
183
            self.group.Reset()
 
180
185
        """Derived from the Avahi example code"""
 
181
187
        if self.group is None:
 
182
188
            self.group = dbus.Interface(
 
183
189
                self.bus.get_object(avahi.DBUS_NAME,
 
184
190
                                    self.server.EntryGroupNew()),
 
185
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
186
 
            self.group.connect_to_signal('StateChanged',
 
188
 
                                         .entry_group_state_changed)
 
189
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
 
192
        self.entry_group_state_changed_match = (
 
 
193
            self.group.connect_to_signal(
 
 
194
                'StateChanged', self .entry_group_state_changed))
 
 
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
190
196
                     self.name, self.type)
 
191
197
        self.group.AddService(
 
 
199
205
        self.group.Commit()
 
200
206
    def entry_group_state_changed(self, state, error):
 
201
207
        """Derived from the Avahi example code"""
 
202
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
 
208
        logger.debug("Avahi entry group state change: %i", state)
 
204
210
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
205
 
            logger.debug(u"Zeroconf service established.")
 
 
211
            logger.debug("Zeroconf service established.")
 
206
212
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
207
 
            logger.warning(u"Zeroconf service name collision.")
 
 
213
            logger.info("Zeroconf service name collision.")
 
209
215
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
210
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
 
216
            logger.critical("Avahi: Error in group state changed %s",
 
212
 
            raise AvahiGroupError(u"State changed: %s"
 
 
218
            raise AvahiGroupError("State changed: %s"
 
213
219
                                  % unicode(error))
 
214
220
    def cleanup(self):
 
215
221
        """Derived from the Avahi example code"""
 
216
222
        if self.group is not None:
 
 
225
            except (dbus.exceptions.UnknownMethodException,
 
 
226
                    dbus.exceptions.DBusException) as e:
 
218
228
            self.group = None
 
219
 
    def server_state_changed(self, state):
 
 
230
    def server_state_changed(self, state, error=None):
 
220
231
        """Derived from the Avahi example code"""
 
221
 
        logger.debug(u"Avahi server state change: %i", state)
 
222
 
        if state == avahi.SERVER_COLLISION:
 
223
 
            logger.error(u"Zeroconf server name collision")
 
 
232
        logger.debug("Avahi server state change: %i", state)
 
 
233
        bad_states = { avahi.SERVER_INVALID:
 
 
234
                           "Zeroconf server invalid",
 
 
235
                       avahi.SERVER_REGISTERING: None,
 
 
236
                       avahi.SERVER_COLLISION:
 
 
237
                           "Zeroconf server name collision",
 
 
238
                       avahi.SERVER_FAILURE:
 
 
239
                           "Zeroconf server failure" }
 
 
240
        if state in bad_states:
 
 
241
            if bad_states[state] is not None:
 
 
243
                    logger.error(bad_states[state])
 
 
245
                    logger.error(bad_states[state] + ": %r", error)
 
225
247
        elif state == avahi.SERVER_RUNNING:
 
 
251
                logger.debug("Unknown state: %r", state)
 
 
253
                logger.debug("Unknown state: %r: %r", state, error)
 
227
254
    def activate(self):
 
228
255
        """Derived from the Avahi example code"""
 
229
256
        if self.server is None:
 
230
257
            self.server = dbus.Interface(
 
231
258
                self.bus.get_object(avahi.DBUS_NAME,
 
232
 
                                    avahi.DBUS_PATH_SERVER),
 
 
259
                                    avahi.DBUS_PATH_SERVER,
 
 
260
                                    follow_name_owner_changes=True),
 
233
261
                avahi.DBUS_INTERFACE_SERVER)
 
234
 
        self.server.connect_to_signal(u"StateChanged",
 
 
262
        self.server.connect_to_signal("StateChanged",
 
235
263
                                 self.server_state_changed)
 
236
264
        self.server_state_changed(self.server.GetState())
 
 
272
300
    runtime_expansions: Allowed attributes for runtime expansion.
 
275
 
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
276
 
                          u"created", u"enabled", u"fingerprint",
 
277
 
                          u"host", u"interval", u"last_checked_ok",
 
278
 
                          u"last_enabled", u"name", u"timeout")
 
 
303
    runtime_expansions = ("approval_delay", "approval_duration",
 
 
304
                          "created", "enabled", "fingerprint",
 
 
305
                          "host", "interval", "last_checked_ok",
 
 
306
                          "last_enabled", "name", "timeout")
 
281
309
    def _timedelta_to_milliseconds(td):
 
 
303
331
        if config is None:
 
305
 
        logger.debug(u"Creating client %r", self.name)
 
 
333
        logger.debug("Creating client %r", self.name)
 
306
334
        # Uppercase and remove spaces from fingerprint for later
 
307
335
        # comparison purposes with return value from the fingerprint()
 
309
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
311
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
312
 
        if u"secret" in config:
 
313
 
            self.secret = config[u"secret"].decode(u"base64")
 
314
 
        elif u"secfile" in config:
 
 
337
        self.fingerprint = (config["fingerprint"].upper()
 
 
339
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
 
340
        if "secret" in config:
 
 
341
            self.secret = config["secret"].decode("base64")
 
 
342
        elif "secfile" in config:
 
315
343
            with open(os.path.expanduser(os.path.expandvars
 
316
 
                                         (config[u"secfile"])),
 
 
344
                                         (config["secfile"])),
 
317
345
                      "rb") as secfile:
 
318
346
                self.secret = secfile.read()
 
320
 
            raise TypeError(u"No secret or secfile for client %s"
 
 
348
            raise TypeError("No secret or secfile for client %s"
 
322
 
        self.host = config.get(u"host", u"")
 
 
350
        self.host = config.get("host", "")
 
323
351
        self.created = datetime.datetime.utcnow()
 
324
352
        self.enabled = False
 
325
353
        self.last_approval_request = None
 
326
354
        self.last_enabled = None
 
327
355
        self.last_checked_ok = None
 
328
 
        self.timeout = string_to_delta(config[u"timeout"])
 
329
 
        self.interval = string_to_delta(config[u"interval"])
 
 
356
        self.timeout = string_to_delta(config["timeout"])
 
 
357
        self.interval = string_to_delta(config["interval"])
 
330
358
        self.disable_hook = disable_hook
 
331
359
        self.checker = None
 
332
360
        self.checker_initiator_tag = None
 
333
361
        self.disable_initiator_tag = None
 
334
362
        self.checker_callback_tag = None
 
335
 
        self.checker_command = config[u"checker"]
 
 
363
        self.checker_command = config["checker"]
 
336
364
        self.current_checker_command = None
 
337
365
        self.last_connect = None
 
338
366
        self._approved = None
 
339
 
        self.approved_by_default = config.get(u"approved_by_default",
 
 
367
        self.approved_by_default = config.get("approved_by_default",
 
341
369
        self.approvals_pending = 0
 
342
370
        self.approval_delay = string_to_delta(
 
343
 
            config[u"approval_delay"])
 
 
371
            config["approval_delay"])
 
344
372
        self.approval_duration = string_to_delta(
 
345
 
            config[u"approval_duration"])
 
 
373
            config["approval_duration"])
 
346
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
348
376
    def send_changedstate(self):
 
 
378
406
            self.send_changedstate()
 
380
 
            logger.info(u"Disabling client %s", self.name)
 
381
 
        if getattr(self, u"disable_initiator_tag", False):
 
 
408
            logger.info("Disabling client %s", self.name)
 
 
409
        if getattr(self, "disable_initiator_tag", False):
 
382
410
            gobject.source_remove(self.disable_initiator_tag)
 
383
411
            self.disable_initiator_tag = None
 
384
 
        if getattr(self, u"checker_initiator_tag", False):
 
 
412
        if getattr(self, "checker_initiator_tag", False):
 
385
413
            gobject.source_remove(self.checker_initiator_tag)
 
386
414
            self.checker_initiator_tag = None
 
387
415
        self.stop_checker()
 
 
444
472
        # If a checker exists, make sure it is not a zombie
 
446
474
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
447
 
        except (AttributeError, OSError), error:
 
 
475
        except (AttributeError, OSError) as error:
 
448
476
            if (isinstance(error, OSError)
 
449
477
                and error.errno != errno.ECHILD):
 
453
 
                logger.warning(u"Checker was a zombie")
 
 
481
                logger.warning("Checker was a zombie")
 
454
482
                gobject.source_remove(self.checker_callback_tag)
 
455
483
                self.checker_callback(pid, status,
 
456
484
                                      self.current_checker_command)
 
 
463
491
                # Escape attributes for the shell
 
464
492
                escaped_attrs = dict(
 
466
 
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
 
494
                     re.escape(unicode(str(getattr(self, attr, "")),
 
470
498
                    self.runtime_expansions)
 
473
501
                    command = self.checker_command % escaped_attrs
 
474
 
                except TypeError, error:
 
475
 
                    logger.error(u'Could not format string "%s":'
 
476
 
                                 u' %s', self.checker_command, error)
 
 
502
                except TypeError as error:
 
 
503
                    logger.error('Could not format string "%s":'
 
 
504
                                 ' %s', self.checker_command, error)
 
477
505
                    return True # Try again later
 
478
506
            self.current_checker_command = command
 
480
 
                logger.info(u"Starting checker %r for %s",
 
 
508
                logger.info("Starting checker %r for %s",
 
481
509
                            command, self.name)
 
482
510
                # We don't need to redirect stdout and stderr, since
 
483
511
                # in normal mode, that is already done by daemon(),
 
 
507
535
        if self.checker_callback_tag:
 
508
536
            gobject.source_remove(self.checker_callback_tag)
 
509
537
            self.checker_callback_tag = None
 
510
 
        if getattr(self, u"checker", None) is None:
 
 
538
        if getattr(self, "checker", None) is None:
 
512
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
 
540
        logger.debug("Stopping checker for %(name)s", vars(self))
 
514
542
            os.kill(self.checker.pid, signal.SIGTERM)
 
516
544
            #if self.checker.poll() is None:
 
517
545
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
518
 
        except OSError, error:
 
 
546
        except OSError as error:
 
519
547
            if error.errno != errno.ESRCH: # No such process
 
521
549
        self.checker = None
 
523
 
def dbus_service_property(dbus_interface, signature=u"v",
 
524
 
                          access=u"readwrite", byte_arrays=False):
 
 
551
def dbus_service_property(dbus_interface, signature="v",
 
 
552
                          access="readwrite", byte_arrays=False):
 
525
553
    """Decorators for marking methods of a DBusObjectWithProperties to
 
526
554
    become properties on the D-Bus.
 
 
535
563
    # Encoding deeply encoded byte arrays is not supported yet by the
 
536
564
    # "Set" method, so we fail early here:
 
537
 
    if byte_arrays and signature != u"ay":
 
538
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
539
 
                         u" signature %r" % signature)
 
 
565
    if byte_arrays and signature != "ay":
 
 
566
        raise ValueError("Byte arrays not supported for non-'ay'"
 
 
567
                         " signature %r" % signature)
 
540
568
    def decorator(func):
 
541
569
        func._dbus_is_property = True
 
542
570
        func._dbus_interface = dbus_interface
 
543
571
        func._dbus_signature = signature
 
544
572
        func._dbus_access = access
 
545
573
        func._dbus_name = func.__name__
 
546
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
 
574
        if func._dbus_name.endswith("_dbus_property"):
 
547
575
            func._dbus_name = func._dbus_name[:-14]
 
548
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
 
576
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
 
605
633
        # No such property
 
606
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
607
 
                                   + interface_name + u"."
 
 
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
 
635
                                   + interface_name + "."
 
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
 
638
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
612
640
    def Get(self, interface_name, property_name):
 
613
641
        """Standard D-Bus property Get() method, see D-Bus standard.
 
615
643
        prop = self._get_dbus_property(interface_name, property_name)
 
616
 
        if prop._dbus_access == u"write":
 
 
644
        if prop._dbus_access == "write":
 
617
645
            raise DBusPropertyAccessException(property_name)
 
619
 
        if not hasattr(value, u"variant_level"):
 
 
647
        if not hasattr(value, "variant_level"):
 
621
649
        return type(value)(value, variant_level=value.variant_level+1)
 
623
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
651
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
624
652
    def Set(self, interface_name, property_name, value):
 
625
653
        """Standard D-Bus property Set() method, see D-Bus standard.
 
627
655
        prop = self._get_dbus_property(interface_name, property_name)
 
628
 
        if prop._dbus_access == u"read":
 
 
656
        if prop._dbus_access == "read":
 
629
657
            raise DBusPropertyAccessException(property_name)
 
630
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
658
        if prop._dbus_get_args_options["byte_arrays"]:
 
631
659
            # The byte_arrays option is not supported yet on
 
632
660
            # signatures other than "ay".
 
633
 
            if prop._dbus_signature != u"ay":
 
 
661
            if prop._dbus_signature != "ay":
 
635
663
            value = dbus.ByteArray(''.join(unichr(byte)
 
636
664
                                           for byte in value))
 
639
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
640
 
                         out_signature=u"a{sv}")
 
 
667
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
 
668
                         out_signature="a{sv}")
 
641
669
    def GetAll(self, interface_name):
 
642
670
        """Standard D-Bus property GetAll() method, see D-Bus
 
 
651
679
                # Interface non-empty but did not match
 
653
681
            # Ignore write-only properties
 
654
 
            if prop._dbus_access == u"write":
 
 
682
            if prop._dbus_access == "write":
 
657
 
            if not hasattr(value, u"variant_level"):
 
 
685
            if not hasattr(value, "variant_level"):
 
658
686
                all[name] = value
 
660
688
            all[name] = type(value)(value, variant_level=
 
661
689
                                    value.variant_level+1)
 
662
 
        return dbus.Dictionary(all, signature=u"sv")
 
 
690
        return dbus.Dictionary(all, signature="sv")
 
664
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
666
694
                         path_keyword='object_path',
 
667
695
                         connection_keyword='connection')
 
668
696
    def Introspect(self, object_path, connection):
 
 
674
702
            document = xml.dom.minidom.parseString(xmlstring)
 
675
703
            def make_tag(document, name, prop):
 
676
 
                e = document.createElement(u"property")
 
677
 
                e.setAttribute(u"name", name)
 
678
 
                e.setAttribute(u"type", prop._dbus_signature)
 
679
 
                e.setAttribute(u"access", prop._dbus_access)
 
 
704
                e = document.createElement("property")
 
 
705
                e.setAttribute("name", name)
 
 
706
                e.setAttribute("type", prop._dbus_signature)
 
 
707
                e.setAttribute("access", prop._dbus_access)
 
681
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
709
            for if_tag in document.getElementsByTagName("interface"):
 
682
710
                for tag in (make_tag(document, name, prop)
 
684
712
                            in self._get_all_dbus_properties()
 
685
713
                            if prop._dbus_interface
 
686
 
                            == if_tag.getAttribute(u"name")):
 
 
714
                            == if_tag.getAttribute("name")):
 
687
715
                    if_tag.appendChild(tag)
 
688
716
                # Add the names to the return values for the
 
689
717
                # "org.freedesktop.DBus.Properties" methods
 
690
 
                if (if_tag.getAttribute(u"name")
 
691
 
                    == u"org.freedesktop.DBus.Properties"):
 
692
 
                    for cn in if_tag.getElementsByTagName(u"method"):
 
693
 
                        if cn.getAttribute(u"name") == u"Get":
 
694
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
695
 
                                if (arg.getAttribute(u"direction")
 
697
 
                                    arg.setAttribute(u"name", u"value")
 
698
 
                        elif cn.getAttribute(u"name") == u"GetAll":
 
699
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
700
 
                                if (arg.getAttribute(u"direction")
 
702
 
                                    arg.setAttribute(u"name", u"props")
 
703
 
            xmlstring = document.toxml(u"utf-8")
 
 
718
                if (if_tag.getAttribute("name")
 
 
719
                    == "org.freedesktop.DBus.Properties"):
 
 
720
                    for cn in if_tag.getElementsByTagName("method"):
 
 
721
                        if cn.getAttribute("name") == "Get":
 
 
722
                            for arg in cn.getElementsByTagName("arg"):
 
 
723
                                if (arg.getAttribute("direction")
 
 
725
                                    arg.setAttribute("name", "value")
 
 
726
                        elif cn.getAttribute("name") == "GetAll":
 
 
727
                            for arg in cn.getElementsByTagName("arg"):
 
 
728
                                if (arg.getAttribute("direction")
 
 
730
                                    arg.setAttribute("name", "props")
 
 
731
            xmlstring = document.toxml("utf-8")
 
704
732
            document.unlink()
 
705
733
        except (AttributeError, xml.dom.DOMException,
 
706
 
                xml.parsers.expat.ExpatError), error:
 
707
 
            logger.error(u"Failed to override Introspection method",
 
 
734
                xml.parsers.expat.ExpatError) as error:
 
 
735
            logger.error("Failed to override Introspection method",
 
 
759
787
                           variant_level=variant_level)
 
761
789
    def enable(self):
 
762
 
        oldstate = getattr(self, u"enabled", False)
 
 
790
        oldstate = getattr(self, "enabled", False)
 
763
791
        r = Client.enable(self)
 
764
792
        if oldstate != self.enabled:
 
765
793
            # Emit D-Bus signals
 
766
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
 
794
            self.PropertyChanged(dbus.String("Enabled"),
 
767
795
                                 dbus.Boolean(True, variant_level=1))
 
768
796
            self.PropertyChanged(
 
769
 
                dbus.String(u"LastEnabled"),
 
 
797
                dbus.String("LastEnabled"),
 
770
798
                self._datetime_to_dbus(self.last_enabled,
 
771
799
                                       variant_level=1))
 
774
802
    def disable(self, quiet = False):
 
775
 
        oldstate = getattr(self, u"enabled", False)
 
 
803
        oldstate = getattr(self, "enabled", False)
 
776
804
        r = Client.disable(self, quiet=quiet)
 
777
805
        if not quiet and oldstate != self.enabled:
 
778
806
            # Emit D-Bus signal
 
779
 
            self.PropertyChanged(dbus.String(u"Enabled"),
 
 
807
            self.PropertyChanged(dbus.String("Enabled"),
 
780
808
                                 dbus.Boolean(False, variant_level=1))
 
 
814
842
    def checked_ok(self, *args, **kwargs):
 
815
 
        r = Client.checked_ok(self, *args, **kwargs)
 
 
843
        Client.checked_ok(self, *args, **kwargs)
 
816
844
        # Emit D-Bus signal
 
817
845
        self.PropertyChanged(
 
818
 
            dbus.String(u"LastCheckedOK"),
 
 
846
            dbus.String("LastCheckedOK"),
 
819
847
            (self._datetime_to_dbus(self.last_checked_ok,
 
820
848
                                    variant_level=1)))
 
823
850
    def need_approval(self, *args, **kwargs):
 
824
851
        r = Client.need_approval(self, *args, **kwargs)
 
825
852
        # Emit D-Bus signal
 
826
853
        self.PropertyChanged(
 
827
 
            dbus.String(u"LastApprovalRequest"),
 
 
854
            dbus.String("LastApprovalRequest"),
 
828
855
            (self._datetime_to_dbus(self.last_approval_request,
 
829
856
                                    variant_level=1)))
 
 
842
869
            # Emit D-Bus signal
 
843
870
            self.CheckerStarted(self.current_checker_command)
 
844
871
            self.PropertyChanged(
 
845
 
                dbus.String(u"CheckerRunning"),
 
 
872
                dbus.String("CheckerRunning"),
 
846
873
                dbus.Boolean(True, variant_level=1))
 
849
876
    def stop_checker(self, *args, **kwargs):
 
850
 
        old_checker = getattr(self, u"checker", None)
 
 
877
        old_checker = getattr(self, "checker", None)
 
851
878
        r = Client.stop_checker(self, *args, **kwargs)
 
852
879
        if (old_checker is not None
 
853
 
            and getattr(self, u"checker", None) is None):
 
854
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
 
880
            and getattr(self, "checker", None) is None):
 
 
881
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
855
882
                                 dbus.Boolean(False, variant_level=1))
 
 
870
897
    ## D-Bus methods, signals & properties
 
871
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
 
875
902
    # CheckerCompleted - signal
 
876
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
 
903
    @dbus.service.signal(_interface, signature="nxs")
 
877
904
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
881
908
    # CheckerStarted - signal
 
882
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
909
    @dbus.service.signal(_interface, signature="s")
 
883
910
    def CheckerStarted(self, command):
 
887
914
    # PropertyChanged - signal
 
888
 
    @dbus.service.signal(_interface, signature=u"sv")
 
 
915
    @dbus.service.signal(_interface, signature="sv")
 
889
916
    def PropertyChanged(self, property, value):
 
 
951
978
    # ApprovalPending - property
 
952
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
 
979
    @dbus_service_property(_interface, signature="b", access="read")
 
953
980
    def ApprovalPending_dbus_property(self):
 
954
981
        return dbus.Boolean(bool(self.approvals_pending))
 
956
983
    # ApprovedByDefault - property
 
957
 
    @dbus_service_property(_interface, signature=u"b",
 
 
984
    @dbus_service_property(_interface, signature="b",
 
959
986
    def ApprovedByDefault_dbus_property(self, value=None):
 
960
987
        if value is None:       # get
 
961
988
            return dbus.Boolean(self.approved_by_default)
 
962
989
        self.approved_by_default = bool(value)
 
963
990
        # Emit D-Bus signal
 
964
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
965
992
                             dbus.Boolean(value, variant_level=1))
 
967
994
    # ApprovalDelay - property
 
968
 
    @dbus_service_property(_interface, signature=u"t",
 
 
995
    @dbus_service_property(_interface, signature="t",
 
970
997
    def ApprovalDelay_dbus_property(self, value=None):
 
971
998
        if value is None:       # get
 
972
999
            return dbus.UInt64(self.approval_delay_milliseconds())
 
973
1000
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
974
1001
        # Emit D-Bus signal
 
975
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
 
1002
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
976
1003
                             dbus.UInt64(value, variant_level=1))
 
978
1005
    # ApprovalDuration - property
 
979
 
    @dbus_service_property(_interface, signature=u"t",
 
 
1006
    @dbus_service_property(_interface, signature="t",
 
981
1008
    def ApprovalDuration_dbus_property(self, value=None):
 
982
1009
        if value is None:       # get
 
983
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
984
1011
                    self.approval_duration))
 
985
1012
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
986
1013
        # Emit D-Bus signal
 
987
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
 
1014
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
988
1015
                             dbus.UInt64(value, variant_level=1))
 
990
1017
    # Name - property
 
991
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1018
    @dbus_service_property(_interface, signature="s", access="read")
 
992
1019
    def Name_dbus_property(self):
 
993
1020
        return dbus.String(self.name)
 
995
1022
    # Fingerprint - property
 
996
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1023
    @dbus_service_property(_interface, signature="s", access="read")
 
997
1024
    def Fingerprint_dbus_property(self):
 
998
1025
        return dbus.String(self.fingerprint)
 
1000
1027
    # Host - property
 
1001
 
    @dbus_service_property(_interface, signature=u"s",
 
1002
 
                           access=u"readwrite")
 
 
1028
    @dbus_service_property(_interface, signature="s",
 
1003
1030
    def Host_dbus_property(self, value=None):
 
1004
1031
        if value is None:       # get
 
1005
1032
            return dbus.String(self.host)
 
1006
1033
        self.host = value
 
1007
1034
        # Emit D-Bus signal
 
1008
 
        self.PropertyChanged(dbus.String(u"Host"),
 
 
1035
        self.PropertyChanged(dbus.String("Host"),
 
1009
1036
                             dbus.String(value, variant_level=1))
 
1011
1038
    # Created - property
 
1012
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1039
    @dbus_service_property(_interface, signature="s", access="read")
 
1013
1040
    def Created_dbus_property(self):
 
1014
1041
        return dbus.String(self._datetime_to_dbus(self.created))
 
1016
1043
    # LastEnabled - property
 
1017
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1044
    @dbus_service_property(_interface, signature="s", access="read")
 
1018
1045
    def LastEnabled_dbus_property(self):
 
1019
1046
        if self.last_enabled is None:
 
1020
 
            return dbus.String(u"")
 
 
1047
            return dbus.String("")
 
1021
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1023
1050
    # Enabled - property
 
1024
 
    @dbus_service_property(_interface, signature=u"b",
 
1025
 
                           access=u"readwrite")
 
 
1051
    @dbus_service_property(_interface, signature="b",
 
1026
1053
    def Enabled_dbus_property(self, value=None):
 
1027
1054
        if value is None:       # get
 
1028
1055
            return dbus.Boolean(self.enabled)
 
 
1034
1061
    # LastCheckedOK - property
 
1035
 
    @dbus_service_property(_interface, signature=u"s",
 
1036
 
                           access=u"readwrite")
 
 
1062
    @dbus_service_property(_interface, signature="s",
 
1037
1064
    def LastCheckedOK_dbus_property(self, value=None):
 
1038
1065
        if value is not None:
 
1039
1066
            self.checked_ok()
 
1041
1068
        if self.last_checked_ok is None:
 
1042
 
            return dbus.String(u"")
 
 
1069
            return dbus.String("")
 
1043
1070
        return dbus.String(self._datetime_to_dbus(self
 
1044
1071
                                                  .last_checked_ok))
 
1046
1073
    # LastApprovalRequest - property
 
1047
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1074
    @dbus_service_property(_interface, signature="s", access="read")
 
1048
1075
    def LastApprovalRequest_dbus_property(self):
 
1049
1076
        if self.last_approval_request is None:
 
1050
 
            return dbus.String(u"")
 
 
1077
            return dbus.String("")
 
1051
1078
        return dbus.String(self.
 
1052
1079
                           _datetime_to_dbus(self
 
1053
1080
                                             .last_approval_request))
 
1055
1082
    # Timeout - property
 
1056
 
    @dbus_service_property(_interface, signature=u"t",
 
1057
 
                           access=u"readwrite")
 
 
1083
    @dbus_service_property(_interface, signature="t",
 
1058
1085
    def Timeout_dbus_property(self, value=None):
 
1059
1086
        if value is None:       # get
 
1060
1087
            return dbus.UInt64(self.timeout_milliseconds())
 
1061
1088
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1062
1089
        # Emit D-Bus signal
 
1063
 
        self.PropertyChanged(dbus.String(u"Timeout"),
 
 
1090
        self.PropertyChanged(dbus.String("Timeout"),
 
1064
1091
                             dbus.UInt64(value, variant_level=1))
 
1065
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
 
1092
        if getattr(self, "disable_initiator_tag", None) is None:
 
1067
1094
        # Reschedule timeout
 
1068
1095
        gobject.source_remove(self.disable_initiator_tag)
 
 
1081
1108
                                          (time_to_die, self.disable))
 
1083
1110
    # Interval - property
 
1084
 
    @dbus_service_property(_interface, signature=u"t",
 
1085
 
                           access=u"readwrite")
 
 
1111
    @dbus_service_property(_interface, signature="t",
 
1086
1113
    def Interval_dbus_property(self, value=None):
 
1087
1114
        if value is None:       # get
 
1088
1115
            return dbus.UInt64(self.interval_milliseconds())
 
1089
1116
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1090
1117
        # Emit D-Bus signal
 
1091
 
        self.PropertyChanged(dbus.String(u"Interval"),
 
 
1118
        self.PropertyChanged(dbus.String("Interval"),
 
1092
1119
                             dbus.UInt64(value, variant_level=1))
 
1093
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
 
1120
        if getattr(self, "checker_initiator_tag", None) is None:
 
1095
1122
        # Reschedule checker run
 
1096
1123
        gobject.source_remove(self.checker_initiator_tag)
 
 
1099
1126
        self.start_checker()    # Start one now, too
 
1101
1128
    # Checker - property
 
1102
 
    @dbus_service_property(_interface, signature=u"s",
 
1103
 
                           access=u"readwrite")
 
 
1129
    @dbus_service_property(_interface, signature="s",
 
1104
1131
    def Checker_dbus_property(self, value=None):
 
1105
1132
        if value is None:       # get
 
1106
1133
            return dbus.String(self.checker_command)
 
1107
1134
        self.checker_command = value
 
1108
1135
        # Emit D-Bus signal
 
1109
 
        self.PropertyChanged(dbus.String(u"Checker"),
 
 
1136
        self.PropertyChanged(dbus.String("Checker"),
 
1110
1137
                             dbus.String(self.checker_command,
 
1111
1138
                                         variant_level=1))
 
1113
1140
    # CheckerRunning - property
 
1114
 
    @dbus_service_property(_interface, signature=u"b",
 
1115
 
                           access=u"readwrite")
 
 
1141
    @dbus_service_property(_interface, signature="b",
 
1116
1143
    def CheckerRunning_dbus_property(self, value=None):
 
1117
1144
        if value is None:       # get
 
1118
1145
            return dbus.Boolean(self.checker is not None)
 
 
1184
1211
            # no X.509 keys are added to it.  Therefore, we can use it
 
1185
1212
            # here despite using OpenPGP certificates.
 
1187
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1188
 
            #                      u"+AES-256-CBC", u"+SHA1",
 
1189
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
 
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
1215
            #                      "+AES-256-CBC", "+SHA1",
 
 
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1191
1218
            # Use a fallback default, since this MUST be set.
 
1192
1219
            priority = self.server.gnutls_priority
 
1193
1220
            if priority is None:
 
1194
 
                priority = u"NORMAL"
 
1195
1222
            (gnutls.library.functions
 
1196
1223
             .gnutls_priority_set_direct(session._c_object,
 
1197
1224
                                         priority, None))
 
 
1199
1226
            # Start communication using the Mandos protocol
 
1200
1227
            # Get protocol number
 
1201
1228
            line = self.request.makefile().readline()
 
1202
 
            logger.debug(u"Protocol version: %r", line)
 
 
1229
            logger.debug("Protocol version: %r", line)
 
1204
1231
                if int(line.strip().split()[0]) > 1:
 
1205
1232
                    raise RuntimeError
 
1206
 
            except (ValueError, IndexError, RuntimeError), error:
 
1207
 
                logger.error(u"Unknown protocol version: %s", error)
 
 
1233
            except (ValueError, IndexError, RuntimeError) as error:
 
 
1234
                logger.error("Unknown protocol version: %s", error)
 
1210
1237
            # Start GnuTLS connection
 
1212
1239
                session.handshake()
 
1213
 
            except gnutls.errors.GNUTLSError, error:
 
1214
 
                logger.warning(u"Handshake failed: %s", error)
 
 
1240
            except gnutls.errors.GNUTLSError as error:
 
 
1241
                logger.warning("Handshake failed: %s", error)
 
1215
1242
                # Do not run session.bye() here: the session is not
 
1216
1243
                # established.  Just abandon the request.
 
1218
 
            logger.debug(u"Handshake succeeded")
 
 
1245
            logger.debug("Handshake succeeded")
 
1220
1247
            approval_required = False
 
1223
1250
                    fpr = self.fingerprint(self.peer_certificate
 
1225
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1226
 
                    logger.warning(u"Bad certificate: %s", error)
 
 
1253
                        gnutls.errors.GNUTLSError) as error:
 
 
1254
                    logger.warning("Bad certificate: %s", error)
 
1228
 
                logger.debug(u"Fingerprint: %s", fpr)
 
 
1256
                logger.debug("Fingerprint: %s", fpr)
 
1231
1259
                    client = ProxyClient(child_pipe, fpr,
 
 
1432
1460
        bind to an address or port if they were not specified."""
 
1433
1461
        if self.interface is not None:
 
1434
1462
            if SO_BINDTODEVICE is None:
 
1435
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1436
 
                             u" cannot bind to interface %s",
 
 
1463
                logger.error("SO_BINDTODEVICE does not exist;"
 
 
1464
                             " cannot bind to interface %s",
 
1437
1465
                             self.interface)
 
1440
1468
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1441
1469
                                           SO_BINDTODEVICE,
 
1442
1470
                                           str(self.interface
 
1444
 
                except socket.error, error:
 
 
1472
                except socket.error as error:
 
1445
1473
                    if error[0] == errno.EPERM:
 
1446
 
                        logger.error(u"No permission to"
 
1447
 
                                     u" bind to interface %s",
 
 
1474
                        logger.error("No permission to"
 
 
1475
                                     " bind to interface %s",
 
1448
1476
                                     self.interface)
 
1449
1477
                    elif error[0] == errno.ENOPROTOOPT:
 
1450
 
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1451
 
                                     u" cannot bind to interface %s",
 
 
1478
                        logger.error("SO_BINDTODEVICE not available;"
 
 
1479
                                     " cannot bind to interface %s",
 
1452
1480
                                     self.interface)
 
 
1511
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1512
1540
                   client_object=None):
 
1513
1541
        condition_names = {
 
1514
 
            gobject.IO_IN: u"IN",   # There is data to read.
 
1515
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
 
1542
            gobject.IO_IN: "IN",   # There is data to read.
 
 
1543
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1517
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1518
 
            gobject.IO_ERR: u"ERR", # Error condition.
 
1519
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
 
1545
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
 
1546
            gobject.IO_ERR: "ERR", # Error condition.
 
 
1547
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1520
1548
                                    # broken, usually for pipes and
 
 
1582
1610
def string_to_delta(interval):
 
1583
1611
    """Parse a string and return a datetime.timedelta
 
1585
 
    >>> string_to_delta(u'7d')
 
 
1613
    >>> string_to_delta('7d')
 
1586
1614
    datetime.timedelta(7)
 
1587
 
    >>> string_to_delta(u'60s')
 
 
1615
    >>> string_to_delta('60s')
 
1588
1616
    datetime.timedelta(0, 60)
 
1589
 
    >>> string_to_delta(u'60m')
 
 
1617
    >>> string_to_delta('60m')
 
1590
1618
    datetime.timedelta(0, 3600)
 
1591
 
    >>> string_to_delta(u'24h')
 
 
1619
    >>> string_to_delta('24h')
 
1592
1620
    datetime.timedelta(1)
 
1593
 
    >>> string_to_delta(u'1w')
 
 
1621
    >>> string_to_delta('1w')
 
1594
1622
    datetime.timedelta(7)
 
1595
 
    >>> string_to_delta(u'5m 30s')
 
 
1623
    >>> string_to_delta('5m 30s')
 
1596
1624
    datetime.timedelta(0, 330)
 
1598
1626
    timevalue = datetime.timedelta(0)
 
 
1601
1629
            suffix = unicode(s[-1])
 
1602
1630
            value = int(s[:-1])
 
1604
1632
                delta = datetime.timedelta(value)
 
1605
 
            elif suffix == u"s":
 
1606
1634
                delta = datetime.timedelta(0, value)
 
1607
 
            elif suffix == u"m":
 
1608
1636
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
1609
 
            elif suffix == u"h":
 
1610
1638
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
1611
 
            elif suffix == u"w":
 
1612
1640
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
1614
 
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1615
 
        except (ValueError, IndexError), e:
 
1616
 
            raise ValueError(e.message)
 
 
1642
                raise ValueError("Unknown suffix %r" % suffix)
 
 
1643
        except (ValueError, IndexError) as e:
 
 
1644
            raise ValueError(*(e.args))
 
1617
1645
        timevalue += delta
 
1618
1646
    return timevalue
 
 
1625
1653
    global if_nametoindex
 
1627
1655
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1628
 
                          (ctypes.util.find_library(u"c"))
 
 
1656
                          (ctypes.util.find_library("c"))
 
1629
1657
                          .if_nametoindex)
 
1630
1658
    except (OSError, AttributeError):
 
1631
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
 
1659
        logger.warning("Doing if_nametoindex the hard way")
 
1632
1660
        def if_nametoindex(interface):
 
1633
1661
            "Get an interface index the hard way, i.e. using fcntl()"
 
1634
1662
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1635
1663
            with contextlib.closing(socket.socket()) as s:
 
1636
1664
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1637
 
                                    struct.pack(str(u"16s16x"),
 
 
1665
                                    struct.pack(str("16s16x"),
 
1639
 
            interface_index = struct.unpack(str(u"I"),
 
 
1667
            interface_index = struct.unpack(str("I"),
 
1640
1668
                                            ifreq[16:20])[0]
 
1641
1669
            return interface_index
 
1642
1670
    return if_nametoindex(interface)
 
 
1672
1700
    ##################################################################
 
1673
1701
    # Parsing of options, both command line and config file
 
1675
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1676
 
    parser.add_option("-i", u"--interface", type=u"string",
 
1677
 
                      metavar="IF", help=u"Bind to interface IF")
 
1678
 
    parser.add_option("-a", u"--address", type=u"string",
 
1679
 
                      help=u"Address to listen for requests on")
 
1680
 
    parser.add_option("-p", u"--port", type=u"int",
 
1681
 
                      help=u"Port number to receive requests on")
 
1682
 
    parser.add_option("--check", action=u"store_true",
 
1683
 
                      help=u"Run self-test")
 
1684
 
    parser.add_option("--debug", action=u"store_true",
 
1685
 
                      help=u"Debug mode; run in foreground and log to"
 
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
 
1688
 
                      help=u"Debug level for stdout output")
 
1689
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1690
 
                      u" priority string (see GnuTLS documentation)")
 
1691
 
    parser.add_option("--servicename", type=u"string",
 
1692
 
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1693
 
    parser.add_option("--configdir", type=u"string",
 
1694
 
                      default=u"/etc/mandos", metavar=u"DIR",
 
1695
 
                      help=u"Directory to search for configuration"
 
1697
 
    parser.add_option("--no-dbus", action=u"store_false",
 
1698
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1699
 
                      u" system bus interface")
 
1700
 
    parser.add_option("--no-ipv6", action=u"store_false",
 
1701
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1702
 
    options = parser.parse_args()[0]
 
 
1703
    parser = argparse.ArgumentParser()
 
 
1704
    parser.add_argument("-v", "--version", action="version",
 
 
1705
                        version = "%%(prog)s %s" % version,
 
 
1706
                        help="show version number and exit")
 
 
1707
    parser.add_argument("-i", "--interface", metavar="IF",
 
 
1708
                        help="Bind to interface IF")
 
 
1709
    parser.add_argument("-a", "--address",
 
 
1710
                        help="Address to listen for requests on")
 
 
1711
    parser.add_argument("-p", "--port", type=int,
 
 
1712
                        help="Port number to receive requests on")
 
 
1713
    parser.add_argument("--check", action="store_true",
 
 
1714
                        help="Run self-test")
 
 
1715
    parser.add_argument("--debug", action="store_true",
 
 
1716
                        help="Debug mode; run in foreground and log"
 
 
1718
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
 
1719
                        help="Debug level for stdout output")
 
 
1720
    parser.add_argument("--priority", help="GnuTLS"
 
 
1721
                        " priority string (see GnuTLS documentation)")
 
 
1722
    parser.add_argument("--servicename",
 
 
1723
                        metavar="NAME", help="Zeroconf service name")
 
 
1724
    parser.add_argument("--configdir",
 
 
1725
                        default="/etc/mandos", metavar="DIR",
 
 
1726
                        help="Directory to search for configuration"
 
 
1728
    parser.add_argument("--no-dbus", action="store_false",
 
 
1729
                        dest="use_dbus", help="Do not provide D-Bus"
 
 
1730
                        " system bus interface")
 
 
1731
    parser.add_argument("--no-ipv6", action="store_false",
 
 
1732
                        dest="use_ipv6", help="Do not use IPv6")
 
 
1733
    options = parser.parse_args()
 
1704
1735
    if options.check:
 
 
1709
1740
    # Default values for config file for server-global settings
 
1710
 
    server_defaults = { u"interface": u"",
 
1715
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1716
 
                        u"servicename": u"Mandos",
 
1717
 
                        u"use_dbus": u"True",
 
1718
 
                        u"use_ipv6": u"True",
 
 
1741
    server_defaults = { "interface": "",
 
 
1746
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1747
                        "servicename": "Mandos",
 
1722
1753
    # Parse config file for server-global settings
 
1723
1754
    server_config = configparser.SafeConfigParser(server_defaults)
 
1724
1755
    del server_defaults
 
1725
1756
    server_config.read(os.path.join(options.configdir,
 
1727
1758
    # Convert the SafeConfigParser object to a dict
 
1728
1759
    server_settings = server_config.defaults()
 
1729
1760
    # Use the appropriate methods on the non-string config options
 
1730
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1731
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
 
1761
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
1762
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1733
1764
    if server_settings["port"]:
 
1734
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
 
1765
        server_settings["port"] = server_config.getint("DEFAULT",
 
1736
1767
    del server_config
 
1738
1769
    # Override the settings from the config file with command line
 
1739
1770
    # options, if set.
 
1740
 
    for option in (u"interface", u"address", u"port", u"debug",
 
1741
 
                   u"priority", u"servicename", u"configdir",
 
1742
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
 
1771
    for option in ("interface", "address", "port", "debug",
 
 
1772
                   "priority", "servicename", "configdir",
 
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1743
1774
        value = getattr(options, option)
 
1744
1775
        if value is not None:
 
1745
1776
            server_settings[option] = value
 
 
1753
1784
    ##################################################################
 
1755
1786
    # For convenience
 
1756
 
    debug = server_settings[u"debug"]
 
1757
 
    debuglevel = server_settings[u"debuglevel"]
 
1758
 
    use_dbus = server_settings[u"use_dbus"]
 
1759
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
 
1787
    debug = server_settings["debug"]
 
 
1788
    debuglevel = server_settings["debuglevel"]
 
 
1789
    use_dbus = server_settings["use_dbus"]
 
 
1790
    use_ipv6 = server_settings["use_ipv6"]
 
1761
 
    if server_settings[u"servicename"] != u"Mandos":
 
 
1792
    if server_settings["servicename"] != "Mandos":
 
1762
1793
        syslogger.setFormatter(logging.Formatter
 
1763
 
                               (u'Mandos (%s) [%%(process)d]:'
 
1764
 
                                u' %%(levelname)s: %%(message)s'
 
1765
 
                                % server_settings[u"servicename"]))
 
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
 
1795
                                ' %%(levelname)s: %%(message)s'
 
 
1796
                                % server_settings["servicename"]))
 
1767
1798
    # Parse config file with clients
 
1768
 
    client_defaults = { u"timeout": u"1h",
 
1770
 
                        u"checker": u"fping -q -- %%(host)s",
 
1772
 
                        u"approval_delay": u"0s",
 
1773
 
                        u"approval_duration": u"1s",
 
 
1799
    client_defaults = { "timeout": "1h",
 
 
1801
                        "checker": "fping -q -- %%(host)s",
 
 
1803
                        "approval_delay": "0s",
 
 
1804
                        "approval_duration": "1s",
 
1775
1806
    client_config = configparser.SafeConfigParser(client_defaults)
 
1776
 
    client_config.read(os.path.join(server_settings[u"configdir"],
 
 
1807
    client_config.read(os.path.join(server_settings["configdir"],
 
1779
1810
    global mandos_dbus_service
 
1780
1811
    mandos_dbus_service = None
 
1782
 
    tcp_server = MandosServer((server_settings[u"address"],
 
1783
 
                               server_settings[u"port"]),
 
 
1813
    tcp_server = MandosServer((server_settings["address"],
 
 
1814
                               server_settings["port"]),
 
1785
 
                              interface=(server_settings[u"interface"]
 
 
1816
                              interface=(server_settings["interface"]
 
1787
1818
                              use_ipv6=use_ipv6,
 
1788
1819
                              gnutls_priority=
 
1789
 
                              server_settings[u"priority"],
 
 
1820
                              server_settings["priority"],
 
1790
1821
                              use_dbus=use_dbus)
 
1792
 
        pidfilename = u"/var/run/mandos.pid"
 
 
1823
        pidfilename = "/var/run/mandos.pid"
 
1794
 
            pidfile = open(pidfilename, u"w")
 
 
1825
            pidfile = open(pidfilename, "w")
 
1795
1826
        except IOError:
 
1796
 
            logger.error(u"Could not open file %r", pidfilename)
 
 
1827
            logger.error("Could not open file %r", pidfilename)
 
1799
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1800
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
 
1830
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
1831
        gid = pwd.getpwnam("_mandos").pw_gid
 
1801
1832
    except KeyError:
 
1803
 
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1804
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
 
1834
            uid = pwd.getpwnam("mandos").pw_uid
 
 
1835
            gid = pwd.getpwnam("mandos").pw_gid
 
1805
1836
        except KeyError:
 
1807
 
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1808
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
 
1809
1840
            except KeyError:
 
1815
 
    except OSError, error:
 
 
1846
    except OSError as error:
 
1816
1847
        if error[0] != errno.EPERM:
 
 
1856
1891
    # End of Avahi example code
 
1859
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1860
1895
                                            bus, do_not_queue=True)
 
1861
 
        except dbus.exceptions.NameExistsException, e:
 
1862
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
 
1896
        except dbus.exceptions.NameExistsException as e:
 
 
1897
            logger.error(unicode(e) + ", disabling D-Bus")
 
1863
1898
            use_dbus = False
 
1864
 
            server_settings[u"use_dbus"] = False
 
 
1899
            server_settings["use_dbus"] = False
 
1865
1900
            tcp_server.use_dbus = False
 
1866
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1867
 
    service = AvahiService(name = server_settings[u"servicename"],
 
1868
 
                           servicetype = u"_mandos._tcp",
 
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
 
1903
                           servicetype = "_mandos._tcp",
 
1869
1904
                           protocol = protocol, bus = bus)
 
1870
1905
    if server_settings["interface"]:
 
1871
1906
        service.interface = (if_nametoindex
 
1872
 
                             (str(server_settings[u"interface"])))
 
1875
 
        # Close all input and output, do double fork, etc.
 
 
1907
                             (str(server_settings["interface"])))
 
1878
1909
    global multiprocessing_manager
 
1879
1910
    multiprocessing_manager = multiprocessing.Manager()
 
 
1924
1955
        class MandosDBusService(dbus.service.Object):
 
1925
1956
            """A D-Bus proxy object"""
 
1926
1957
            def __init__(self):
 
1927
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1928
 
            _interface = u"se.bsnet.fukt.Mandos"
 
 
1958
                dbus.service.Object.__init__(self, bus, "/")
 
 
1959
            _interface = "se.bsnet.fukt.Mandos"
 
1930
 
            @dbus.service.signal(_interface, signature=u"o")
 
 
1961
            @dbus.service.signal(_interface, signature="o")
 
1931
1962
            def ClientAdded(self, objpath):
 
1935
 
            @dbus.service.signal(_interface, signature=u"ss")
 
 
1966
            @dbus.service.signal(_interface, signature="ss")
 
1936
1967
            def ClientNotFound(self, fingerprint, address):
 
1940
 
            @dbus.service.signal(_interface, signature=u"os")
 
 
1971
            @dbus.service.signal(_interface, signature="os")
 
1941
1972
            def ClientRemoved(self, objpath, name):
 
1945
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
 
1976
            @dbus.service.method(_interface, out_signature="ao")
 
1946
1977
            def GetAllClients(self):
 
1948
1979
                return dbus.Array(c.dbus_object_path
 
1949
1980
                                  for c in tcp_server.clients)
 
1951
1982
            @dbus.service.method(_interface,
 
1952
 
                                 out_signature=u"a{oa{sv}}")
 
 
1983
                                 out_signature="a{oa{sv}}")
 
1953
1984
            def GetAllClientsWithProperties(self):
 
1955
1986
                return dbus.Dictionary(
 
1956
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
 
1987
                    ((c.dbus_object_path, c.GetAll(""))
 
1957
1988
                     for c in tcp_server.clients),
 
1958
 
                    signature=u"oa{sv}")
 
1960
 
            @dbus.service.method(_interface, in_signature=u"o")
 
 
1991
            @dbus.service.method(_interface, in_signature="o")
 
1961
1992
            def RemoveClient(self, object_path):
 
1963
1994
                for c in tcp_server.clients:
 
 
2029
2060
                             (tcp_server.handle_request
 
2030
2061
                              (*args[2:], **kwargs) or True))
 
2032
 
        logger.debug(u"Starting main loop")
 
 
2063
        logger.debug("Starting main loop")
 
2033
2064
        main_loop.run()
 
2034
 
    except AvahiError, error:
 
2035
 
        logger.critical(u"AvahiError: %s", error)
 
 
2065
    except AvahiError as error:
 
 
2066
        logger.critical("AvahiError: %s", error)
 
2038
2069
    except KeyboardInterrupt:
 
2041
 
        logger.debug(u"Server received KeyboardInterrupt")
 
2042
 
    logger.debug(u"Server exiting")
 
 
2071
            print("", file=sys.stderr)
 
 
2072
        logger.debug("Server received KeyboardInterrupt")
 
 
2073
    logger.debug("Server exiting")
 
2043
2074
    # Must run before the D-Bus bus name gets deregistered