/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2010-08-23 19:23:15 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100823192315-pefgye0l6cavcejs
* debian/control (mandos/Depends): Added "python-urwid".
* mandos (Client.approved_by_default): Changed default to "True".
  (Client.approved_delay): Changed default to "0s".
  (ClientDBus.GotSecret, ClientDBus.Rejected,
  ClientDBus.NeedApproval): Emit "PropertyChanged" signal for the
                            "approved_pending" property.

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 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
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import (division, absolute_import, print_function,
35
 
                        unicode_literals)
 
34
from __future__ import division, with_statement, absolute_import
36
35
 
37
36
import SocketServer as socketserver
38
37
import socket
39
 
import argparse
 
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
82
81
        SO_BINDTODEVICE = None
83
82
 
84
83
 
85
 
version = "1.3.0"
 
84
version = "1.0.14"
86
85
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
86
logger = logging.Logger(u'mandos')
89
87
syslogger = (logging.handlers.SysLogHandler
90
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
89
              address = "/dev/log"))
92
90
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
95
93
logger.addHandler(syslogger)
96
94
 
97
95
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
101
99
logger.addHandler(console)
102
100
 
 
101
multiprocessing_manager = multiprocessing.Manager()
 
102
 
103
103
class AvahiError(Exception):
104
104
    def __init__(self, value, *args, **kwargs):
105
105
        self.value = value
120
120
    Attributes:
121
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
122
               Used to optionally bind to the specified interface.
123
 
    name: string; Example: 'Mandos'
124
 
    type: string; Example: '_mandos._tcp'.
 
123
    name: string; Example: u'Mandos'
 
124
    type: string; Example: u'_mandos._tcp'.
125
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
126
    port: integer; what port to announce
127
127
    TXT: list of strings; TXT record for the service
136
136
    """
137
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
138
                 servicetype = None, port = None, TXT = None,
139
 
                 domain = "", host = "", max_renames = 32768,
 
139
                 domain = u"", host = u"", max_renames = 32768,
140
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
141
141
        self.interface = interface
142
142
        self.name = name
151
151
        self.group = None       # our entry group
152
152
        self.server = None
153
153
        self.bus = bus
154
 
        self.entry_group_state_changed_match = None
155
154
    def rename(self):
156
155
        """Derived from the Avahi example code"""
157
156
        if self.rename_count >= self.max_renames:
158
 
            logger.critical("No suitable Zeroconf service name found"
159
 
                            " after %i retries, exiting.",
 
157
            logger.critical(u"No suitable Zeroconf service name found"
 
158
                            u" after %i retries, exiting.",
160
159
                            self.rename_count)
161
 
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
 
        logger.info("Changing Zeroconf service name to %r ...",
164
 
                    self.name)
 
160
            raise AvahiServiceError(u"Too many renames")
 
161
        self.name = self.server.GetAlternativeServiceName(self.name)
 
162
        logger.info(u"Changing Zeroconf service name to %r ...",
 
163
                    unicode(self.name))
165
164
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
 
165
                               (u'Mandos (%s) [%%(process)d]:'
 
166
                                u' %%(levelname)s: %%(message)s'
168
167
                                % self.name))
169
168
        self.remove()
170
 
        try:
171
 
            self.add()
172
 
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
174
 
            self.cleanup()
175
 
            os._exit(1)
 
169
        self.add()
176
170
        self.rename_count += 1
177
171
    def remove(self):
178
172
        """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
182
173
        if self.group is not None:
183
174
            self.group.Reset()
184
175
    def add(self):
185
176
        """Derived from the Avahi example code"""
186
 
        self.remove()
187
177
        if self.group is None:
188
178
            self.group = dbus.Interface(
189
179
                self.bus.get_object(avahi.DBUS_NAME,
190
180
                                    self.server.EntryGroupNew()),
191
181
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
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' ...",
 
182
            self.group.connect_to_signal('StateChanged',
 
183
                                         self
 
184
                                         .entry_group_state_changed)
 
185
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
186
                     self.name, self.type)
197
187
        self.group.AddService(
198
188
            self.interface,
205
195
        self.group.Commit()
206
196
    def entry_group_state_changed(self, state, error):
207
197
        """Derived from the Avahi example code"""
208
 
        logger.debug("Avahi entry group state change: %i", state)
 
198
        logger.debug(u"Avahi state change: %i", state)
209
199
        
210
200
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
 
            logger.debug("Zeroconf service established.")
 
201
            logger.debug(u"Zeroconf service established.")
212
202
        elif state == avahi.ENTRY_GROUP_COLLISION:
213
 
            logger.info("Zeroconf service name collision.")
 
203
            logger.warning(u"Zeroconf service name collision.")
214
204
            self.rename()
215
205
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
 
            logger.critical("Avahi: Error in group state changed %s",
 
206
            logger.critical(u"Avahi: Error in group state changed %s",
217
207
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
 
208
            raise AvahiGroupError(u"State changed: %s"
219
209
                                  % unicode(error))
220
210
    def cleanup(self):
221
211
        """Derived from the Avahi example code"""
222
212
        if self.group is not None:
223
 
            try:
224
 
                self.group.Free()
225
 
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
227
 
                pass
 
213
            self.group.Free()
228
214
            self.group = None
229
 
        self.remove()
230
 
    def server_state_changed(self, state, error=None):
 
215
    def server_state_changed(self, state):
231
216
        """Derived from the Avahi example code"""
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:
242
 
                if error is None:
243
 
                    logger.error(bad_states[state])
244
 
                else:
245
 
                    logger.error(bad_states[state] + ": %r", error)
246
 
            self.cleanup()
 
217
        if state == avahi.SERVER_COLLISION:
 
218
            logger.error(u"Zeroconf server name collision")
 
219
            self.remove()
247
220
        elif state == avahi.SERVER_RUNNING:
248
221
            self.add()
249
 
        else:
250
 
            if error is None:
251
 
                logger.debug("Unknown state: %r", state)
252
 
            else:
253
 
                logger.debug("Unknown state: %r: %r", state, error)
254
222
    def activate(self):
255
223
        """Derived from the Avahi example code"""
256
224
        if self.server is None:
257
225
            self.server = dbus.Interface(
258
226
                self.bus.get_object(avahi.DBUS_NAME,
259
 
                                    avahi.DBUS_PATH_SERVER,
260
 
                                    follow_name_owner_changes=True),
 
227
                                    avahi.DBUS_PATH_SERVER),
261
228
                avahi.DBUS_INTERFACE_SERVER)
262
 
        self.server.connect_to_signal("StateChanged",
 
229
        self.server.connect_to_signal(u"StateChanged",
263
230
                                 self.server_state_changed)
264
231
        self.server_state_changed(self.server.GetState())
265
232
 
268
235
    """A representation of a client host served by this server.
269
236
    
270
237
    Attributes:
271
 
    _approved:   bool(); 'None' if not yet approved/disapproved
272
 
    approval_delay: datetime.timedelta(); Time to wait for approval
273
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
238
    name:       string; from the config file, used in log messages and
 
239
                        D-Bus identifiers
 
240
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
241
                 uniquely identify the client
 
242
    secret:     bytestring; sent verbatim (over TLS) to client
 
243
    host:       string; available for use by the checker command
 
244
    created:    datetime.datetime(); (UTC) object creation
 
245
    last_enabled: datetime.datetime(); (UTC)
 
246
    enabled:    bool()
 
247
    last_checked_ok: datetime.datetime(); (UTC) or None
 
248
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
249
                                      until this client is disabled
 
250
    interval:   datetime.timedelta(); How often to start a new checker
 
251
    disable_hook:  If set, called by disable() as disable_hook(self)
274
252
    checker:    subprocess.Popen(); a running checker process used
275
253
                                    to see if the client lives.
276
254
                                    'None' if no process is running.
277
 
    checker_callback_tag: a gobject event source tag, or None
278
 
    checker_command: string; External command which is run to check
279
 
                     if client lives.  %() expansions are done at
 
255
    checker_initiator_tag: a gobject event source tag, or None
 
256
    disable_initiator_tag: - '' -
 
257
    checker_callback_tag:  - '' -
 
258
    checker_command: string; External command which is run to check if
 
259
                     client lives.  %() expansions are done at
280
260
                     runtime with vars(self) as dict, so that for
281
261
                     instance %(name)s can be used in the command.
282
 
    checker_initiator_tag: a gobject event source tag, or None
283
 
    created:    datetime.datetime(); (UTC) object creation
284
262
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
 
    disable_initiator_tag: a gobject event source tag, or None
287
 
    enabled:    bool()
288
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
289
 
                 uniquely identify the client
290
 
    host:       string; available for use by the checker command
291
 
    interval:   datetime.timedelta(); How often to start a new checker
292
 
    last_approval_request: datetime.datetime(); (UTC) or None
293
 
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
295
 
    name:       string; from the config file, used in log messages and
296
 
                        D-Bus identifiers
297
 
    secret:     bytestring; sent verbatim (over TLS) to client
298
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
 
                                      until this client is disabled
300
 
    runtime_expansions: Allowed attributes for runtime expansion.
 
263
    approved_delay: datetime.timedelta(); Time to wait for approval
 
264
    _approved:   bool(); 'None' if not yet approved/disapproved
 
265
    approved_duration: datetime.timedelta(); Duration of one approval
301
266
    """
302
267
    
303
 
    runtime_expansions = ("approval_delay", "approval_duration",
304
 
                          "created", "enabled", "fingerprint",
305
 
                          "host", "interval", "last_checked_ok",
306
 
                          "last_enabled", "name", "timeout")
307
 
    
308
268
    @staticmethod
309
269
    def _timedelta_to_milliseconds(td):
310
270
        "Convert a datetime.timedelta() to milliseconds"
320
280
        "Return the 'interval' attribute in milliseconds"
321
281
        return self._timedelta_to_milliseconds(self.interval)
322
282
 
323
 
    def approval_delay_milliseconds(self):
324
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
283
    def approved_delay_milliseconds(self):
 
284
        return self._timedelta_to_milliseconds(self.approved_delay)
325
285
    
326
286
    def __init__(self, name = None, disable_hook=None, config=None):
327
287
        """Note: the 'checker' key in 'config' sets the
330
290
        self.name = name
331
291
        if config is None:
332
292
            config = {}
333
 
        logger.debug("Creating client %r", self.name)
 
293
        logger.debug(u"Creating client %r", self.name)
334
294
        # Uppercase and remove spaces from fingerprint for later
335
295
        # comparison purposes with return value from the fingerprint()
336
296
        # function
337
 
        self.fingerprint = (config["fingerprint"].upper()
338
 
                            .replace(" ", ""))
339
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
340
 
        if "secret" in config:
341
 
            self.secret = config["secret"].decode("base64")
342
 
        elif "secfile" in config:
 
297
        self.fingerprint = (config[u"fingerprint"].upper()
 
298
                            .replace(u" ", u""))
 
299
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
300
        if u"secret" in config:
 
301
            self.secret = config[u"secret"].decode(u"base64")
 
302
        elif u"secfile" in config:
343
303
            with open(os.path.expanduser(os.path.expandvars
344
 
                                         (config["secfile"])),
 
304
                                         (config[u"secfile"])),
345
305
                      "rb") as secfile:
346
306
                self.secret = secfile.read()
347
307
        else:
348
 
            raise TypeError("No secret or secfile for client %s"
 
308
            #XXX Need to allow secret on demand!
 
309
            raise TypeError(u"No secret or secfile for client %s"
349
310
                            % self.name)
350
 
        self.host = config.get("host", "")
 
311
        self.host = config.get(u"host", u"")
351
312
        self.created = datetime.datetime.utcnow()
352
313
        self.enabled = False
353
 
        self.last_approval_request = None
354
314
        self.last_enabled = None
355
315
        self.last_checked_ok = None
356
 
        self.timeout = string_to_delta(config["timeout"])
357
 
        self.interval = string_to_delta(config["interval"])
 
316
        self.timeout = string_to_delta(config[u"timeout"])
 
317
        self.interval = string_to_delta(config[u"interval"])
358
318
        self.disable_hook = disable_hook
359
319
        self.checker = None
360
320
        self.checker_initiator_tag = None
361
321
        self.disable_initiator_tag = None
362
322
        self.checker_callback_tag = None
363
 
        self.checker_command = config["checker"]
 
323
        self.checker_command = config[u"checker"]
364
324
        self.current_checker_command = None
365
325
        self.last_connect = None
 
326
        self.approvals_pending = 0
366
327
        self._approved = None
367
 
        self.approved_by_default = config.get("approved_by_default",
 
328
        self.approved_by_default = config.get(u"approved_by_default",
368
329
                                              True)
369
 
        self.approvals_pending = 0
370
 
        self.approval_delay = string_to_delta(
371
 
            config["approval_delay"])
372
 
        self.approval_duration = string_to_delta(
373
 
            config["approval_duration"])
 
330
        self.approved_delay = string_to_delta(
 
331
            config[u"approved_delay"])
 
332
        self.approved_duration = string_to_delta(
 
333
            config[u"approved_duration"])
374
334
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
375
 
    
 
335
 
376
336
    def send_changedstate(self):
377
337
        self.changedstate.acquire()
378
338
        self.changedstate.notify_all()
380
340
        
381
341
    def enable(self):
382
342
        """Start this client's checker and timeout hooks"""
383
 
        if getattr(self, "enabled", False):
 
343
        if getattr(self, u"enabled", False):
384
344
            # Already enabled
385
345
            return
386
346
        self.send_changedstate()
405
365
        if not quiet:
406
366
            self.send_changedstate()
407
367
        if not quiet:
408
 
            logger.info("Disabling client %s", self.name)
409
 
        if getattr(self, "disable_initiator_tag", False):
 
368
            logger.info(u"Disabling client %s", self.name)
 
369
        if getattr(self, u"disable_initiator_tag", False):
410
370
            gobject.source_remove(self.disable_initiator_tag)
411
371
            self.disable_initiator_tag = None
412
 
        if getattr(self, "checker_initiator_tag", False):
 
372
        if getattr(self, u"checker_initiator_tag", False):
413
373
            gobject.source_remove(self.checker_initiator_tag)
414
374
            self.checker_initiator_tag = None
415
375
        self.stop_checker()
430
390
        if os.WIFEXITED(condition):
431
391
            exitstatus = os.WEXITSTATUS(condition)
432
392
            if exitstatus == 0:
433
 
                logger.info("Checker for %(name)s succeeded",
 
393
                logger.info(u"Checker for %(name)s succeeded",
434
394
                            vars(self))
435
395
                self.checked_ok()
436
396
            else:
437
 
                logger.info("Checker for %(name)s failed",
 
397
                logger.info(u"Checker for %(name)s failed",
438
398
                            vars(self))
439
399
        else:
440
 
            logger.warning("Checker for %(name)s crashed?",
 
400
            logger.warning(u"Checker for %(name)s crashed?",
441
401
                           vars(self))
442
402
    
443
403
    def checked_ok(self):
452
412
                                      (self.timeout_milliseconds(),
453
413
                                       self.disable))
454
414
    
455
 
    def need_approval(self):
456
 
        self.last_approval_request = datetime.datetime.utcnow()
457
 
    
458
415
    def start_checker(self):
459
416
        """Start a new checker subprocess if one is not running.
460
417
        
472
429
        # If a checker exists, make sure it is not a zombie
473
430
        try:
474
431
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
475
 
        except (AttributeError, OSError) as error:
 
432
        except (AttributeError, OSError), error:
476
433
            if (isinstance(error, OSError)
477
434
                and error.errno != errno.ECHILD):
478
435
                raise error
479
436
        else:
480
437
            if pid:
481
 
                logger.warning("Checker was a zombie")
 
438
                logger.warning(u"Checker was a zombie")
482
439
                gobject.source_remove(self.checker_callback_tag)
483
440
                self.checker_callback(pid, status,
484
441
                                      self.current_checker_command)
489
446
                command = self.checker_command % self.host
490
447
            except TypeError:
491
448
                # Escape attributes for the shell
492
 
                escaped_attrs = dict(
493
 
                    (attr,
494
 
                     re.escape(unicode(str(getattr(self, attr, "")),
495
 
                                       errors=
496
 
                                       'replace')))
497
 
                    for attr in
498
 
                    self.runtime_expansions)
499
 
 
 
449
                escaped_attrs = dict((key,
 
450
                                      re.escape(unicode(str(val),
 
451
                                                        errors=
 
452
                                                        u'replace')))
 
453
                                     for key, val in
 
454
                                     vars(self).iteritems())
500
455
                try:
501
456
                    command = self.checker_command % escaped_attrs
502
 
                except TypeError as error:
503
 
                    logger.error('Could not format string "%s":'
504
 
                                 ' %s', self.checker_command, error)
 
457
                except TypeError, error:
 
458
                    logger.error(u'Could not format string "%s":'
 
459
                                 u' %s', self.checker_command, error)
505
460
                    return True # Try again later
506
461
            self.current_checker_command = command
507
462
            try:
508
 
                logger.info("Starting checker %r for %s",
 
463
                logger.info(u"Starting checker %r for %s",
509
464
                            command, self.name)
510
465
                # We don't need to redirect stdout and stderr, since
511
466
                # in normal mode, that is already done by daemon(),
513
468
                # always replaced by /dev/null.)
514
469
                self.checker = subprocess.Popen(command,
515
470
                                                close_fds=True,
516
 
                                                shell=True, cwd="/")
 
471
                                                shell=True, cwd=u"/")
517
472
                self.checker_callback_tag = (gobject.child_watch_add
518
473
                                             (self.checker.pid,
519
474
                                              self.checker_callback,
524
479
                if pid:
525
480
                    gobject.source_remove(self.checker_callback_tag)
526
481
                    self.checker_callback(pid, status, command)
527
 
            except OSError as error:
528
 
                logger.error("Failed to start subprocess: %s",
 
482
            except OSError, error:
 
483
                logger.error(u"Failed to start subprocess: %s",
529
484
                             error)
530
485
        # Re-run this periodically if run by gobject.timeout_add
531
486
        return True
535
490
        if self.checker_callback_tag:
536
491
            gobject.source_remove(self.checker_callback_tag)
537
492
            self.checker_callback_tag = None
538
 
        if getattr(self, "checker", None) is None:
 
493
        if getattr(self, u"checker", None) is None:
539
494
            return
540
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
495
        logger.debug(u"Stopping checker for %(name)s", vars(self))
541
496
        try:
542
497
            os.kill(self.checker.pid, signal.SIGTERM)
543
498
            #time.sleep(0.5)
544
499
            #if self.checker.poll() is None:
545
500
            #    os.kill(self.checker.pid, signal.SIGKILL)
546
 
        except OSError as error:
 
501
        except OSError, error:
547
502
            if error.errno != errno.ESRCH: # No such process
548
503
                raise
549
504
        self.checker = None
550
505
 
551
 
def dbus_service_property(dbus_interface, signature="v",
552
 
                          access="readwrite", byte_arrays=False):
 
506
def dbus_service_property(dbus_interface, signature=u"v",
 
507
                          access=u"readwrite", byte_arrays=False):
553
508
    """Decorators for marking methods of a DBusObjectWithProperties to
554
509
    become properties on the D-Bus.
555
510
    
562
517
    """
563
518
    # Encoding deeply encoded byte arrays is not supported yet by the
564
519
    # "Set" method, so we fail early here:
565
 
    if byte_arrays and signature != "ay":
566
 
        raise ValueError("Byte arrays not supported for non-'ay'"
567
 
                         " signature %r" % signature)
 
520
    if byte_arrays and signature != u"ay":
 
521
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
522
                         u" signature %r" % signature)
568
523
    def decorator(func):
569
524
        func._dbus_is_property = True
570
525
        func._dbus_interface = dbus_interface
571
526
        func._dbus_signature = signature
572
527
        func._dbus_access = access
573
528
        func._dbus_name = func.__name__
574
 
        if func._dbus_name.endswith("_dbus_property"):
 
529
        if func._dbus_name.endswith(u"_dbus_property"):
575
530
            func._dbus_name = func._dbus_name[:-14]
576
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
531
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
577
532
        return func
578
533
    return decorator
579
534
 
607
562
    
608
563
    @staticmethod
609
564
    def _is_dbus_property(obj):
610
 
        return getattr(obj, "_dbus_is_property", False)
 
565
        return getattr(obj, u"_dbus_is_property", False)
611
566
    
612
567
    def _get_all_dbus_properties(self):
613
568
        """Returns a generator of (name, attribute) pairs
621
576
        property with the specified name and interface.
622
577
        """
623
578
        for name in (property_name,
624
 
                     property_name + "_dbus_property"):
 
579
                     property_name + u"_dbus_property"):
625
580
            prop = getattr(self, name, None)
626
581
            if (prop is None
627
582
                or not self._is_dbus_property(prop)
631
586
                continue
632
587
            return prop
633
588
        # No such property
634
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
 
                                   + interface_name + "."
 
589
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
590
                                   + interface_name + u"."
636
591
                                   + property_name)
637
592
    
638
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
639
 
                         out_signature="v")
 
593
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
594
                         out_signature=u"v")
640
595
    def Get(self, interface_name, property_name):
641
596
        """Standard D-Bus property Get() method, see D-Bus standard.
642
597
        """
643
598
        prop = self._get_dbus_property(interface_name, property_name)
644
 
        if prop._dbus_access == "write":
 
599
        if prop._dbus_access == u"write":
645
600
            raise DBusPropertyAccessException(property_name)
646
601
        value = prop()
647
 
        if not hasattr(value, "variant_level"):
 
602
        if not hasattr(value, u"variant_level"):
648
603
            return value
649
604
        return type(value)(value, variant_level=value.variant_level+1)
650
605
    
651
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
606
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
652
607
    def Set(self, interface_name, property_name, value):
653
608
        """Standard D-Bus property Set() method, see D-Bus standard.
654
609
        """
655
610
        prop = self._get_dbus_property(interface_name, property_name)
656
 
        if prop._dbus_access == "read":
 
611
        if prop._dbus_access == u"read":
657
612
            raise DBusPropertyAccessException(property_name)
658
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
613
        if prop._dbus_get_args_options[u"byte_arrays"]:
659
614
            # The byte_arrays option is not supported yet on
660
615
            # signatures other than "ay".
661
 
            if prop._dbus_signature != "ay":
 
616
            if prop._dbus_signature != u"ay":
662
617
                raise ValueError
663
618
            value = dbus.ByteArray(''.join(unichr(byte)
664
619
                                           for byte in value))
665
620
        prop(value)
666
621
    
667
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
 
                         out_signature="a{sv}")
 
622
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
623
                         out_signature=u"a{sv}")
669
624
    def GetAll(self, interface_name):
670
625
        """Standard D-Bus property GetAll() method, see D-Bus
671
626
        standard.
679
634
                # Interface non-empty but did not match
680
635
                continue
681
636
            # Ignore write-only properties
682
 
            if prop._dbus_access == "write":
 
637
            if prop._dbus_access == u"write":
683
638
                continue
684
639
            value = prop()
685
 
            if not hasattr(value, "variant_level"):
 
640
            if not hasattr(value, u"variant_level"):
686
641
                all[name] = value
687
642
                continue
688
643
            all[name] = type(value)(value, variant_level=
689
644
                                    value.variant_level+1)
690
 
        return dbus.Dictionary(all, signature="sv")
 
645
        return dbus.Dictionary(all, signature=u"sv")
691
646
    
692
647
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
693
 
                         out_signature="s",
 
648
                         out_signature=u"s",
694
649
                         path_keyword='object_path',
695
650
                         connection_keyword='connection')
696
651
    def Introspect(self, object_path, connection):
701
656
        try:
702
657
            document = xml.dom.minidom.parseString(xmlstring)
703
658
            def make_tag(document, name, prop):
704
 
                e = document.createElement("property")
705
 
                e.setAttribute("name", name)
706
 
                e.setAttribute("type", prop._dbus_signature)
707
 
                e.setAttribute("access", prop._dbus_access)
 
659
                e = document.createElement(u"property")
 
660
                e.setAttribute(u"name", name)
 
661
                e.setAttribute(u"type", prop._dbus_signature)
 
662
                e.setAttribute(u"access", prop._dbus_access)
708
663
                return e
709
 
            for if_tag in document.getElementsByTagName("interface"):
 
664
            for if_tag in document.getElementsByTagName(u"interface"):
710
665
                for tag in (make_tag(document, name, prop)
711
666
                            for name, prop
712
667
                            in self._get_all_dbus_properties()
713
668
                            if prop._dbus_interface
714
 
                            == if_tag.getAttribute("name")):
 
669
                            == if_tag.getAttribute(u"name")):
715
670
                    if_tag.appendChild(tag)
716
671
                # Add the names to the return values for the
717
672
                # "org.freedesktop.DBus.Properties" methods
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")
724
 
                                    == "out"):
725
 
                                    arg.setAttribute("name", "value")
726
 
                        elif cn.getAttribute("name") == "GetAll":
727
 
                            for arg in cn.getElementsByTagName("arg"):
728
 
                                if (arg.getAttribute("direction")
729
 
                                    == "out"):
730
 
                                    arg.setAttribute("name", "props")
731
 
            xmlstring = document.toxml("utf-8")
 
673
                if (if_tag.getAttribute(u"name")
 
674
                    == u"org.freedesktop.DBus.Properties"):
 
675
                    for cn in if_tag.getElementsByTagName(u"method"):
 
676
                        if cn.getAttribute(u"name") == u"Get":
 
677
                            for arg in cn.getElementsByTagName(u"arg"):
 
678
                                if (arg.getAttribute(u"direction")
 
679
                                    == u"out"):
 
680
                                    arg.setAttribute(u"name", u"value")
 
681
                        elif cn.getAttribute(u"name") == u"GetAll":
 
682
                            for arg in cn.getElementsByTagName(u"arg"):
 
683
                                if (arg.getAttribute(u"direction")
 
684
                                    == u"out"):
 
685
                                    arg.setAttribute(u"name", u"props")
 
686
            xmlstring = document.toxml(u"utf-8")
732
687
            document.unlink()
733
688
        except (AttributeError, xml.dom.DOMException,
734
 
                xml.parsers.expat.ExpatError) as error:
735
 
            logger.error("Failed to override Introspection method",
 
689
                xml.parsers.expat.ExpatError), error:
 
690
            logger.error(u"Failed to override Introspection method",
736
691
                         error)
737
692
        return xmlstring
738
693
 
744
699
    dbus_object_path: dbus.ObjectPath
745
700
    bus: dbus.SystemBus()
746
701
    """
747
 
    
748
 
    runtime_expansions = (Client.runtime_expansions
749
 
                          + ("dbus_object_path",))
750
 
    
751
702
    # dbus.service.Object doesn't use super(), so we can't either.
752
703
    
753
704
    def __init__(self, bus = None, *args, **kwargs):
754
 
        self._approvals_pending = 0
755
705
        self.bus = bus
756
706
        Client.__init__(self, *args, **kwargs)
757
707
        # Only now, when this client is initialized, can it show up on
758
708
        # the D-Bus
759
 
        client_object_name = unicode(self.name).translate(
760
 
            {ord("."): ord("_"),
761
 
             ord("-"): ord("_")})
762
709
        self.dbus_object_path = (dbus.ObjectPath
763
 
                                 ("/clients/" + client_object_name))
 
710
                                 (u"/clients/"
 
711
                                  + self.name.replace(u".", u"_")))
764
712
        DBusObjectWithProperties.__init__(self, self.bus,
765
713
                                          self.dbus_object_path)
766
 
        
767
 
    def _get_approvals_pending(self):
768
 
        return self._approvals_pending
769
 
    def _set_approvals_pending(self, value):
770
 
        old_value = self._approvals_pending
771
 
        self._approvals_pending = value
772
 
        bval = bool(value)
773
 
        if (hasattr(self, "dbus_object_path")
774
 
            and bval is not bool(old_value)):
775
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
776
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
777
 
                                 dbus_bool)
778
 
 
779
 
    approvals_pending = property(_get_approvals_pending,
780
 
                                 _set_approvals_pending)
781
 
    del _get_approvals_pending, _set_approvals_pending
782
714
    
783
715
    @staticmethod
784
716
    def _datetime_to_dbus(dt, variant_level=0):
787
719
                           variant_level=variant_level)
788
720
    
789
721
    def enable(self):
790
 
        oldstate = getattr(self, "enabled", False)
 
722
        oldstate = getattr(self, u"enabled", False)
791
723
        r = Client.enable(self)
792
724
        if oldstate != self.enabled:
793
725
            # Emit D-Bus signals
794
 
            self.PropertyChanged(dbus.String("Enabled"),
 
726
            self.PropertyChanged(dbus.String(u"enabled"),
795
727
                                 dbus.Boolean(True, variant_level=1))
796
728
            self.PropertyChanged(
797
 
                dbus.String("LastEnabled"),
 
729
                dbus.String(u"last_enabled"),
798
730
                self._datetime_to_dbus(self.last_enabled,
799
731
                                       variant_level=1))
800
732
        return r
801
733
    
802
734
    def disable(self, quiet = False):
803
 
        oldstate = getattr(self, "enabled", False)
 
735
        oldstate = getattr(self, u"enabled", False)
804
736
        r = Client.disable(self, quiet=quiet)
805
737
        if not quiet and oldstate != self.enabled:
806
738
            # Emit D-Bus signal
807
 
            self.PropertyChanged(dbus.String("Enabled"),
 
739
            self.PropertyChanged(dbus.String(u"enabled"),
808
740
                                 dbus.Boolean(False, variant_level=1))
809
741
        return r
810
742
    
813
745
            self.remove_from_connection()
814
746
        except LookupError:
815
747
            pass
816
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
748
        if hasattr(DBusObjectWithProperties, u"__del__"):
817
749
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
818
750
        Client.__del__(self, *args, **kwargs)
819
751
    
822
754
        self.checker_callback_tag = None
823
755
        self.checker = None
824
756
        # Emit D-Bus signal
825
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
757
        self.PropertyChanged(dbus.String(u"checker_running"),
826
758
                             dbus.Boolean(False, variant_level=1))
827
759
        if os.WIFEXITED(condition):
828
760
            exitstatus = os.WEXITSTATUS(condition)
840
772
                                       *args, **kwargs)
841
773
    
842
774
    def checked_ok(self, *args, **kwargs):
843
 
        Client.checked_ok(self, *args, **kwargs)
 
775
        r = Client.checked_ok(self, *args, **kwargs)
844
776
        # Emit D-Bus signal
845
777
        self.PropertyChanged(
846
 
            dbus.String("LastCheckedOK"),
 
778
            dbus.String(u"last_checked_ok"),
847
779
            (self._datetime_to_dbus(self.last_checked_ok,
848
780
                                    variant_level=1)))
849
 
    
850
 
    def need_approval(self, *args, **kwargs):
851
 
        r = Client.need_approval(self, *args, **kwargs)
852
 
        # Emit D-Bus signal
853
 
        self.PropertyChanged(
854
 
            dbus.String("LastApprovalRequest"),
855
 
            (self._datetime_to_dbus(self.last_approval_request,
856
 
                                    variant_level=1)))
857
781
        return r
858
782
    
859
783
    def start_checker(self, *args, **kwargs):
869
793
            # Emit D-Bus signal
870
794
            self.CheckerStarted(self.current_checker_command)
871
795
            self.PropertyChanged(
872
 
                dbus.String("CheckerRunning"),
 
796
                dbus.String(u"checker_running"),
873
797
                dbus.Boolean(True, variant_level=1))
874
798
        return r
875
799
    
876
800
    def stop_checker(self, *args, **kwargs):
877
 
        old_checker = getattr(self, "checker", None)
 
801
        old_checker = getattr(self, u"checker", None)
878
802
        r = Client.stop_checker(self, *args, **kwargs)
879
803
        if (old_checker is not None
880
 
            and getattr(self, "checker", None) is None):
881
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
804
            and getattr(self, u"checker", None) is None):
 
805
            self.PropertyChanged(dbus.String(u"checker_running"),
882
806
                                 dbus.Boolean(False, variant_level=1))
883
807
        return r
884
808
 
887
811
        return False
888
812
    
889
813
    def approve(self, value=True):
890
 
        self.send_changedstate()
891
814
        self._approved = value
892
 
        gobject.timeout_add(self._timedelta_to_milliseconds
893
 
                            (self.approval_duration),
894
 
                            self._reset_approved)
 
815
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
 
816
 
 
817
    def approved_pending(self):
 
818
        return self.approvals_pending > 0
895
819
    
896
820
    
897
821
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
822
    _interface = u"se.bsnet.fukt.Mandos.Client"
899
823
    
900
824
    ## Signals
901
825
    
902
826
    # CheckerCompleted - signal
903
 
    @dbus.service.signal(_interface, signature="nxs")
 
827
    @dbus.service.signal(_interface, signature=u"nxs")
904
828
    def CheckerCompleted(self, exitcode, waitstatus, command):
905
829
        "D-Bus signal"
906
830
        pass
907
831
    
908
832
    # CheckerStarted - signal
909
 
    @dbus.service.signal(_interface, signature="s")
 
833
    @dbus.service.signal(_interface, signature=u"s")
910
834
    def CheckerStarted(self, command):
911
835
        "D-Bus signal"
912
836
        pass
913
837
    
914
838
    # PropertyChanged - signal
915
 
    @dbus.service.signal(_interface, signature="sv")
 
839
    @dbus.service.signal(_interface, signature=u"sv")
916
840
    def PropertyChanged(self, property, value):
917
841
        "D-Bus signal"
918
842
        pass
920
844
    # GotSecret - signal
921
845
    @dbus.service.signal(_interface)
922
846
    def GotSecret(self):
923
 
        """D-Bus signal
924
 
        Is sent after a successful transfer of secret from the Mandos
925
 
        server to mandos-client
926
 
        """
927
 
        pass
 
847
        "D-Bus signal"
 
848
        if self.approved_pending():
 
849
            self.PropertyChanged(dbus.String(u"checker_running"),
 
850
                                 dbus.Boolean(False, variant_level=1))
928
851
    
929
852
    # Rejected - signal
930
 
    @dbus.service.signal(_interface, signature="s")
 
853
    @dbus.service.signal(_interface, signature=u"s")
931
854
    def Rejected(self, reason):
932
855
        "D-Bus signal"
933
 
        pass
 
856
        if self.approved_pending():
 
857
            self.PropertyChanged(dbus.String(u"checker_running"),
 
858
                                 dbus.Boolean(False, variant_level=1))
934
859
    
935
860
    # NeedApproval - signal
936
 
    @dbus.service.signal(_interface, signature="tb")
 
861
    @dbus.service.signal(_interface, signature=u"db")
937
862
    def NeedApproval(self, timeout, default):
938
863
        "D-Bus signal"
939
 
        return self.need_approval()
 
864
        if not self.approved_pending():
 
865
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
866
                                 dbus.Boolean(True, variant_level=1))
940
867
    
941
868
    ## Methods
942
 
    
 
869
 
943
870
    # Approve - method
944
 
    @dbus.service.method(_interface, in_signature="b")
 
871
    @dbus.service.method(_interface, in_signature=u"b")
945
872
    def Approve(self, value):
946
873
        self.approve(value)
947
 
    
 
874
 
948
875
    # CheckedOK - method
949
876
    @dbus.service.method(_interface)
950
877
    def CheckedOK(self):
951
 
        self.checked_ok()
 
878
        return self.checked_ok()
952
879
    
953
880
    # Enable - method
954
881
    @dbus.service.method(_interface)
975
902
    
976
903
    ## Properties
977
904
    
978
 
    # ApprovalPending - property
979
 
    @dbus_service_property(_interface, signature="b", access="read")
980
 
    def ApprovalPending_dbus_property(self):
981
 
        return dbus.Boolean(bool(self.approvals_pending))
982
 
    
983
 
    # ApprovedByDefault - property
984
 
    @dbus_service_property(_interface, signature="b",
985
 
                           access="readwrite")
986
 
    def ApprovedByDefault_dbus_property(self, value=None):
987
 
        if value is None:       # get
988
 
            return dbus.Boolean(self.approved_by_default)
989
 
        self.approved_by_default = bool(value)
990
 
        # Emit D-Bus signal
991
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
992
 
                             dbus.Boolean(value, variant_level=1))
993
 
    
994
 
    # ApprovalDelay - property
995
 
    @dbus_service_property(_interface, signature="t",
996
 
                           access="readwrite")
997
 
    def ApprovalDelay_dbus_property(self, value=None):
998
 
        if value is None:       # get
999
 
            return dbus.UInt64(self.approval_delay_milliseconds())
1000
 
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
 
        # Emit D-Bus signal
1002
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
1003
 
                             dbus.UInt64(value, variant_level=1))
1004
 
    
1005
 
    # ApprovalDuration - property
1006
 
    @dbus_service_property(_interface, signature="t",
1007
 
                           access="readwrite")
1008
 
    def ApprovalDuration_dbus_property(self, value=None):
1009
 
        if value is None:       # get
1010
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
1011
 
                    self.approval_duration))
1012
 
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1013
 
        # Emit D-Bus signal
1014
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
1015
 
                             dbus.UInt64(value, variant_level=1))
1016
 
    
1017
 
    # Name - property
1018
 
    @dbus_service_property(_interface, signature="s", access="read")
1019
 
    def Name_dbus_property(self):
 
905
    # approved_pending - property
 
906
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
907
    def approved_pending_dbus_property(self):
 
908
        return dbus.Boolean(self.approved_pending())
 
909
    
 
910
    # approved_by_default - property
 
911
    @dbus_service_property(_interface, signature=u"b",
 
912
                           access=u"readwrite")
 
913
    def approved_by_default_dbus_property(self):
 
914
        return dbus.Boolean(self.approved_by_default)
 
915
    
 
916
    # approved_delay - property
 
917
    @dbus_service_property(_interface, signature=u"t",
 
918
                           access=u"readwrite")
 
919
    def approved_delay_dbus_property(self):
 
920
        return dbus.UInt64(self.approved_delay_milliseconds())
 
921
    
 
922
    # approved_duration - property
 
923
    @dbus_service_property(_interface, signature=u"t",
 
924
                           access=u"readwrite")
 
925
    def approved_duration_dbus_property(self):
 
926
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
927
                self.approved_duration))
 
928
    
 
929
    # name - property
 
930
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
931
    def name_dbus_property(self):
1020
932
        return dbus.String(self.name)
1021
933
    
1022
 
    # Fingerprint - property
1023
 
    @dbus_service_property(_interface, signature="s", access="read")
1024
 
    def Fingerprint_dbus_property(self):
 
934
    # fingerprint - property
 
935
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
936
    def fingerprint_dbus_property(self):
1025
937
        return dbus.String(self.fingerprint)
1026
938
    
1027
 
    # Host - property
1028
 
    @dbus_service_property(_interface, signature="s",
1029
 
                           access="readwrite")
1030
 
    def Host_dbus_property(self, value=None):
 
939
    # host - property
 
940
    @dbus_service_property(_interface, signature=u"s",
 
941
                           access=u"readwrite")
 
942
    def host_dbus_property(self, value=None):
1031
943
        if value is None:       # get
1032
944
            return dbus.String(self.host)
1033
945
        self.host = value
1034
946
        # Emit D-Bus signal
1035
 
        self.PropertyChanged(dbus.String("Host"),
 
947
        self.PropertyChanged(dbus.String(u"host"),
1036
948
                             dbus.String(value, variant_level=1))
1037
949
    
1038
 
    # Created - property
1039
 
    @dbus_service_property(_interface, signature="s", access="read")
1040
 
    def Created_dbus_property(self):
 
950
    # created - property
 
951
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
952
    def created_dbus_property(self):
1041
953
        return dbus.String(self._datetime_to_dbus(self.created))
1042
954
    
1043
 
    # LastEnabled - property
1044
 
    @dbus_service_property(_interface, signature="s", access="read")
1045
 
    def LastEnabled_dbus_property(self):
 
955
    # last_enabled - property
 
956
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
957
    def last_enabled_dbus_property(self):
1046
958
        if self.last_enabled is None:
1047
 
            return dbus.String("")
 
959
            return dbus.String(u"")
1048
960
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1049
961
    
1050
 
    # Enabled - property
1051
 
    @dbus_service_property(_interface, signature="b",
1052
 
                           access="readwrite")
1053
 
    def Enabled_dbus_property(self, value=None):
 
962
    # enabled - property
 
963
    @dbus_service_property(_interface, signature=u"b",
 
964
                           access=u"readwrite")
 
965
    def enabled_dbus_property(self, value=None):
1054
966
        if value is None:       # get
1055
967
            return dbus.Boolean(self.enabled)
1056
968
        if value:
1058
970
        else:
1059
971
            self.disable()
1060
972
    
1061
 
    # LastCheckedOK - property
1062
 
    @dbus_service_property(_interface, signature="s",
1063
 
                           access="readwrite")
1064
 
    def LastCheckedOK_dbus_property(self, value=None):
 
973
    # last_checked_ok - property
 
974
    @dbus_service_property(_interface, signature=u"s",
 
975
                           access=u"readwrite")
 
976
    def last_checked_ok_dbus_property(self, value=None):
1065
977
        if value is not None:
1066
978
            self.checked_ok()
1067
979
            return
1068
980
        if self.last_checked_ok is None:
1069
 
            return dbus.String("")
 
981
            return dbus.String(u"")
1070
982
        return dbus.String(self._datetime_to_dbus(self
1071
983
                                                  .last_checked_ok))
1072
984
    
1073
 
    # LastApprovalRequest - property
1074
 
    @dbus_service_property(_interface, signature="s", access="read")
1075
 
    def LastApprovalRequest_dbus_property(self):
1076
 
        if self.last_approval_request is None:
1077
 
            return dbus.String("")
1078
 
        return dbus.String(self.
1079
 
                           _datetime_to_dbus(self
1080
 
                                             .last_approval_request))
1081
 
    
1082
 
    # Timeout - property
1083
 
    @dbus_service_property(_interface, signature="t",
1084
 
                           access="readwrite")
1085
 
    def Timeout_dbus_property(self, value=None):
 
985
    # timeout - property
 
986
    @dbus_service_property(_interface, signature=u"t",
 
987
                           access=u"readwrite")
 
988
    def timeout_dbus_property(self, value=None):
1086
989
        if value is None:       # get
1087
990
            return dbus.UInt64(self.timeout_milliseconds())
1088
991
        self.timeout = datetime.timedelta(0, 0, 0, value)
1089
992
        # Emit D-Bus signal
1090
 
        self.PropertyChanged(dbus.String("Timeout"),
 
993
        self.PropertyChanged(dbus.String(u"timeout"),
1091
994
                             dbus.UInt64(value, variant_level=1))
1092
 
        if getattr(self, "disable_initiator_tag", None) is None:
 
995
        if getattr(self, u"disable_initiator_tag", None) is None:
1093
996
            return
1094
997
        # Reschedule timeout
1095
998
        gobject.source_remove(self.disable_initiator_tag)
1107
1010
            self.disable_initiator_tag = (gobject.timeout_add
1108
1011
                                          (time_to_die, self.disable))
1109
1012
    
1110
 
    # Interval - property
1111
 
    @dbus_service_property(_interface, signature="t",
1112
 
                           access="readwrite")
1113
 
    def Interval_dbus_property(self, value=None):
 
1013
    # interval - property
 
1014
    @dbus_service_property(_interface, signature=u"t",
 
1015
                           access=u"readwrite")
 
1016
    def interval_dbus_property(self, value=None):
1114
1017
        if value is None:       # get
1115
1018
            return dbus.UInt64(self.interval_milliseconds())
1116
1019
        self.interval = datetime.timedelta(0, 0, 0, value)
1117
1020
        # Emit D-Bus signal
1118
 
        self.PropertyChanged(dbus.String("Interval"),
 
1021
        self.PropertyChanged(dbus.String(u"interval"),
1119
1022
                             dbus.UInt64(value, variant_level=1))
1120
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1023
        if getattr(self, u"checker_initiator_tag", None) is None:
1121
1024
            return
1122
1025
        # Reschedule checker run
1123
1026
        gobject.source_remove(self.checker_initiator_tag)
1125
1028
                                      (value, self.start_checker))
1126
1029
        self.start_checker()    # Start one now, too
1127
1030
 
1128
 
    # Checker - property
1129
 
    @dbus_service_property(_interface, signature="s",
1130
 
                           access="readwrite")
1131
 
    def Checker_dbus_property(self, value=None):
 
1031
    # checker - property
 
1032
    @dbus_service_property(_interface, signature=u"s",
 
1033
                           access=u"readwrite")
 
1034
    def checker_dbus_property(self, value=None):
1132
1035
        if value is None:       # get
1133
1036
            return dbus.String(self.checker_command)
1134
1037
        self.checker_command = value
1135
1038
        # Emit D-Bus signal
1136
 
        self.PropertyChanged(dbus.String("Checker"),
 
1039
        self.PropertyChanged(dbus.String(u"checker"),
1137
1040
                             dbus.String(self.checker_command,
1138
1041
                                         variant_level=1))
1139
1042
    
1140
 
    # CheckerRunning - property
1141
 
    @dbus_service_property(_interface, signature="b",
1142
 
                           access="readwrite")
1143
 
    def CheckerRunning_dbus_property(self, value=None):
 
1043
    # checker_running - property
 
1044
    @dbus_service_property(_interface, signature=u"b",
 
1045
                           access=u"readwrite")
 
1046
    def checker_running_dbus_property(self, value=None):
1144
1047
        if value is None:       # get
1145
1048
            return dbus.Boolean(self.checker is not None)
1146
1049
        if value:
1148
1051
        else:
1149
1052
            self.stop_checker()
1150
1053
    
1151
 
    # ObjectPath - property
1152
 
    @dbus_service_property(_interface, signature="o", access="read")
1153
 
    def ObjectPath_dbus_property(self):
 
1054
    # object_path - property
 
1055
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1056
    def object_path_dbus_property(self):
1154
1057
        return self.dbus_object_path # is already a dbus.ObjectPath
1155
1058
    
1156
 
    # Secret = property
1157
 
    @dbus_service_property(_interface, signature="ay",
1158
 
                           access="write", byte_arrays=True)
1159
 
    def Secret_dbus_property(self, value):
 
1059
    # secret = property
 
1060
    @dbus_service_property(_interface, signature=u"ay",
 
1061
                           access=u"write", byte_arrays=True)
 
1062
    def secret_dbus_property(self, value):
1160
1063
        self.secret = str(value)
1161
1064
    
1162
1065
    del _interface
1196
1099
    
1197
1100
    def handle(self):
1198
1101
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1199
 
            logger.info("TCP connection from: %s",
 
1102
            logger.info(u"TCP connection from: %s",
1200
1103
                        unicode(self.client_address))
1201
 
            logger.debug("Pipe FD: %d",
 
1104
            logger.debug(u"Pipe FD: %d",
1202
1105
                         self.server.child_pipe.fileno())
1203
1106
 
1204
1107
            session = (gnutls.connection
1211
1114
            # no X.509 keys are added to it.  Therefore, we can use it
1212
1115
            # here despite using OpenPGP certificates.
1213
1116
 
1214
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1215
 
            #                      "+AES-256-CBC", "+SHA1",
1216
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1217
 
            #                      "+DHE-DSS"))
 
1117
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1118
            #                      u"+AES-256-CBC", u"+SHA1",
 
1119
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1120
            #                      u"+DHE-DSS"))
1218
1121
            # Use a fallback default, since this MUST be set.
1219
1122
            priority = self.server.gnutls_priority
1220
1123
            if priority is None:
1221
 
                priority = "NORMAL"
 
1124
                priority = u"NORMAL"
1222
1125
            (gnutls.library.functions
1223
1126
             .gnutls_priority_set_direct(session._c_object,
1224
1127
                                         priority, None))
1226
1129
            # Start communication using the Mandos protocol
1227
1130
            # Get protocol number
1228
1131
            line = self.request.makefile().readline()
1229
 
            logger.debug("Protocol version: %r", line)
 
1132
            logger.debug(u"Protocol version: %r", line)
1230
1133
            try:
1231
1134
                if int(line.strip().split()[0]) > 1:
1232
1135
                    raise RuntimeError
1233
 
            except (ValueError, IndexError, RuntimeError) as error:
1234
 
                logger.error("Unknown protocol version: %s", error)
 
1136
            except (ValueError, IndexError, RuntimeError), error:
 
1137
                logger.error(u"Unknown protocol version: %s", error)
1235
1138
                return
1236
1139
 
1237
1140
            # Start GnuTLS connection
1238
1141
            try:
1239
1142
                session.handshake()
1240
 
            except gnutls.errors.GNUTLSError as error:
1241
 
                logger.warning("Handshake failed: %s", error)
 
1143
            except gnutls.errors.GNUTLSError, error:
 
1144
                logger.warning(u"Handshake failed: %s", error)
1242
1145
                # Do not run session.bye() here: the session is not
1243
1146
                # established.  Just abandon the request.
1244
1147
                return
1245
 
            logger.debug("Handshake succeeded")
 
1148
            logger.debug(u"Handshake succeeded")
1246
1149
 
1247
1150
            approval_required = False
1248
1151
            try:
1249
1152
                try:
1250
1153
                    fpr = self.fingerprint(self.peer_certificate
1251
1154
                                           (session))
1252
 
                except (TypeError,
1253
 
                        gnutls.errors.GNUTLSError) as error:
1254
 
                    logger.warning("Bad certificate: %s", error)
 
1155
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1156
                    logger.warning(u"Bad certificate: %s", error)
1255
1157
                    return
1256
 
                logger.debug("Fingerprint: %s", fpr)
 
1158
                logger.debug(u"Fingerprint: %s", fpr)
1257
1159
 
1258
1160
                try:
1259
1161
                    client = ProxyClient(child_pipe, fpr,
1261
1163
                except KeyError:
1262
1164
                    return
1263
1165
                
1264
 
                if client.approval_delay:
1265
 
                    delay = client.approval_delay
 
1166
                if client.approved_delay:
 
1167
                    delay = client.approved_delay
1266
1168
                    client.approvals_pending += 1
1267
1169
                    approval_required = True
1268
1170
                
1269
1171
                while True:
1270
1172
                    if not client.enabled:
1271
 
                        logger.info("Client %s is disabled",
 
1173
                        logger.warning(u"Client %s is disabled",
1272
1174
                                       client.name)
1273
1175
                        if self.server.use_dbus:
1274
1176
                            # Emit D-Bus signal
1275
1177
                            client.Rejected("Disabled")                    
1276
1178
                        return
1277
1179
                    
1278
 
                    if client._approved or not client.approval_delay:
 
1180
                    if client._approved or not client.approved_delay:
1279
1181
                        #We are approved or approval is disabled
1280
1182
                        break
1281
1183
                    elif client._approved is None:
1282
 
                        logger.info("Client %s needs approval",
 
1184
                        logger.info(u"Client %s need approval",
1283
1185
                                    client.name)
1284
1186
                        if self.server.use_dbus:
1285
1187
                            # Emit D-Bus signal
1286
1188
                            client.NeedApproval(
1287
 
                                client.approval_delay_milliseconds(),
 
1189
                                client.approved_delay_milliseconds(),
1288
1190
                                client.approved_by_default)
1289
1191
                    else:
1290
 
                        logger.warning("Client %s was not approved",
 
1192
                        logger.warning(u"Client %s was not approved",
1291
1193
                                       client.name)
1292
1194
                        if self.server.use_dbus:
1293
1195
                            # Emit D-Bus signal
1294
 
                            client.Rejected("Denied")
 
1196
                            client.Rejected("Disapproved")
1295
1197
                        return
1296
1198
                    
1297
1199
                    #wait until timeout or approved
1308
1210
                                           client.name)
1309
1211
                            if self.server.use_dbus:
1310
1212
                                # Emit D-Bus signal
1311
 
                                client.Rejected("Approval timed out")
 
1213
                                client.Rejected("Time out")
1312
1214
                            return
1313
1215
                        else:
1314
1216
                            break
1317
1219
                
1318
1220
                sent_size = 0
1319
1221
                while sent_size < len(client.secret):
1320
 
                    try:
1321
 
                        sent = session.send(client.secret[sent_size:])
1322
 
                    except gnutls.errors.GNUTLSError as error:
1323
 
                        logger.warning("gnutls send failed")
1324
 
                        return
1325
 
                    logger.debug("Sent: %d, remaining: %d",
 
1222
                    # XXX handle session exception
 
1223
                    sent = session.send(client.secret[sent_size:])
 
1224
                    logger.debug(u"Sent: %d, remaining: %d",
1326
1225
                                 sent, len(client.secret)
1327
1226
                                 - (sent_size + sent))
1328
1227
                    sent_size += sent
1329
1228
 
1330
 
                logger.info("Sending secret to %s", client.name)
 
1229
                logger.info(u"Sending secret to %s", client.name)
1331
1230
                # bump the timeout as if seen
1332
1231
                client.checked_ok()
1333
1232
                if self.server.use_dbus:
1337
1236
            finally:
1338
1237
                if approval_required:
1339
1238
                    client.approvals_pending -= 1
1340
 
                try:
1341
 
                    session.bye()
1342
 
                except gnutls.errors.GNUTLSError as error:
1343
 
                    logger.warning("GnuTLS bye failed")
 
1239
                session.bye()
1344
1240
    
1345
1241
    @staticmethod
1346
1242
    def peer_certificate(session):
1356
1252
                     .gnutls_certificate_get_peers
1357
1253
                     (session._c_object, ctypes.byref(list_size)))
1358
1254
        if not bool(cert_list) and list_size.value != 0:
1359
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1360
 
                                            " certificate")
 
1255
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1256
                                            u" certificate")
1361
1257
        if list_size.value == 0:
1362
1258
            return None
1363
1259
        cert = cert_list[0]
1389
1285
        if crtverify.value != 0:
1390
1286
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1391
1287
            raise (gnutls.errors.CertificateSecurityError
1392
 
                   ("Verify failed"))
 
1288
                   (u"Verify failed"))
1393
1289
        # New buffer for the fingerprint
1394
1290
        buf = ctypes.create_string_buffer(20)
1395
1291
        buf_len = ctypes.c_size_t()
1402
1298
        # Convert the buffer to a Python bytestring
1403
1299
        fpr = ctypes.string_at(buf, buf_len.value)
1404
1300
        # Convert the bytestring to hexadecimal notation
1405
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1301
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1406
1302
        return hex_fpr
1407
1303
 
1408
1304
 
1431
1327
 
1432
1328
        super(MultiprocessingMixInWithPipe,
1433
1329
              self).process_request(request, client_address)
1434
 
        self.child_pipe.close()
1435
1330
        self.add_pipe(parent_pipe)
1436
 
 
1437
1331
    def add_pipe(self, parent_pipe):
1438
1332
        """Dummy function; override as necessary"""
1439
 
        raise NotImplementedError
 
1333
        pass
1440
1334
 
1441
1335
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1442
1336
                     socketserver.TCPServer, object):
1460
1354
        bind to an address or port if they were not specified."""
1461
1355
        if self.interface is not None:
1462
1356
            if SO_BINDTODEVICE is None:
1463
 
                logger.error("SO_BINDTODEVICE does not exist;"
1464
 
                             " cannot bind to interface %s",
 
1357
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1358
                             u" cannot bind to interface %s",
1465
1359
                             self.interface)
1466
1360
            else:
1467
1361
                try:
1468
1362
                    self.socket.setsockopt(socket.SOL_SOCKET,
1469
1363
                                           SO_BINDTODEVICE,
1470
1364
                                           str(self.interface
1471
 
                                               + '\0'))
1472
 
                except socket.error as error:
 
1365
                                               + u'\0'))
 
1366
                except socket.error, error:
1473
1367
                    if error[0] == errno.EPERM:
1474
 
                        logger.error("No permission to"
1475
 
                                     " bind to interface %s",
 
1368
                        logger.error(u"No permission to"
 
1369
                                     u" bind to interface %s",
1476
1370
                                     self.interface)
1477
1371
                    elif error[0] == errno.ENOPROTOOPT:
1478
 
                        logger.error("SO_BINDTODEVICE not available;"
1479
 
                                     " cannot bind to interface %s",
 
1372
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1373
                                     u" cannot bind to interface %s",
1480
1374
                                     self.interface)
1481
1375
                    else:
1482
1376
                        raise
1484
1378
        if self.server_address[0] or self.server_address[1]:
1485
1379
            if not self.server_address[0]:
1486
1380
                if self.address_family == socket.AF_INET6:
1487
 
                    any_address = "::" # in6addr_any
 
1381
                    any_address = u"::" # in6addr_any
1488
1382
                else:
1489
1383
                    any_address = socket.INADDR_ANY
1490
1384
                self.server_address = (any_address,
1539
1433
    def handle_ipc(self, source, condition, parent_pipe=None,
1540
1434
                   client_object=None):
1541
1435
        condition_names = {
1542
 
            gobject.IO_IN: "IN",   # There is data to read.
1543
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1436
            gobject.IO_IN: u"IN",   # There is data to read.
 
1437
            gobject.IO_OUT: u"OUT", # Data can be written (without
1544
1438
                                    # blocking).
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
 
1439
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1440
            gobject.IO_ERR: u"ERR", # Error condition.
 
1441
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1548
1442
                                    # broken, usually for pipes and
1549
1443
                                    # sockets).
1550
1444
            }
1552
1446
                                       for cond, name in
1553
1447
                                       condition_names.iteritems()
1554
1448
                                       if cond & condition)
1555
 
        # error or the other end of multiprocessing.Pipe has closed
1556
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1557
 
            return False
 
1449
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1450
                     conditions_string)
1558
1451
        
1559
1452
        # Read a request from the child
1560
1453
        request = parent_pipe.recv()
1569
1462
                    client = c
1570
1463
                    break
1571
1464
            else:
1572
 
                logger.info("Client not found for fingerprint: %s, ad"
1573
 
                            "dress: %s", fpr, address)
 
1465
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1466
                               u"dress: %s", fpr, address)
1574
1467
                if self.use_dbus:
1575
1468
                    # Emit D-Bus signal
1576
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1469
                    mandos_dbus_service.ClientNotFound(fpr, address)
1577
1470
                parent_pipe.send(False)
1578
1471
                return False
1579
1472
            
1598
1491
                parent_pipe.send(('function',))
1599
1492
            else:
1600
1493
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1601
 
        
 
1494
 
1602
1495
        if command == 'setattr':
1603
1496
            attrname = request[1]
1604
1497
            value = request[2]
1605
1498
            setattr(client_object, attrname, value)
1606
 
 
 
1499
            
1607
1500
        return True
1608
1501
 
1609
1502
 
1610
1503
def string_to_delta(interval):
1611
1504
    """Parse a string and return a datetime.timedelta
1612
1505
    
1613
 
    >>> string_to_delta('7d')
 
1506
    >>> string_to_delta(u'7d')
1614
1507
    datetime.timedelta(7)
1615
 
    >>> string_to_delta('60s')
 
1508
    >>> string_to_delta(u'60s')
1616
1509
    datetime.timedelta(0, 60)
1617
 
    >>> string_to_delta('60m')
 
1510
    >>> string_to_delta(u'60m')
1618
1511
    datetime.timedelta(0, 3600)
1619
 
    >>> string_to_delta('24h')
 
1512
    >>> string_to_delta(u'24h')
1620
1513
    datetime.timedelta(1)
1621
 
    >>> string_to_delta('1w')
 
1514
    >>> string_to_delta(u'1w')
1622
1515
    datetime.timedelta(7)
1623
 
    >>> string_to_delta('5m 30s')
 
1516
    >>> string_to_delta(u'5m 30s')
1624
1517
    datetime.timedelta(0, 330)
1625
1518
    """
1626
1519
    timevalue = datetime.timedelta(0)
1628
1521
        try:
1629
1522
            suffix = unicode(s[-1])
1630
1523
            value = int(s[:-1])
1631
 
            if suffix == "d":
 
1524
            if suffix == u"d":
1632
1525
                delta = datetime.timedelta(value)
1633
 
            elif suffix == "s":
 
1526
            elif suffix == u"s":
1634
1527
                delta = datetime.timedelta(0, value)
1635
 
            elif suffix == "m":
 
1528
            elif suffix == u"m":
1636
1529
                delta = datetime.timedelta(0, 0, 0, 0, value)
1637
 
            elif suffix == "h":
 
1530
            elif suffix == u"h":
1638
1531
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1639
 
            elif suffix == "w":
 
1532
            elif suffix == u"w":
1640
1533
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1641
1534
            else:
1642
 
                raise ValueError("Unknown suffix %r" % suffix)
1643
 
        except (ValueError, IndexError) as e:
1644
 
            raise ValueError(*(e.args))
 
1535
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1536
        except (ValueError, IndexError), e:
 
1537
            raise ValueError(e.message)
1645
1538
        timevalue += delta
1646
1539
    return timevalue
1647
1540
 
1653
1546
    global if_nametoindex
1654
1547
    try:
1655
1548
        if_nametoindex = (ctypes.cdll.LoadLibrary
1656
 
                          (ctypes.util.find_library("c"))
 
1549
                          (ctypes.util.find_library(u"c"))
1657
1550
                          .if_nametoindex)
1658
1551
    except (OSError, AttributeError):
1659
 
        logger.warning("Doing if_nametoindex the hard way")
 
1552
        logger.warning(u"Doing if_nametoindex the hard way")
1660
1553
        def if_nametoindex(interface):
1661
1554
            "Get an interface index the hard way, i.e. using fcntl()"
1662
1555
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1663
1556
            with contextlib.closing(socket.socket()) as s:
1664
1557
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1665
 
                                    struct.pack(str("16s16x"),
 
1558
                                    struct.pack(str(u"16s16x"),
1666
1559
                                                interface))
1667
 
            interface_index = struct.unpack(str("I"),
 
1560
            interface_index = struct.unpack(str(u"I"),
1668
1561
                                            ifreq[16:20])[0]
1669
1562
            return interface_index
1670
1563
    return if_nametoindex(interface)
1678
1571
        sys.exit()
1679
1572
    os.setsid()
1680
1573
    if not nochdir:
1681
 
        os.chdir("/")
 
1574
        os.chdir(u"/")
1682
1575
    if os.fork():
1683
1576
        sys.exit()
1684
1577
    if not noclose:
1686
1579
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1687
1580
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1688
1581
            raise OSError(errno.ENODEV,
1689
 
                          "%s not a character device"
 
1582
                          u"%s not a character device"
1690
1583
                          % os.path.devnull)
1691
1584
        os.dup2(null, sys.stdin.fileno())
1692
1585
        os.dup2(null, sys.stdout.fileno())
1700
1593
    ##################################################################
1701
1594
    # Parsing of options, both command line and config file
1702
1595
    
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"
1717
 
                        " to terminal")
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"
1727
 
                        " files")
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()
 
1596
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1597
    parser.add_option("-i", u"--interface", type=u"string",
 
1598
                      metavar="IF", help=u"Bind to interface IF")
 
1599
    parser.add_option("-a", u"--address", type=u"string",
 
1600
                      help=u"Address to listen for requests on")
 
1601
    parser.add_option("-p", u"--port", type=u"int",
 
1602
                      help=u"Port number to receive requests on")
 
1603
    parser.add_option("--check", action=u"store_true",
 
1604
                      help=u"Run self-test")
 
1605
    parser.add_option("--debug", action=u"store_true",
 
1606
                      help=u"Debug mode; run in foreground and log to"
 
1607
                      u" terminal")
 
1608
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1609
                      u" priority string (see GnuTLS documentation)")
 
1610
    parser.add_option("--servicename", type=u"string",
 
1611
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1612
    parser.add_option("--configdir", type=u"string",
 
1613
                      default=u"/etc/mandos", metavar=u"DIR",
 
1614
                      help=u"Directory to search for configuration"
 
1615
                      u" files")
 
1616
    parser.add_option("--no-dbus", action=u"store_false",
 
1617
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1618
                      u" system bus interface")
 
1619
    parser.add_option("--no-ipv6", action=u"store_false",
 
1620
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1621
    options = parser.parse_args()[0]
1734
1622
    
1735
1623
    if options.check:
1736
1624
        import doctest
1738
1626
        sys.exit()
1739
1627
    
1740
1628
    # Default values for config file for server-global settings
1741
 
    server_defaults = { "interface": "",
1742
 
                        "address": "",
1743
 
                        "port": "",
1744
 
                        "debug": "False",
1745
 
                        "priority":
1746
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1747
 
                        "servicename": "Mandos",
1748
 
                        "use_dbus": "True",
1749
 
                        "use_ipv6": "True",
1750
 
                        "debuglevel": "",
 
1629
    server_defaults = { u"interface": u"",
 
1630
                        u"address": u"",
 
1631
                        u"port": u"",
 
1632
                        u"debug": u"False",
 
1633
                        u"priority":
 
1634
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1635
                        u"servicename": u"Mandos",
 
1636
                        u"use_dbus": u"True",
 
1637
                        u"use_ipv6": u"True",
1751
1638
                        }
1752
1639
    
1753
1640
    # Parse config file for server-global settings
1754
1641
    server_config = configparser.SafeConfigParser(server_defaults)
1755
1642
    del server_defaults
1756
1643
    server_config.read(os.path.join(options.configdir,
1757
 
                                    "mandos.conf"))
 
1644
                                    u"mandos.conf"))
1758
1645
    # Convert the SafeConfigParser object to a dict
1759
1646
    server_settings = server_config.defaults()
1760
1647
    # Use the appropriate methods on the non-string config options
1761
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1762
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1648
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1649
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1763
1650
                                                           option)
1764
1651
    if server_settings["port"]:
1765
 
        server_settings["port"] = server_config.getint("DEFAULT",
1766
 
                                                       "port")
 
1652
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1653
                                                       u"port")
1767
1654
    del server_config
1768
1655
    
1769
1656
    # Override the settings from the config file with command line
1770
1657
    # options, if set.
1771
 
    for option in ("interface", "address", "port", "debug",
1772
 
                   "priority", "servicename", "configdir",
1773
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1658
    for option in (u"interface", u"address", u"port", u"debug",
 
1659
                   u"priority", u"servicename", u"configdir",
 
1660
                   u"use_dbus", u"use_ipv6"):
1774
1661
        value = getattr(options, option)
1775
1662
        if value is not None:
1776
1663
            server_settings[option] = value
1784
1671
    ##################################################################
1785
1672
    
1786
1673
    # For convenience
1787
 
    debug = server_settings["debug"]
1788
 
    debuglevel = server_settings["debuglevel"]
1789
 
    use_dbus = server_settings["use_dbus"]
1790
 
    use_ipv6 = server_settings["use_ipv6"]
1791
 
 
1792
 
    if server_settings["servicename"] != "Mandos":
 
1674
    debug = server_settings[u"debug"]
 
1675
    use_dbus = server_settings[u"use_dbus"]
 
1676
    use_ipv6 = server_settings[u"use_ipv6"]
 
1677
    
 
1678
    if not debug:
 
1679
        syslogger.setLevel(logging.WARNING)
 
1680
        console.setLevel(logging.WARNING)
 
1681
    
 
1682
    if server_settings[u"servicename"] != u"Mandos":
1793
1683
        syslogger.setFormatter(logging.Formatter
1794
 
                               ('Mandos (%s) [%%(process)d]:'
1795
 
                                ' %%(levelname)s: %%(message)s'
1796
 
                                % server_settings["servicename"]))
 
1684
                               (u'Mandos (%s) [%%(process)d]:'
 
1685
                                u' %%(levelname)s: %%(message)s'
 
1686
                                % server_settings[u"servicename"]))
1797
1687
    
1798
1688
    # Parse config file with clients
1799
 
    client_defaults = { "timeout": "1h",
1800
 
                        "interval": "5m",
1801
 
                        "checker": "fping -q -- %%(host)s",
1802
 
                        "host": "",
1803
 
                        "approval_delay": "0s",
1804
 
                        "approval_duration": "1s",
 
1689
    client_defaults = { u"timeout": u"1h",
 
1690
                        u"interval": u"5m",
 
1691
                        u"checker": u"fping -q -- %%(host)s",
 
1692
                        u"host": u"",
 
1693
                        u"approved_delay": u"0s",
 
1694
                        u"approved_duration": u"1s",
1805
1695
                        }
1806
1696
    client_config = configparser.SafeConfigParser(client_defaults)
1807
 
    client_config.read(os.path.join(server_settings["configdir"],
1808
 
                                    "clients.conf"))
 
1697
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1698
                                    u"clients.conf"))
1809
1699
    
1810
1700
    global mandos_dbus_service
1811
1701
    mandos_dbus_service = None
1812
1702
    
1813
 
    tcp_server = MandosServer((server_settings["address"],
1814
 
                               server_settings["port"]),
 
1703
    tcp_server = MandosServer((server_settings[u"address"],
 
1704
                               server_settings[u"port"]),
1815
1705
                              ClientHandler,
1816
 
                              interface=(server_settings["interface"]
1817
 
                                         or None),
 
1706
                              interface=server_settings[u"interface"],
1818
1707
                              use_ipv6=use_ipv6,
1819
1708
                              gnutls_priority=
1820
 
                              server_settings["priority"],
 
1709
                              server_settings[u"priority"],
1821
1710
                              use_dbus=use_dbus)
1822
 
    if not debug:
1823
 
        pidfilename = "/var/run/mandos.pid"
1824
 
        try:
1825
 
            pidfile = open(pidfilename, "w")
1826
 
        except IOError:
1827
 
            logger.error("Could not open file %r", pidfilename)
 
1711
    pidfilename = u"/var/run/mandos.pid"
 
1712
    try:
 
1713
        pidfile = open(pidfilename, u"w")
 
1714
    except IOError:
 
1715
        logger.error(u"Could not open file %r", pidfilename)
1828
1716
    
1829
1717
    try:
1830
 
        uid = pwd.getpwnam("_mandos").pw_uid
1831
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1718
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1719
        gid = pwd.getpwnam(u"_mandos").pw_gid
1832
1720
    except KeyError:
1833
1721
        try:
1834
 
            uid = pwd.getpwnam("mandos").pw_uid
1835
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1722
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1723
            gid = pwd.getpwnam(u"mandos").pw_gid
1836
1724
        except KeyError:
1837
1725
            try:
1838
 
                uid = pwd.getpwnam("nobody").pw_uid
1839
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1726
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1727
                gid = pwd.getpwnam(u"nobody").pw_gid
1840
1728
            except KeyError:
1841
1729
                uid = 65534
1842
1730
                gid = 65534
1843
1731
    try:
1844
1732
        os.setgid(gid)
1845
1733
        os.setuid(uid)
1846
 
    except OSError as error:
 
1734
    except OSError, error:
1847
1735
        if error[0] != errno.EPERM:
1848
1736
            raise error
1849
1737
    
1850
 
    if not debug and not debuglevel:
1851
 
        syslogger.setLevel(logging.WARNING)
1852
 
        console.setLevel(logging.WARNING)
1853
 
    if debuglevel:
1854
 
        level = getattr(logging, debuglevel.upper())
1855
 
        syslogger.setLevel(level)
1856
 
        console.setLevel(level)
1857
 
 
 
1738
    # Enable all possible GnuTLS debugging
1858
1739
    if debug:
1859
 
        # Enable all possible GnuTLS debugging
1860
 
        
1861
1740
        # "Use a log level over 10 to enable all debugging options."
1862
1741
        # - GnuTLS manual
1863
1742
        gnutls.library.functions.gnutls_global_set_log_level(11)
1864
1743
        
1865
1744
        @gnutls.library.types.gnutls_log_func
1866
1745
        def debug_gnutls(level, string):
1867
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1746
            logger.debug(u"GnuTLS: %s", string[:-1])
1868
1747
        
1869
1748
        (gnutls.library.functions
1870
1749
         .gnutls_global_set_log_function(debug_gnutls))
1871
 
        
1872
 
        # Redirect stdin so all checkers get /dev/null
1873
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1874
 
        os.dup2(null, sys.stdin.fileno())
1875
 
        if null > 2:
1876
 
            os.close(null)
1877
 
    else:
1878
 
        # No console logging
1879
 
        logger.removeHandler(console)
1880
 
    
1881
 
    # Need to fork before connecting to D-Bus
1882
 
    if not debug:
1883
 
        # Close all input and output, do double fork, etc.
1884
 
        daemon()
1885
1750
    
1886
1751
    global main_loop
1887
1752
    # From the Avahi example code
1891
1756
    # End of Avahi example code
1892
1757
    if use_dbus:
1893
1758
        try:
1894
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1759
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1895
1760
                                            bus, do_not_queue=True)
1896
 
        except dbus.exceptions.NameExistsException as e:
1897
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1761
        except dbus.exceptions.NameExistsException, e:
 
1762
            logger.error(unicode(e) + u", disabling D-Bus")
1898
1763
            use_dbus = False
1899
 
            server_settings["use_dbus"] = False
 
1764
            server_settings[u"use_dbus"] = False
1900
1765
            tcp_server.use_dbus = False
1901
1766
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1902
 
    service = AvahiService(name = server_settings["servicename"],
1903
 
                           servicetype = "_mandos._tcp",
 
1767
    service = AvahiService(name = server_settings[u"servicename"],
 
1768
                           servicetype = u"_mandos._tcp",
1904
1769
                           protocol = protocol, bus = bus)
1905
1770
    if server_settings["interface"]:
1906
1771
        service.interface = (if_nametoindex
1907
 
                             (str(server_settings["interface"])))
1908
 
    
1909
 
    global multiprocessing_manager
1910
 
    multiprocessing_manager = multiprocessing.Manager()
 
1772
                             (str(server_settings[u"interface"])))
1911
1773
    
1912
1774
    client_class = Client
1913
1775
    if use_dbus:
1930
1792
                        client_config, section)))
1931
1793
            for section in client_config.sections()))
1932
1794
    if not tcp_server.clients:
1933
 
        logger.warning("No clients defined")
1934
 
        
 
1795
        logger.warning(u"No clients defined")
 
1796
    
 
1797
    if debug:
 
1798
        # Redirect stdin so all checkers get /dev/null
 
1799
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1800
        os.dup2(null, sys.stdin.fileno())
 
1801
        if null > 2:
 
1802
            os.close(null)
 
1803
    else:
 
1804
        # No console logging
 
1805
        logger.removeHandler(console)
 
1806
        # Close all input and output, do double fork, etc.
 
1807
        daemon()
 
1808
    
 
1809
    try:
 
1810
        with pidfile:
 
1811
            pid = os.getpid()
 
1812
            pidfile.write(str(pid) + "\n")
 
1813
        del pidfile
 
1814
    except IOError:
 
1815
        logger.error(u"Could not write to file %r with PID %d",
 
1816
                     pidfilename, pid)
 
1817
    except NameError:
 
1818
        # "pidfile" was never created
 
1819
        pass
 
1820
    del pidfilename
 
1821
    
1935
1822
    if not debug:
1936
 
        try:
1937
 
            with pidfile:
1938
 
                pid = os.getpid()
1939
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1940
 
            del pidfile
1941
 
        except IOError:
1942
 
            logger.error("Could not write to file %r with PID %d",
1943
 
                         pidfilename, pid)
1944
 
        except NameError:
1945
 
            # "pidfile" was never created
1946
 
            pass
1947
 
        del pidfilename
1948
 
        
1949
1823
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1950
 
 
1951
1824
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1952
1825
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1953
1826
    
1955
1828
        class MandosDBusService(dbus.service.Object):
1956
1829
            """A D-Bus proxy object"""
1957
1830
            def __init__(self):
1958
 
                dbus.service.Object.__init__(self, bus, "/")
1959
 
            _interface = "se.bsnet.fukt.Mandos"
 
1831
                dbus.service.Object.__init__(self, bus, u"/")
 
1832
            _interface = u"se.bsnet.fukt.Mandos"
1960
1833
            
1961
 
            @dbus.service.signal(_interface, signature="o")
 
1834
            @dbus.service.signal(_interface, signature=u"o")
1962
1835
            def ClientAdded(self, objpath):
1963
1836
                "D-Bus signal"
1964
1837
                pass
1965
1838
            
1966
 
            @dbus.service.signal(_interface, signature="ss")
 
1839
            @dbus.service.signal(_interface, signature=u"ss")
1967
1840
            def ClientNotFound(self, fingerprint, address):
1968
1841
                "D-Bus signal"
1969
1842
                pass
1970
1843
            
1971
 
            @dbus.service.signal(_interface, signature="os")
 
1844
            @dbus.service.signal(_interface, signature=u"os")
1972
1845
            def ClientRemoved(self, objpath, name):
1973
1846
                "D-Bus signal"
1974
1847
                pass
1975
1848
            
1976
 
            @dbus.service.method(_interface, out_signature="ao")
 
1849
            @dbus.service.method(_interface, out_signature=u"ao")
1977
1850
            def GetAllClients(self):
1978
1851
                "D-Bus method"
1979
1852
                return dbus.Array(c.dbus_object_path
1980
1853
                                  for c in tcp_server.clients)
1981
1854
            
1982
1855
            @dbus.service.method(_interface,
1983
 
                                 out_signature="a{oa{sv}}")
 
1856
                                 out_signature=u"a{oa{sv}}")
1984
1857
            def GetAllClientsWithProperties(self):
1985
1858
                "D-Bus method"
1986
1859
                return dbus.Dictionary(
1987
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1860
                    ((c.dbus_object_path, c.GetAll(u""))
1988
1861
                     for c in tcp_server.clients),
1989
 
                    signature="oa{sv}")
 
1862
                    signature=u"oa{sv}")
1990
1863
            
1991
 
            @dbus.service.method(_interface, in_signature="o")
 
1864
            @dbus.service.method(_interface, in_signature=u"o")
1992
1865
            def RemoveClient(self, object_path):
1993
1866
                "D-Bus method"
1994
1867
                for c in tcp_server.clients:
2036
1909
    # Find out what port we got
2037
1910
    service.port = tcp_server.socket.getsockname()[1]
2038
1911
    if use_ipv6:
2039
 
        logger.info("Now listening on address %r, port %d,"
 
1912
        logger.info(u"Now listening on address %r, port %d,"
2040
1913
                    " flowinfo %d, scope_id %d"
2041
1914
                    % tcp_server.socket.getsockname())
2042
1915
    else:                       # IPv4
2043
 
        logger.info("Now listening on address %r, port %d"
 
1916
        logger.info(u"Now listening on address %r, port %d"
2044
1917
                    % tcp_server.socket.getsockname())
2045
1918
    
2046
1919
    #service.interface = tcp_server.socket.getsockname()[3]
2049
1922
        # From the Avahi example code
2050
1923
        try:
2051
1924
            service.activate()
2052
 
        except dbus.exceptions.DBusException as error:
2053
 
            logger.critical("DBusException: %s", error)
 
1925
        except dbus.exceptions.DBusException, error:
 
1926
            logger.critical(u"DBusException: %s", error)
2054
1927
            cleanup()
2055
1928
            sys.exit(1)
2056
1929
        # End of Avahi example code
2060
1933
                             (tcp_server.handle_request
2061
1934
                              (*args[2:], **kwargs) or True))
2062
1935
        
2063
 
        logger.debug("Starting main loop")
 
1936
        logger.debug(u"Starting main loop")
2064
1937
        main_loop.run()
2065
 
    except AvahiError as error:
2066
 
        logger.critical("AvahiError: %s", error)
 
1938
    except AvahiError, error:
 
1939
        logger.critical(u"AvahiError: %s", error)
2067
1940
        cleanup()
2068
1941
        sys.exit(1)
2069
1942
    except KeyboardInterrupt:
2070
1943
        if debug:
2071
 
            print("", file=sys.stderr)
2072
 
        logger.debug("Server received KeyboardInterrupt")
2073
 
    logger.debug("Server exiting")
 
1944
            print >> sys.stderr
 
1945
        logger.debug(u"Server received KeyboardInterrupt")
 
1946
    logger.debug(u"Server exiting")
2074
1947
    # Must run before the D-Bus bus name gets deregistered
2075
1948
    cleanup()
2076
1949