/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2010-09-01 18:03:03 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100901180303-u47edb73fczu56ob
bug fixes that prevent problems when runing server as root

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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
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
62
61
import functools
63
62
import cPickle as pickle
64
63
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
64
 
69
65
import dbus
70
66
import dbus.service
75
71
import ctypes.util
76
72
import xml.dom.minidom
77
73
import inspect
78
 
import GnuPGInterface
79
74
 
80
75
try:
81
76
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
80
    except ImportError:
86
81
        SO_BINDTODEVICE = None
87
82
 
88
 
version = "1.5.3"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
83
 
 
84
version = "1.0.14"
 
85
 
 
86
logger = logging.Logger(u'mandos')
92
87
syslogger = (logging.handlers.SysLogHandler
93
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
 
              address = str("/dev/log")))
95
 
 
96
 
try:
97
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
98
 
                      (ctypes.util.find_library("c"))
99
 
                      .if_nametoindex)
100
 
except (OSError, AttributeError):
101
 
    def if_nametoindex(interface):
102
 
        "Get an interface index the hard way, i.e. using fcntl()"
103
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
104
 
        with contextlib.closing(socket.socket()) as s:
105
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
 
                                struct.pack(str("16s16x"),
107
 
                                            interface))
108
 
        interface_index = struct.unpack(str("I"),
109
 
                                        ifreq[16:20])[0]
110
 
        return interface_index
111
 
 
112
 
 
113
 
def initlogger(debug, level=logging.WARNING):
114
 
    """init logger and add loglevel"""
115
 
    
116
 
    syslogger.setFormatter(logging.Formatter
117
 
                           ('Mandos [%(process)d]: %(levelname)s:'
118
 
                            ' %(message)s'))
119
 
    logger.addHandler(syslogger)
120
 
    
121
 
    if debug:
122
 
        console = logging.StreamHandler()
123
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
 
                                               ' [%(process)d]:'
125
 
                                               ' %(levelname)s:'
126
 
                                               ' %(message)s'))
127
 
        logger.addHandler(console)
128
 
    logger.setLevel(level)
129
 
 
130
 
 
131
 
class PGPError(Exception):
132
 
    """Exception if encryption/decryption fails"""
133
 
    pass
134
 
 
135
 
 
136
 
class PGPEngine(object):
137
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
138
 
    def __init__(self):
139
 
        self.gnupg = GnuPGInterface.GnuPG()
140
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
 
        self.gnupg = GnuPGInterface.GnuPG()
142
 
        self.gnupg.options.meta_interactive = False
143
 
        self.gnupg.options.homedir = self.tempdir
144
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
145
 
                                              '--quiet',
146
 
                                              '--no-use-agent'])
147
 
    
148
 
    def __enter__(self):
149
 
        return self
150
 
    
151
 
    def __exit__ (self, exc_type, exc_value, traceback):
152
 
        self._cleanup()
153
 
        return False
154
 
    
155
 
    def __del__(self):
156
 
        self._cleanup()
157
 
    
158
 
    def _cleanup(self):
159
 
        if self.tempdir is not None:
160
 
            # Delete contents of tempdir
161
 
            for root, dirs, files in os.walk(self.tempdir,
162
 
                                             topdown = False):
163
 
                for filename in files:
164
 
                    os.remove(os.path.join(root, filename))
165
 
                for dirname in dirs:
166
 
                    os.rmdir(os.path.join(root, dirname))
167
 
            # Remove tempdir
168
 
            os.rmdir(self.tempdir)
169
 
            self.tempdir = None
170
 
    
171
 
    def password_encode(self, password):
172
 
        # Passphrase can not be empty and can not contain newlines or
173
 
        # NUL bytes.  So we prefix it and hex encode it.
174
 
        return b"mandos" + binascii.hexlify(password)
175
 
    
176
 
    def encrypt(self, data, password):
177
 
        self.gnupg.passphrase = self.password_encode(password)
178
 
        with open(os.devnull) as devnull:
179
 
            try:
180
 
                proc = self.gnupg.run(['--symmetric'],
181
 
                                      create_fhs=['stdin', 'stdout'],
182
 
                                      attach_fhs={'stderr': devnull})
183
 
                with contextlib.closing(proc.handles['stdin']) as f:
184
 
                    f.write(data)
185
 
                with contextlib.closing(proc.handles['stdout']) as f:
186
 
                    ciphertext = f.read()
187
 
                proc.wait()
188
 
            except IOError as e:
189
 
                raise PGPError(e)
190
 
        self.gnupg.passphrase = None
191
 
        return ciphertext
192
 
    
193
 
    def decrypt(self, data, password):
194
 
        self.gnupg.passphrase = self.password_encode(password)
195
 
        with open(os.devnull) as devnull:
196
 
            try:
197
 
                proc = self.gnupg.run(['--decrypt'],
198
 
                                      create_fhs=['stdin', 'stdout'],
199
 
                                      attach_fhs={'stderr': devnull})
200
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
201
 
                    f.write(data)
202
 
                with contextlib.closing(proc.handles['stdout']) as f:
203
 
                    decrypted_plaintext = f.read()
204
 
                proc.wait()
205
 
            except IOError as e:
206
 
                raise PGPError(e)
207
 
        self.gnupg.passphrase = None
208
 
        return decrypted_plaintext
209
 
 
210
 
 
 
89
              address = "/dev/log"))
 
90
syslogger.setFormatter(logging.Formatter
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
 
93
logger.addHandler(syslogger)
 
94
 
 
95
console = logging.StreamHandler()
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
 
99
logger.addHandler(console)
211
100
 
212
101
class AvahiError(Exception):
213
102
    def __init__(self, value, *args, **kwargs):
229
118
    Attributes:
230
119
    interface: integer; avahi.IF_UNSPEC or an interface index.
231
120
               Used to optionally bind to the specified interface.
232
 
    name: string; Example: 'Mandos'
233
 
    type: string; Example: '_mandos._tcp'.
 
121
    name: string; Example: u'Mandos'
 
122
    type: string; Example: u'_mandos._tcp'.
234
123
                  See <http://www.dns-sd.org/ServiceTypes.html>
235
124
    port: integer; what port to announce
236
125
    TXT: list of strings; TXT record for the service
245
134
    """
246
135
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
247
136
                 servicetype = None, port = None, TXT = None,
248
 
                 domain = "", host = "", max_renames = 32768,
 
137
                 domain = u"", host = u"", max_renames = 32768,
249
138
                 protocol = avahi.PROTO_UNSPEC, bus = None):
250
139
        self.interface = interface
251
140
        self.name = name
260
149
        self.group = None       # our entry group
261
150
        self.server = None
262
151
        self.bus = bus
263
 
        self.entry_group_state_changed_match = None
264
152
    def rename(self):
265
153
        """Derived from the Avahi example code"""
266
154
        if self.rename_count >= self.max_renames:
267
 
            logger.critical("No suitable Zeroconf service name found"
268
 
                            " after %i retries, exiting.",
 
155
            logger.critical(u"No suitable Zeroconf service name found"
 
156
                            u" after %i retries, exiting.",
269
157
                            self.rename_count)
270
 
            raise AvahiServiceError("Too many renames")
271
 
        self.name = unicode(self.server
272
 
                            .GetAlternativeServiceName(self.name))
273
 
        logger.info("Changing Zeroconf service name to %r ...",
274
 
                    self.name)
 
158
            raise AvahiServiceError(u"Too many renames")
 
159
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        logger.info(u"Changing Zeroconf service name to %r ...",
 
161
                    unicode(self.name))
 
162
        syslogger.setFormatter(logging.Formatter
 
163
                               (u'Mandos (%s) [%%(process)d]:'
 
164
                                u' %%(levelname)s: %%(message)s'
 
165
                                % self.name))
275
166
        self.remove()
276
 
        try:
277
 
            self.add()
278
 
        except dbus.exceptions.DBusException as error:
279
 
            logger.critical("DBusException: %s", error)
280
 
            self.cleanup()
281
 
            os._exit(1)
 
167
        self.add()
282
168
        self.rename_count += 1
283
169
    def remove(self):
284
170
        """Derived from the Avahi example code"""
285
 
        if self.entry_group_state_changed_match is not None:
286
 
            self.entry_group_state_changed_match.remove()
287
 
            self.entry_group_state_changed_match = None
288
171
        if self.group is not None:
289
172
            self.group.Reset()
290
173
    def add(self):
291
174
        """Derived from the Avahi example code"""
292
 
        self.remove()
293
175
        if self.group is None:
294
176
            self.group = dbus.Interface(
295
177
                self.bus.get_object(avahi.DBUS_NAME,
296
178
                                    self.server.EntryGroupNew()),
297
179
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
 
        self.entry_group_state_changed_match = (
299
 
            self.group.connect_to_signal(
300
 
                'StateChanged', self.entry_group_state_changed))
301
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
180
            self.group.connect_to_signal('StateChanged',
 
181
                                         self
 
182
                                         .entry_group_state_changed)
 
183
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
302
184
                     self.name, self.type)
303
185
        self.group.AddService(
304
186
            self.interface,
311
193
        self.group.Commit()
312
194
    def entry_group_state_changed(self, state, error):
313
195
        """Derived from the Avahi example code"""
314
 
        logger.debug("Avahi entry group state change: %i", state)
 
196
        logger.debug(u"Avahi state change: %i", state)
315
197
        
316
198
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
317
 
            logger.debug("Zeroconf service established.")
 
199
            logger.debug(u"Zeroconf service established.")
318
200
        elif state == avahi.ENTRY_GROUP_COLLISION:
319
 
            logger.info("Zeroconf service name collision.")
 
201
            logger.warning(u"Zeroconf service name collision.")
320
202
            self.rename()
321
203
        elif state == avahi.ENTRY_GROUP_FAILURE:
322
 
            logger.critical("Avahi: Error in group state changed %s",
 
204
            logger.critical(u"Avahi: Error in group state changed %s",
323
205
                            unicode(error))
324
 
            raise AvahiGroupError("State changed: %s"
 
206
            raise AvahiGroupError(u"State changed: %s"
325
207
                                  % unicode(error))
326
208
    def cleanup(self):
327
209
        """Derived from the Avahi example code"""
328
210
        if self.group is not None:
329
 
            try:
330
 
                self.group.Free()
331
 
            except (dbus.exceptions.UnknownMethodException,
332
 
                    dbus.exceptions.DBusException):
333
 
                pass
 
211
            self.group.Free()
334
212
            self.group = None
335
 
        self.remove()
336
 
    def server_state_changed(self, state, error=None):
 
213
    def server_state_changed(self, state):
337
214
        """Derived from the Avahi example code"""
338
 
        logger.debug("Avahi server state change: %i", state)
339
 
        bad_states = { avahi.SERVER_INVALID:
340
 
                           "Zeroconf server invalid",
341
 
                       avahi.SERVER_REGISTERING: None,
342
 
                       avahi.SERVER_COLLISION:
343
 
                           "Zeroconf server name collision",
344
 
                       avahi.SERVER_FAILURE:
345
 
                           "Zeroconf server failure" }
346
 
        if state in bad_states:
347
 
            if bad_states[state] is not None:
348
 
                if error is None:
349
 
                    logger.error(bad_states[state])
350
 
                else:
351
 
                    logger.error(bad_states[state] + ": %r", error)
352
 
            self.cleanup()
 
215
        if state == avahi.SERVER_COLLISION:
 
216
            logger.error(u"Zeroconf server name collision")
 
217
            self.remove()
353
218
        elif state == avahi.SERVER_RUNNING:
354
219
            self.add()
355
 
        else:
356
 
            if error is None:
357
 
                logger.debug("Unknown state: %r", state)
358
 
            else:
359
 
                logger.debug("Unknown state: %r: %r", state, error)
360
220
    def activate(self):
361
221
        """Derived from the Avahi example code"""
362
222
        if self.server is None:
363
223
            self.server = dbus.Interface(
364
224
                self.bus.get_object(avahi.DBUS_NAME,
365
 
                                    avahi.DBUS_PATH_SERVER,
366
 
                                    follow_name_owner_changes=True),
 
225
                                    avahi.DBUS_PATH_SERVER),
367
226
                avahi.DBUS_INTERFACE_SERVER)
368
 
        self.server.connect_to_signal("StateChanged",
 
227
        self.server.connect_to_signal(u"StateChanged",
369
228
                                 self.server_state_changed)
370
229
        self.server_state_changed(self.server.GetState())
371
230
 
372
 
class AvahiServiceToSyslog(AvahiService):
373
 
    def rename(self):
374
 
        """Add the new name to the syslog messages"""
375
 
        ret = AvahiService.rename(self)
376
 
        syslogger.setFormatter(logging.Formatter
377
 
                               ('Mandos (%s) [%%(process)d]:'
378
 
                                ' %%(levelname)s: %%(message)s'
379
 
                                % self.name))
380
 
        return ret
381
231
 
382
 
def timedelta_to_milliseconds(td):
383
 
    "Convert a datetime.timedelta() to milliseconds"
384
 
    return ((td.days * 24 * 60 * 60 * 1000)
385
 
            + (td.seconds * 1000)
386
 
            + (td.microseconds // 1000))
387
 
        
388
232
class Client(object):
389
233
    """A representation of a client host served by this server.
390
234
    
391
235
    Attributes:
392
 
    approved:   bool(); 'None' if not yet approved/disapproved
393
 
    approval_delay: datetime.timedelta(); Time to wait for approval
394
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
236
    name:       string; from the config file, used in log messages and
 
237
                        D-Bus identifiers
 
238
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
239
                 uniquely identify the client
 
240
    secret:     bytestring; sent verbatim (over TLS) to client
 
241
    host:       string; available for use by the checker command
 
242
    created:    datetime.datetime(); (UTC) object creation
 
243
    last_enabled: datetime.datetime(); (UTC)
 
244
    enabled:    bool()
 
245
    last_checked_ok: datetime.datetime(); (UTC) or None
 
246
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
247
                                      until this client is disabled
 
248
    interval:   datetime.timedelta(); How often to start a new checker
 
249
    disable_hook:  If set, called by disable() as disable_hook(self)
395
250
    checker:    subprocess.Popen(); a running checker process used
396
251
                                    to see if the client lives.
397
252
                                    'None' if no process is running.
398
 
    checker_callback_tag: a gobject event source tag, or None
399
 
    checker_command: string; External command which is run to check
400
 
                     if client lives.  %() expansions are done at
 
253
    checker_initiator_tag: a gobject event source tag, or None
 
254
    disable_initiator_tag: - '' -
 
255
    checker_callback_tag:  - '' -
 
256
    checker_command: string; External command which is run to check if
 
257
                     client lives.  %() expansions are done at
401
258
                     runtime with vars(self) as dict, so that for
402
259
                     instance %(name)s can be used in the command.
403
 
    checker_initiator_tag: a gobject event source tag, or None
404
 
    created:    datetime.datetime(); (UTC) object creation
405
 
    client_structure: Object describing what attributes a client has
406
 
                      and is used for storing the client at exit
407
260
    current_checker_command: string; current running checker_command
408
 
    disable_initiator_tag: a gobject event source tag, or None
409
 
    enabled:    bool()
410
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
411
 
                 uniquely identify the client
412
 
    host:       string; available for use by the checker command
413
 
    interval:   datetime.timedelta(); How often to start a new checker
414
 
    last_approval_request: datetime.datetime(); (UTC) or None
415
 
    last_checked_ok: datetime.datetime(); (UTC) or None
416
 
    last_checker_status: integer between 0 and 255 reflecting exit
417
 
                         status of last checker. -1 reflects crashed
418
 
                         checker, -2 means no checker completed yet.
419
 
    last_enabled: datetime.datetime(); (UTC) or None
420
 
    name:       string; from the config file, used in log messages and
421
 
                        D-Bus identifiers
422
 
    secret:     bytestring; sent verbatim (over TLS) to client
423
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
424
 
                                      until this client is disabled
425
 
    extended_timeout:   extra long timeout when secret has been sent
426
 
    runtime_expansions: Allowed attributes for runtime expansion.
427
 
    expires:    datetime.datetime(); time (UTC) when a client will be
428
 
                disabled, or None
 
261
    approved_delay: datetime.timedelta(); Time to wait for approval
 
262
    _approved:   bool(); 'None' if not yet approved/disapproved
 
263
    approved_duration: datetime.timedelta(); Duration of one approval
429
264
    """
430
265
    
431
 
    runtime_expansions = ("approval_delay", "approval_duration",
432
 
                          "created", "enabled", "fingerprint",
433
 
                          "host", "interval", "last_checked_ok",
434
 
                          "last_enabled", "name", "timeout")
435
 
    client_defaults = { "timeout": "5m",
436
 
                        "extended_timeout": "15m",
437
 
                        "interval": "2m",
438
 
                        "checker": "fping -q -- %%(host)s",
439
 
                        "host": "",
440
 
                        "approval_delay": "0s",
441
 
                        "approval_duration": "1s",
442
 
                        "approved_by_default": "True",
443
 
                        "enabled": "True",
444
 
                        }
 
266
    @staticmethod
 
267
    def _timedelta_to_milliseconds(td):
 
268
        "Convert a datetime.timedelta() to milliseconds"
 
269
        return ((td.days * 24 * 60 * 60 * 1000)
 
270
                + (td.seconds * 1000)
 
271
                + (td.microseconds // 1000))
445
272
    
446
273
    def timeout_milliseconds(self):
447
274
        "Return the 'timeout' attribute in milliseconds"
448
 
        return timedelta_to_milliseconds(self.timeout)
449
 
    
450
 
    def extended_timeout_milliseconds(self):
451
 
        "Return the 'extended_timeout' attribute in milliseconds"
452
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
275
        return self._timedelta_to_milliseconds(self.timeout)
453
276
    
454
277
    def interval_milliseconds(self):
455
278
        "Return the 'interval' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.interval)
 
279
        return self._timedelta_to_milliseconds(self.interval)
 
280
 
 
281
    def approved_delay_milliseconds(self):
 
282
        return self._timedelta_to_milliseconds(self.approved_delay)
457
283
    
458
 
    def approval_delay_milliseconds(self):
459
 
        return timedelta_to_milliseconds(self.approval_delay)
460
 
 
461
 
    @staticmethod
462
 
    def config_parser(config):
463
 
        """Construct a new dict of client settings of this form:
464
 
        { client_name: {setting_name: value, ...}, ...}
465
 
        with exceptions for any special settings as defined above.
466
 
        NOTE: Must be a pure function. Must return the same result
467
 
        value given the same arguments.
468
 
        """
469
 
        settings = {}
470
 
        for client_name in config.sections():
471
 
            section = dict(config.items(client_name))
472
 
            client = settings[client_name] = {}
473
 
            
474
 
            client["host"] = section["host"]
475
 
            # Reformat values from string types to Python types
476
 
            client["approved_by_default"] = config.getboolean(
477
 
                client_name, "approved_by_default")
478
 
            client["enabled"] = config.getboolean(client_name,
479
 
                                                  "enabled")
480
 
            
481
 
            client["fingerprint"] = (section["fingerprint"].upper()
482
 
                                     .replace(" ", ""))
483
 
            if "secret" in section:
484
 
                client["secret"] = section["secret"].decode("base64")
485
 
            elif "secfile" in section:
486
 
                with open(os.path.expanduser(os.path.expandvars
487
 
                                             (section["secfile"])),
488
 
                          "rb") as secfile:
489
 
                    client["secret"] = secfile.read()
490
 
            else:
491
 
                raise TypeError("No secret or secfile for section %s"
492
 
                                % section)
493
 
            client["timeout"] = string_to_delta(section["timeout"])
494
 
            client["extended_timeout"] = string_to_delta(
495
 
                section["extended_timeout"])
496
 
            client["interval"] = string_to_delta(section["interval"])
497
 
            client["approval_delay"] = string_to_delta(
498
 
                section["approval_delay"])
499
 
            client["approval_duration"] = string_to_delta(
500
 
                section["approval_duration"])
501
 
            client["checker_command"] = section["checker"]
502
 
            client["last_approval_request"] = None
503
 
            client["last_checked_ok"] = None
504
 
            client["last_checker_status"] = -2
505
 
        
506
 
        return settings
507
 
        
508
 
        
509
 
    def __init__(self, settings, name = None):
 
284
    def __init__(self, name = None, disable_hook=None, config=None):
510
285
        """Note: the 'checker' key in 'config' sets the
511
286
        'checker_command' attribute and *not* the 'checker'
512
287
        attribute."""
513
288
        self.name = name
514
 
        # adding all client settings
515
 
        for setting, value in settings.iteritems():
516
 
            setattr(self, setting, value)
517
 
        
518
 
        if self.enabled:
519
 
            if not hasattr(self, "last_enabled"):
520
 
                self.last_enabled = datetime.datetime.utcnow()
521
 
            if not hasattr(self, "expires"):
522
 
                self.expires = (datetime.datetime.utcnow()
523
 
                                + self.timeout)
524
 
        else:
525
 
            self.last_enabled = None
526
 
            self.expires = None
527
 
       
528
 
        logger.debug("Creating client %r", self.name)
 
289
        if config is None:
 
290
            config = {}
 
291
        logger.debug(u"Creating client %r", self.name)
529
292
        # Uppercase and remove spaces from fingerprint for later
530
293
        # comparison purposes with return value from the fingerprint()
531
294
        # function
532
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
 
        self.created = settings.get("created",
534
 
                                    datetime.datetime.utcnow())
535
 
 
536
 
        # attributes specific for this server instance
 
295
        self.fingerprint = (config[u"fingerprint"].upper()
 
296
                            .replace(u" ", u""))
 
297
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
298
        if u"secret" in config:
 
299
            self.secret = config[u"secret"].decode(u"base64")
 
300
        elif u"secfile" in config:
 
301
            with open(os.path.expanduser(os.path.expandvars
 
302
                                         (config[u"secfile"])),
 
303
                      "rb") as secfile:
 
304
                self.secret = secfile.read()
 
305
        else:
 
306
            #XXX Need to allow secret on demand!
 
307
            raise TypeError(u"No secret or secfile for client %s"
 
308
                            % self.name)
 
309
        self.host = config.get(u"host", u"")
 
310
        self.created = datetime.datetime.utcnow()
 
311
        self.enabled = False
 
312
        self.last_enabled = None
 
313
        self.last_checked_ok = None
 
314
        self.timeout = string_to_delta(config[u"timeout"])
 
315
        self.interval = string_to_delta(config[u"interval"])
 
316
        self.disable_hook = disable_hook
537
317
        self.checker = None
538
318
        self.checker_initiator_tag = None
539
319
        self.disable_initiator_tag = None
540
320
        self.checker_callback_tag = None
 
321
        self.checker_command = config[u"checker"]
541
322
        self.current_checker_command = None
542
 
        self.approved = None
 
323
        self.last_connect = None
543
324
        self.approvals_pending = 0
544
 
        self.changedstate = (multiprocessing_manager
545
 
                             .Condition(multiprocessing_manager
546
 
                                        .Lock()))
547
 
        self.client_structure = [attr for attr in
548
 
                                 self.__dict__.iterkeys()
549
 
                                 if not attr.startswith("_")]
550
 
        self.client_structure.append("client_structure")
551
 
        
552
 
        for name, t in inspect.getmembers(type(self),
553
 
                                          lambda obj:
554
 
                                              isinstance(obj,
555
 
                                                         property)):
556
 
            if not name.startswith("_"):
557
 
                self.client_structure.append(name)
558
 
    
559
 
    # Send notice to process children that client state has changed
 
325
        self._approved = None
 
326
        self.approved_by_default = config.get(u"approved_by_default",
 
327
                                              False)
 
328
        self.approved_delay = string_to_delta(
 
329
            config[u"approved_delay"])
 
330
        self.approved_duration = string_to_delta(
 
331
            config[u"approved_duration"])
 
332
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
333
 
560
334
    def send_changedstate(self):
561
 
        with self.changedstate:
562
 
            self.changedstate.notify_all()
563
 
    
 
335
        self.changedstate.acquire()
 
336
        self.changedstate.notify_all()
 
337
        self.changedstate.release()
 
338
        
564
339
    def enable(self):
565
340
        """Start this client's checker and timeout hooks"""
566
 
        if getattr(self, "enabled", False):
 
341
        if getattr(self, u"enabled", False):
567
342
            # Already enabled
568
343
            return
569
344
        self.send_changedstate()
570
 
        self.expires = datetime.datetime.utcnow() + self.timeout
571
 
        self.enabled = True
572
345
        self.last_enabled = datetime.datetime.utcnow()
573
 
        self.init_checker()
574
 
    
575
 
    def disable(self, quiet=True):
576
 
        """Disable this client."""
577
 
        if not getattr(self, "enabled", False):
578
 
            return False
579
 
        if not quiet:
580
 
            self.send_changedstate()
581
 
        if not quiet:
582
 
            logger.info("Disabling client %s", self.name)
583
 
        if getattr(self, "disable_initiator_tag", False):
584
 
            gobject.source_remove(self.disable_initiator_tag)
585
 
            self.disable_initiator_tag = None
586
 
        self.expires = None
587
 
        if getattr(self, "checker_initiator_tag", False):
588
 
            gobject.source_remove(self.checker_initiator_tag)
589
 
            self.checker_initiator_tag = None
590
 
        self.stop_checker()
591
 
        self.enabled = False
592
 
        # Do not run this again if called by a gobject.timeout_add
593
 
        return False
594
 
    
595
 
    def __del__(self):
596
 
        self.disable()
597
 
    
598
 
    def init_checker(self):
599
346
        # Schedule a new checker to be started an 'interval' from now,
600
347
        # and every interval from then on.
601
348
        self.checker_initiator_tag = (gobject.timeout_add
605
352
        self.disable_initiator_tag = (gobject.timeout_add
606
353
                                   (self.timeout_milliseconds(),
607
354
                                    self.disable))
 
355
        self.enabled = True
608
356
        # Also start a new checker *right now*.
609
357
        self.start_checker()
610
358
    
 
359
    def disable(self, quiet=True):
 
360
        """Disable this client."""
 
361
        if not getattr(self, "enabled", False):
 
362
            return False
 
363
        if not quiet:
 
364
            self.send_changedstate()
 
365
        if not quiet:
 
366
            logger.info(u"Disabling client %s", self.name)
 
367
        if getattr(self, u"disable_initiator_tag", False):
 
368
            gobject.source_remove(self.disable_initiator_tag)
 
369
            self.disable_initiator_tag = None
 
370
        if getattr(self, u"checker_initiator_tag", False):
 
371
            gobject.source_remove(self.checker_initiator_tag)
 
372
            self.checker_initiator_tag = None
 
373
        self.stop_checker()
 
374
        if self.disable_hook:
 
375
            self.disable_hook(self)
 
376
        self.enabled = False
 
377
        # Do not run this again if called by a gobject.timeout_add
 
378
        return False
 
379
    
 
380
    def __del__(self):
 
381
        self.disable_hook = None
 
382
        self.disable()
 
383
    
611
384
    def checker_callback(self, pid, condition, command):
612
385
        """The checker has completed, so take appropriate actions."""
613
386
        self.checker_callback_tag = None
614
387
        self.checker = None
615
388
        if os.WIFEXITED(condition):
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
617
 
            if self.last_checker_status == 0:
618
 
                logger.info("Checker for %(name)s succeeded",
 
389
            exitstatus = os.WEXITSTATUS(condition)
 
390
            if exitstatus == 0:
 
391
                logger.info(u"Checker for %(name)s succeeded",
619
392
                            vars(self))
620
393
                self.checked_ok()
621
394
            else:
622
 
                logger.info("Checker for %(name)s failed",
 
395
                logger.info(u"Checker for %(name)s failed",
623
396
                            vars(self))
624
397
        else:
625
 
            self.last_checker_status = -1
626
 
            logger.warning("Checker for %(name)s crashed?",
 
398
            logger.warning(u"Checker for %(name)s crashed?",
627
399
                           vars(self))
628
400
    
629
401
    def checked_ok(self):
630
 
        """Assert that the client has been seen, alive and well."""
 
402
        """Bump up the timeout for this client.
 
403
        
 
404
        This should only be called when the client has been seen,
 
405
        alive and well.
 
406
        """
631
407
        self.last_checked_ok = datetime.datetime.utcnow()
632
 
        self.last_checker_status = 0
633
 
        self.bump_timeout()
634
 
    
635
 
    def bump_timeout(self, timeout=None):
636
 
        """Bump up the timeout for this client."""
637
 
        if timeout is None:
638
 
            timeout = self.timeout
639
 
        if self.disable_initiator_tag is not None:
640
 
            gobject.source_remove(self.disable_initiator_tag)
641
 
        if getattr(self, "enabled", False):
642
 
            self.disable_initiator_tag = (gobject.timeout_add
643
 
                                          (timedelta_to_milliseconds
644
 
                                           (timeout), self.disable))
645
 
            self.expires = datetime.datetime.utcnow() + timeout
646
 
    
647
 
    def need_approval(self):
648
 
        self.last_approval_request = datetime.datetime.utcnow()
 
408
        gobject.source_remove(self.disable_initiator_tag)
 
409
        self.disable_initiator_tag = (gobject.timeout_add
 
410
                                      (self.timeout_milliseconds(),
 
411
                                       self.disable))
649
412
    
650
413
    def start_checker(self):
651
414
        """Start a new checker subprocess if one is not running.
664
427
        # If a checker exists, make sure it is not a zombie
665
428
        try:
666
429
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
667
 
        except (AttributeError, OSError) as error:
 
430
        except (AttributeError, OSError), error:
668
431
            if (isinstance(error, OSError)
669
432
                and error.errno != errno.ECHILD):
670
433
                raise error
671
434
        else:
672
435
            if pid:
673
 
                logger.warning("Checker was a zombie")
 
436
                logger.warning(u"Checker was a zombie")
674
437
                gobject.source_remove(self.checker_callback_tag)
675
438
                self.checker_callback(pid, status,
676
439
                                      self.current_checker_command)
681
444
                command = self.checker_command % self.host
682
445
            except TypeError:
683
446
                # Escape attributes for the shell
684
 
                escaped_attrs = dict(
685
 
                    (attr,
686
 
                     re.escape(unicode(str(getattr(self, attr, "")),
687
 
                                       errors=
688
 
                                       'replace')))
689
 
                    for attr in
690
 
                    self.runtime_expansions)
691
 
                
 
447
                escaped_attrs = dict((key,
 
448
                                      re.escape(unicode(str(val),
 
449
                                                        errors=
 
450
                                                        u'replace')))
 
451
                                     for key, val in
 
452
                                     vars(self).iteritems())
692
453
                try:
693
454
                    command = self.checker_command % escaped_attrs
694
 
                except TypeError as error:
695
 
                    logger.error('Could not format string "%s":'
696
 
                                 ' %s', self.checker_command, error)
 
455
                except TypeError, error:
 
456
                    logger.error(u'Could not format string "%s":'
 
457
                                 u' %s', self.checker_command, error)
697
458
                    return True # Try again later
698
459
            self.current_checker_command = command
699
460
            try:
700
 
                logger.info("Starting checker %r for %s",
 
461
                logger.info(u"Starting checker %r for %s",
701
462
                            command, self.name)
702
463
                # We don't need to redirect stdout and stderr, since
703
464
                # in normal mode, that is already done by daemon(),
705
466
                # always replaced by /dev/null.)
706
467
                self.checker = subprocess.Popen(command,
707
468
                                                close_fds=True,
708
 
                                                shell=True, cwd="/")
 
469
                                                shell=True, cwd=u"/")
709
470
                self.checker_callback_tag = (gobject.child_watch_add
710
471
                                             (self.checker.pid,
711
472
                                              self.checker_callback,
716
477
                if pid:
717
478
                    gobject.source_remove(self.checker_callback_tag)
718
479
                    self.checker_callback(pid, status, command)
719
 
            except OSError as error:
720
 
                logger.error("Failed to start subprocess: %s",
 
480
            except OSError, error:
 
481
                logger.error(u"Failed to start subprocess: %s",
721
482
                             error)
722
483
        # Re-run this periodically if run by gobject.timeout_add
723
484
        return True
727
488
        if self.checker_callback_tag:
728
489
            gobject.source_remove(self.checker_callback_tag)
729
490
            self.checker_callback_tag = None
730
 
        if getattr(self, "checker", None) is None:
 
491
        if getattr(self, u"checker", None) is None:
731
492
            return
732
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
493
        logger.debug(u"Stopping checker for %(name)s", vars(self))
733
494
        try:
734
495
            os.kill(self.checker.pid, signal.SIGTERM)
735
496
            #time.sleep(0.5)
736
497
            #if self.checker.poll() is None:
737
498
            #    os.kill(self.checker.pid, signal.SIGKILL)
738
 
        except OSError as error:
 
499
        except OSError, error:
739
500
            if error.errno != errno.ESRCH: # No such process
740
501
                raise
741
502
        self.checker = None
742
503
 
743
 
 
744
 
def dbus_service_property(dbus_interface, signature="v",
745
 
                          access="readwrite", byte_arrays=False):
 
504
def dbus_service_property(dbus_interface, signature=u"v",
 
505
                          access=u"readwrite", byte_arrays=False):
746
506
    """Decorators for marking methods of a DBusObjectWithProperties to
747
507
    become properties on the D-Bus.
748
508
    
755
515
    """
756
516
    # Encoding deeply encoded byte arrays is not supported yet by the
757
517
    # "Set" method, so we fail early here:
758
 
    if byte_arrays and signature != "ay":
759
 
        raise ValueError("Byte arrays not supported for non-'ay'"
760
 
                         " signature %r" % signature)
 
518
    if byte_arrays and signature != u"ay":
 
519
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
520
                         u" signature %r" % signature)
761
521
    def decorator(func):
762
522
        func._dbus_is_property = True
763
523
        func._dbus_interface = dbus_interface
764
524
        func._dbus_signature = signature
765
525
        func._dbus_access = access
766
526
        func._dbus_name = func.__name__
767
 
        if func._dbus_name.endswith("_dbus_property"):
 
527
        if func._dbus_name.endswith(u"_dbus_property"):
768
528
            func._dbus_name = func._dbus_name[:-14]
769
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
529
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
770
530
        return func
771
531
    return decorator
772
532
 
792
552
 
793
553
class DBusObjectWithProperties(dbus.service.Object):
794
554
    """A D-Bus object with properties.
795
 
    
 
555
 
796
556
    Classes inheriting from this can use the dbus_service_property
797
557
    decorator to expose methods as D-Bus properties.  It exposes the
798
558
    standard Get(), Set(), and GetAll() methods on the D-Bus.
800
560
    
801
561
    @staticmethod
802
562
    def _is_dbus_property(obj):
803
 
        return getattr(obj, "_dbus_is_property", False)
 
563
        return getattr(obj, u"_dbus_is_property", False)
804
564
    
805
565
    def _get_all_dbus_properties(self):
806
566
        """Returns a generator of (name, attribute) pairs
807
567
        """
808
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
 
                for cls in self.__class__.__mro__
 
568
        return ((prop._dbus_name, prop)
810
569
                for name, prop in
811
 
                inspect.getmembers(cls, self._is_dbus_property))
 
570
                inspect.getmembers(self, self._is_dbus_property))
812
571
    
813
572
    def _get_dbus_property(self, interface_name, property_name):
814
573
        """Returns a bound method if one exists which is a D-Bus
815
574
        property with the specified name and interface.
816
575
        """
817
 
        for cls in  self.__class__.__mro__:
818
 
            for name, value in (inspect.getmembers
819
 
                                (cls, self._is_dbus_property)):
820
 
                if (value._dbus_name == property_name
821
 
                    and value._dbus_interface == interface_name):
822
 
                    return value.__get__(self)
823
 
        
 
576
        for name in (property_name,
 
577
                     property_name + u"_dbus_property"):
 
578
            prop = getattr(self, name, None)
 
579
            if (prop is None
 
580
                or not self._is_dbus_property(prop)
 
581
                or prop._dbus_name != property_name
 
582
                or (interface_name and prop._dbus_interface
 
583
                    and interface_name != prop._dbus_interface)):
 
584
                continue
 
585
            return prop
824
586
        # No such property
825
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
 
                                   + interface_name + "."
 
587
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
588
                                   + interface_name + u"."
827
589
                                   + property_name)
828
590
    
829
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
830
 
                         out_signature="v")
 
591
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
592
                         out_signature=u"v")
831
593
    def Get(self, interface_name, property_name):
832
594
        """Standard D-Bus property Get() method, see D-Bus standard.
833
595
        """
834
596
        prop = self._get_dbus_property(interface_name, property_name)
835
 
        if prop._dbus_access == "write":
 
597
        if prop._dbus_access == u"write":
836
598
            raise DBusPropertyAccessException(property_name)
837
599
        value = prop()
838
 
        if not hasattr(value, "variant_level"):
 
600
        if not hasattr(value, u"variant_level"):
839
601
            return value
840
602
        return type(value)(value, variant_level=value.variant_level+1)
841
603
    
842
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
604
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
843
605
    def Set(self, interface_name, property_name, value):
844
606
        """Standard D-Bus property Set() method, see D-Bus standard.
845
607
        """
846
608
        prop = self._get_dbus_property(interface_name, property_name)
847
 
        if prop._dbus_access == "read":
 
609
        if prop._dbus_access == u"read":
848
610
            raise DBusPropertyAccessException(property_name)
849
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
611
        if prop._dbus_get_args_options[u"byte_arrays"]:
850
612
            # The byte_arrays option is not supported yet on
851
613
            # signatures other than "ay".
852
 
            if prop._dbus_signature != "ay":
 
614
            if prop._dbus_signature != u"ay":
853
615
                raise ValueError
854
 
            value = dbus.ByteArray(b''.join(chr(byte)
855
 
                                            for byte in value))
 
616
            value = dbus.ByteArray(''.join(unichr(byte)
 
617
                                           for byte in value))
856
618
        prop(value)
857
619
    
858
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
859
 
                         out_signature="a{sv}")
 
620
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
621
                         out_signature=u"a{sv}")
860
622
    def GetAll(self, interface_name):
861
623
        """Standard D-Bus property GetAll() method, see D-Bus
862
624
        standard.
863
 
        
 
625
 
864
626
        Note: Will not include properties with access="write".
865
627
        """
866
 
        properties = {}
 
628
        all = {}
867
629
        for name, prop in self._get_all_dbus_properties():
868
630
            if (interface_name
869
631
                and interface_name != prop._dbus_interface):
870
632
                # Interface non-empty but did not match
871
633
                continue
872
634
            # Ignore write-only properties
873
 
            if prop._dbus_access == "write":
 
635
            if prop._dbus_access == u"write":
874
636
                continue
875
637
            value = prop()
876
 
            if not hasattr(value, "variant_level"):
877
 
                properties[name] = value
 
638
            if not hasattr(value, u"variant_level"):
 
639
                all[name] = value
878
640
                continue
879
 
            properties[name] = type(value)(value, variant_level=
880
 
                                           value.variant_level+1)
881
 
        return dbus.Dictionary(properties, signature="sv")
 
641
            all[name] = type(value)(value, variant_level=
 
642
                                    value.variant_level+1)
 
643
        return dbus.Dictionary(all, signature=u"sv")
882
644
    
883
645
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
 
                         out_signature="s",
 
646
                         out_signature=u"s",
885
647
                         path_keyword='object_path',
886
648
                         connection_keyword='connection')
887
649
    def Introspect(self, object_path, connection):
892
654
        try:
893
655
            document = xml.dom.minidom.parseString(xmlstring)
894
656
            def make_tag(document, name, prop):
895
 
                e = document.createElement("property")
896
 
                e.setAttribute("name", name)
897
 
                e.setAttribute("type", prop._dbus_signature)
898
 
                e.setAttribute("access", prop._dbus_access)
 
657
                e = document.createElement(u"property")
 
658
                e.setAttribute(u"name", name)
 
659
                e.setAttribute(u"type", prop._dbus_signature)
 
660
                e.setAttribute(u"access", prop._dbus_access)
899
661
                return e
900
 
            for if_tag in document.getElementsByTagName("interface"):
 
662
            for if_tag in document.getElementsByTagName(u"interface"):
901
663
                for tag in (make_tag(document, name, prop)
902
664
                            for name, prop
903
665
                            in self._get_all_dbus_properties()
904
666
                            if prop._dbus_interface
905
 
                            == if_tag.getAttribute("name")):
 
667
                            == if_tag.getAttribute(u"name")):
906
668
                    if_tag.appendChild(tag)
907
669
                # Add the names to the return values for the
908
670
                # "org.freedesktop.DBus.Properties" methods
909
 
                if (if_tag.getAttribute("name")
910
 
                    == "org.freedesktop.DBus.Properties"):
911
 
                    for cn in if_tag.getElementsByTagName("method"):
912
 
                        if cn.getAttribute("name") == "Get":
913
 
                            for arg in cn.getElementsByTagName("arg"):
914
 
                                if (arg.getAttribute("direction")
915
 
                                    == "out"):
916
 
                                    arg.setAttribute("name", "value")
917
 
                        elif cn.getAttribute("name") == "GetAll":
918
 
                            for arg in cn.getElementsByTagName("arg"):
919
 
                                if (arg.getAttribute("direction")
920
 
                                    == "out"):
921
 
                                    arg.setAttribute("name", "props")
922
 
            xmlstring = document.toxml("utf-8")
 
671
                if (if_tag.getAttribute(u"name")
 
672
                    == u"org.freedesktop.DBus.Properties"):
 
673
                    for cn in if_tag.getElementsByTagName(u"method"):
 
674
                        if cn.getAttribute(u"name") == u"Get":
 
675
                            for arg in cn.getElementsByTagName(u"arg"):
 
676
                                if (arg.getAttribute(u"direction")
 
677
                                    == u"out"):
 
678
                                    arg.setAttribute(u"name", u"value")
 
679
                        elif cn.getAttribute(u"name") == u"GetAll":
 
680
                            for arg in cn.getElementsByTagName(u"arg"):
 
681
                                if (arg.getAttribute(u"direction")
 
682
                                    == u"out"):
 
683
                                    arg.setAttribute(u"name", u"props")
 
684
            xmlstring = document.toxml(u"utf-8")
923
685
            document.unlink()
924
686
        except (AttributeError, xml.dom.DOMException,
925
 
                xml.parsers.expat.ExpatError) as error:
926
 
            logger.error("Failed to override Introspection method",
 
687
                xml.parsers.expat.ExpatError), error:
 
688
            logger.error(u"Failed to override Introspection method",
927
689
                         error)
928
690
        return xmlstring
929
691
 
930
692
 
931
 
def datetime_to_dbus (dt, variant_level=0):
932
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
933
 
    if dt is None:
934
 
        return dbus.String("", variant_level = variant_level)
935
 
    return dbus.String(dt.isoformat(),
936
 
                       variant_level=variant_level)
937
 
 
938
 
 
939
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
 
                                  .__metaclass__):
941
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
942
 
    will add additional D-Bus attributes matching a certain pattern.
943
 
    """
944
 
    def __new__(mcs, name, bases, attr):
945
 
        # Go through all the base classes which could have D-Bus
946
 
        # methods, signals, or properties in them
947
 
        for base in (b for b in bases
948
 
                     if issubclass(b, dbus.service.Object)):
949
 
            # Go though all attributes of the base class
950
 
            for attrname, attribute in inspect.getmembers(base):
951
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
952
 
                # with the wrong interface name
953
 
                if (not hasattr(attribute, "_dbus_interface")
954
 
                    or not attribute._dbus_interface
955
 
                    .startswith("se.recompile.Mandos")):
956
 
                    continue
957
 
                # Create an alternate D-Bus interface name based on
958
 
                # the current name
959
 
                alt_interface = (attribute._dbus_interface
960
 
                                 .replace("se.recompile.Mandos",
961
 
                                          "se.bsnet.fukt.Mandos"))
962
 
                # Is this a D-Bus signal?
963
 
                if getattr(attribute, "_dbus_is_signal", False):
964
 
                    # Extract the original non-method function by
965
 
                    # black magic
966
 
                    nonmethod_func = (dict(
967
 
                            zip(attribute.func_code.co_freevars,
968
 
                                attribute.__closure__))["func"]
969
 
                                      .cell_contents)
970
 
                    # Create a new, but exactly alike, function
971
 
                    # object, and decorate it to be a new D-Bus signal
972
 
                    # with the alternate D-Bus interface name
973
 
                    new_function = (dbus.service.signal
974
 
                                    (alt_interface,
975
 
                                     attribute._dbus_signature)
976
 
                                    (types.FunctionType(
977
 
                                nonmethod_func.func_code,
978
 
                                nonmethod_func.func_globals,
979
 
                                nonmethod_func.func_name,
980
 
                                nonmethod_func.func_defaults,
981
 
                                nonmethod_func.func_closure)))
982
 
                    # Define a creator of a function to call both the
983
 
                    # old and new functions, so both the old and new
984
 
                    # signals gets sent when the function is called
985
 
                    def fixscope(func1, func2):
986
 
                        """This function is a scope container to pass
987
 
                        func1 and func2 to the "call_both" function
988
 
                        outside of its arguments"""
989
 
                        def call_both(*args, **kwargs):
990
 
                            """This function will emit two D-Bus
991
 
                            signals by calling func1 and func2"""
992
 
                            func1(*args, **kwargs)
993
 
                            func2(*args, **kwargs)
994
 
                        return call_both
995
 
                    # Create the "call_both" function and add it to
996
 
                    # the class
997
 
                    attr[attrname] = fixscope(attribute,
998
 
                                              new_function)
999
 
                # Is this a D-Bus method?
1000
 
                elif getattr(attribute, "_dbus_is_method", False):
1001
 
                    # Create a new, but exactly alike, function
1002
 
                    # object.  Decorate it to be a new D-Bus method
1003
 
                    # with the alternate D-Bus interface name.  Add it
1004
 
                    # to the class.
1005
 
                    attr[attrname] = (dbus.service.method
1006
 
                                      (alt_interface,
1007
 
                                       attribute._dbus_in_signature,
1008
 
                                       attribute._dbus_out_signature)
1009
 
                                      (types.FunctionType
1010
 
                                       (attribute.func_code,
1011
 
                                        attribute.func_globals,
1012
 
                                        attribute.func_name,
1013
 
                                        attribute.func_defaults,
1014
 
                                        attribute.func_closure)))
1015
 
                # Is this a D-Bus property?
1016
 
                elif getattr(attribute, "_dbus_is_property", False):
1017
 
                    # Create a new, but exactly alike, function
1018
 
                    # object, and decorate it to be a new D-Bus
1019
 
                    # property with the alternate D-Bus interface
1020
 
                    # name.  Add it to the class.
1021
 
                    attr[attrname] = (dbus_service_property
1022
 
                                      (alt_interface,
1023
 
                                       attribute._dbus_signature,
1024
 
                                       attribute._dbus_access,
1025
 
                                       attribute
1026
 
                                       ._dbus_get_args_options
1027
 
                                       ["byte_arrays"])
1028
 
                                      (types.FunctionType
1029
 
                                       (attribute.func_code,
1030
 
                                        attribute.func_globals,
1031
 
                                        attribute.func_name,
1032
 
                                        attribute.func_defaults,
1033
 
                                        attribute.func_closure)))
1034
 
        return type.__new__(mcs, name, bases, attr)
1035
 
 
1036
 
 
1037
693
class ClientDBus(Client, DBusObjectWithProperties):
1038
694
    """A Client class using D-Bus
1039
695
    
1041
697
    dbus_object_path: dbus.ObjectPath
1042
698
    bus: dbus.SystemBus()
1043
699
    """
1044
 
    
1045
 
    runtime_expansions = (Client.runtime_expansions
1046
 
                          + ("dbus_object_path",))
1047
 
    
1048
700
    # dbus.service.Object doesn't use super(), so we can't either.
1049
701
    
1050
702
    def __init__(self, bus = None, *args, **kwargs):
1052
704
        Client.__init__(self, *args, **kwargs)
1053
705
        # Only now, when this client is initialized, can it show up on
1054
706
        # the D-Bus
1055
 
        client_object_name = unicode(self.name).translate(
1056
 
            {ord("."): ord("_"),
1057
 
             ord("-"): ord("_")})
1058
707
        self.dbus_object_path = (dbus.ObjectPath
1059
 
                                 ("/clients/" + client_object_name))
 
708
                                 (u"/clients/"
 
709
                                  + self.name.replace(u".", u"_")))
1060
710
        DBusObjectWithProperties.__init__(self, self.bus,
1061
711
                                          self.dbus_object_path)
1062
 
        
1063
 
    def notifychangeproperty(transform_func,
1064
 
                             dbus_name, type_func=lambda x: x,
1065
 
                             variant_level=1):
1066
 
        """ Modify a variable so that it's a property which announces
1067
 
        its changes to DBus.
1068
 
        
1069
 
        transform_fun: Function that takes a value and a variant_level
1070
 
                       and transforms it to a D-Bus type.
1071
 
        dbus_name: D-Bus name of the variable
1072
 
        type_func: Function that transform the value before sending it
1073
 
                   to the D-Bus.  Default: no transform
1074
 
        variant_level: D-Bus variant level.  Default: 1
1075
 
        """
1076
 
        attrname = "_{0}".format(dbus_name)
1077
 
        def setter(self, value):
1078
 
            if hasattr(self, "dbus_object_path"):
1079
 
                if (not hasattr(self, attrname) or
1080
 
                    type_func(getattr(self, attrname, None))
1081
 
                    != type_func(value)):
1082
 
                    dbus_value = transform_func(type_func(value),
1083
 
                                                variant_level
1084
 
                                                =variant_level)
1085
 
                    self.PropertyChanged(dbus.String(dbus_name),
1086
 
                                         dbus_value)
1087
 
            setattr(self, attrname, value)
1088
 
        
1089
 
        return property(lambda self: getattr(self, attrname), setter)
1090
 
    
1091
 
    
1092
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
 
                                             "ApprovalPending",
1095
 
                                             type_func = bool)
1096
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1097
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1098
 
                                        "LastEnabled")
1099
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1100
 
                                   type_func = lambda checker:
1101
 
                                       checker is not None)
1102
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
 
                                           "LastCheckedOK")
1104
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1105
 
                                               "LastCheckerStatus")
1106
 
    last_approval_request = notifychangeproperty(
1107
 
        datetime_to_dbus, "LastApprovalRequest")
1108
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1109
 
                                               "ApprovedByDefault")
1110
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1111
 
                                          "ApprovalDelay",
1112
 
                                          type_func =
1113
 
                                          timedelta_to_milliseconds)
1114
 
    approval_duration = notifychangeproperty(
1115
 
        dbus.UInt64, "ApprovalDuration",
1116
 
        type_func = timedelta_to_milliseconds)
1117
 
    host = notifychangeproperty(dbus.String, "Host")
1118
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1119
 
                                   type_func =
1120
 
                                   timedelta_to_milliseconds)
1121
 
    extended_timeout = notifychangeproperty(
1122
 
        dbus.UInt64, "ExtendedTimeout",
1123
 
        type_func = timedelta_to_milliseconds)
1124
 
    interval = notifychangeproperty(dbus.UInt64,
1125
 
                                    "Interval",
1126
 
                                    type_func =
1127
 
                                    timedelta_to_milliseconds)
1128
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1129
 
    
1130
 
    del notifychangeproperty
 
712
    
 
713
    @staticmethod
 
714
    def _datetime_to_dbus(dt, variant_level=0):
 
715
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
716
        return dbus.String(dt.isoformat(),
 
717
                           variant_level=variant_level)
 
718
    
 
719
    def enable(self):
 
720
        oldstate = getattr(self, u"enabled", False)
 
721
        r = Client.enable(self)
 
722
        if oldstate != self.enabled:
 
723
            # Emit D-Bus signals
 
724
            self.PropertyChanged(dbus.String(u"enabled"),
 
725
                                 dbus.Boolean(True, variant_level=1))
 
726
            self.PropertyChanged(
 
727
                dbus.String(u"last_enabled"),
 
728
                self._datetime_to_dbus(self.last_enabled,
 
729
                                       variant_level=1))
 
730
        return r
 
731
    
 
732
    def disable(self, quiet = False):
 
733
        oldstate = getattr(self, u"enabled", False)
 
734
        r = Client.disable(self, quiet=quiet)
 
735
        if not quiet and oldstate != self.enabled:
 
736
            # Emit D-Bus signal
 
737
            self.PropertyChanged(dbus.String(u"enabled"),
 
738
                                 dbus.Boolean(False, variant_level=1))
 
739
        return r
1131
740
    
1132
741
    def __del__(self, *args, **kwargs):
1133
742
        try:
1134
743
            self.remove_from_connection()
1135
744
        except LookupError:
1136
745
            pass
1137
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
746
        if hasattr(DBusObjectWithProperties, u"__del__"):
1138
747
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1139
748
        Client.__del__(self, *args, **kwargs)
1140
749
    
1142
751
                         *args, **kwargs):
1143
752
        self.checker_callback_tag = None
1144
753
        self.checker = None
 
754
        # Emit D-Bus signal
 
755
        self.PropertyChanged(dbus.String(u"checker_running"),
 
756
                             dbus.Boolean(False, variant_level=1))
1145
757
        if os.WIFEXITED(condition):
1146
758
            exitstatus = os.WEXITSTATUS(condition)
1147
759
            # Emit D-Bus signal
1157
769
        return Client.checker_callback(self, pid, condition, command,
1158
770
                                       *args, **kwargs)
1159
771
    
 
772
    def checked_ok(self, *args, **kwargs):
 
773
        r = Client.checked_ok(self, *args, **kwargs)
 
774
        # Emit D-Bus signal
 
775
        self.PropertyChanged(
 
776
            dbus.String(u"last_checked_ok"),
 
777
            (self._datetime_to_dbus(self.last_checked_ok,
 
778
                                    variant_level=1)))
 
779
        return r
 
780
    
1160
781
    def start_checker(self, *args, **kwargs):
1161
782
        old_checker = self.checker
1162
783
        if self.checker is not None:
1169
790
            and old_checker_pid != self.checker.pid):
1170
791
            # Emit D-Bus signal
1171
792
            self.CheckerStarted(self.current_checker_command)
 
793
            self.PropertyChanged(
 
794
                dbus.String(u"checker_running"),
 
795
                dbus.Boolean(True, variant_level=1))
1172
796
        return r
1173
797
    
 
798
    def stop_checker(self, *args, **kwargs):
 
799
        old_checker = getattr(self, u"checker", None)
 
800
        r = Client.stop_checker(self, *args, **kwargs)
 
801
        if (old_checker is not None
 
802
            and getattr(self, u"checker", None) is None):
 
803
            self.PropertyChanged(dbus.String(u"checker_running"),
 
804
                                 dbus.Boolean(False, variant_level=1))
 
805
        return r
 
806
 
1174
807
    def _reset_approved(self):
1175
 
        self.approved = None
 
808
        self._approved = None
1176
809
        return False
1177
810
    
1178
811
    def approve(self, value=True):
1179
 
        self.send_changedstate()
1180
 
        self.approved = value
1181
 
        gobject.timeout_add(timedelta_to_milliseconds
1182
 
                            (self.approval_duration),
1183
 
                            self._reset_approved)
1184
 
    
 
812
        self._approved = value
 
813
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
 
814
 
 
815
    def approved_pending(self):
 
816
        return self.approvals_pending > 0
 
817
 
1185
818
    
1186
819
    ## D-Bus methods, signals & properties
1187
 
    _interface = "se.recompile.Mandos.Client"
 
820
    _interface = u"se.bsnet.fukt.Mandos.Client"
1188
821
    
1189
822
    ## Signals
1190
823
    
1191
824
    # CheckerCompleted - signal
1192
 
    @dbus.service.signal(_interface, signature="nxs")
 
825
    @dbus.service.signal(_interface, signature=u"nxs")
1193
826
    def CheckerCompleted(self, exitcode, waitstatus, command):
1194
827
        "D-Bus signal"
1195
828
        pass
1196
829
    
1197
830
    # CheckerStarted - signal
1198
 
    @dbus.service.signal(_interface, signature="s")
 
831
    @dbus.service.signal(_interface, signature=u"s")
1199
832
    def CheckerStarted(self, command):
1200
833
        "D-Bus signal"
1201
834
        pass
1202
835
    
1203
836
    # PropertyChanged - signal
1204
 
    @dbus.service.signal(_interface, signature="sv")
 
837
    @dbus.service.signal(_interface, signature=u"sv")
1205
838
    def PropertyChanged(self, property, value):
1206
839
        "D-Bus signal"
1207
840
        pass
1209
842
    # GotSecret - signal
1210
843
    @dbus.service.signal(_interface)
1211
844
    def GotSecret(self):
1212
 
        """D-Bus signal
1213
 
        Is sent after a successful transfer of secret from the Mandos
1214
 
        server to mandos-client
1215
 
        """
 
845
        "D-Bus signal"
1216
846
        pass
1217
847
    
1218
848
    # Rejected - signal
1219
 
    @dbus.service.signal(_interface, signature="s")
 
849
    @dbus.service.signal(_interface, signature=u"s")
1220
850
    def Rejected(self, reason):
1221
851
        "D-Bus signal"
1222
852
        pass
1223
853
    
1224
854
    # NeedApproval - signal
1225
 
    @dbus.service.signal(_interface, signature="tb")
 
855
    @dbus.service.signal(_interface, signature=u"db")
1226
856
    def NeedApproval(self, timeout, default):
1227
857
        "D-Bus signal"
1228
 
        return self.need_approval()
 
858
        pass
1229
859
    
1230
860
    ## Methods
1231
 
    
 
861
 
1232
862
    # Approve - method
1233
 
    @dbus.service.method(_interface, in_signature="b")
 
863
    @dbus.service.method(_interface, in_signature=u"b")
1234
864
    def Approve(self, value):
1235
865
        self.approve(value)
1236
 
    
 
866
 
1237
867
    # CheckedOK - method
1238
868
    @dbus.service.method(_interface)
1239
869
    def CheckedOK(self):
1240
 
        self.checked_ok()
 
870
        return self.checked_ok()
1241
871
    
1242
872
    # Enable - method
1243
873
    @dbus.service.method(_interface)
1264
894
    
1265
895
    ## Properties
1266
896
    
1267
 
    # ApprovalPending - property
1268
 
    @dbus_service_property(_interface, signature="b", access="read")
1269
 
    def ApprovalPending_dbus_property(self):
1270
 
        return dbus.Boolean(bool(self.approvals_pending))
1271
 
    
1272
 
    # ApprovedByDefault - property
1273
 
    @dbus_service_property(_interface, signature="b",
1274
 
                           access="readwrite")
1275
 
    def ApprovedByDefault_dbus_property(self, value=None):
1276
 
        if value is None:       # get
1277
 
            return dbus.Boolean(self.approved_by_default)
1278
 
        self.approved_by_default = bool(value)
1279
 
    
1280
 
    # ApprovalDelay - property
1281
 
    @dbus_service_property(_interface, signature="t",
1282
 
                           access="readwrite")
1283
 
    def ApprovalDelay_dbus_property(self, value=None):
1284
 
        if value is None:       # get
1285
 
            return dbus.UInt64(self.approval_delay_milliseconds())
1286
 
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1287
 
    
1288
 
    # ApprovalDuration - property
1289
 
    @dbus_service_property(_interface, signature="t",
1290
 
                           access="readwrite")
1291
 
    def ApprovalDuration_dbus_property(self, value=None):
1292
 
        if value is None:       # get
1293
 
            return dbus.UInt64(timedelta_to_milliseconds(
1294
 
                    self.approval_duration))
1295
 
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1296
 
    
1297
 
    # Name - property
1298
 
    @dbus_service_property(_interface, signature="s", access="read")
1299
 
    def Name_dbus_property(self):
 
897
    # approved_pending - property
 
898
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
899
    def approved_pending_dbus_property(self):
 
900
        return dbus.Boolean(self.approved_pending())
 
901
    
 
902
    # approved_by_default - property
 
903
    @dbus_service_property(_interface, signature=u"b",
 
904
                           access=u"readwrite")
 
905
    def approved_by_default_dbus_property(self):
 
906
        return dbus.Boolean(self.approved_by_default)
 
907
    
 
908
    # approved_delay - property
 
909
    @dbus_service_property(_interface, signature=u"t",
 
910
                           access=u"readwrite")
 
911
    def approved_delay_dbus_property(self):
 
912
        return dbus.UInt64(self.approved_delay_milliseconds())
 
913
    
 
914
    # approved_duration - property
 
915
    @dbus_service_property(_interface, signature=u"t",
 
916
                           access=u"readwrite")
 
917
    def approved_duration_dbus_property(self):
 
918
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
919
                self.approved_duration))
 
920
    
 
921
    # name - property
 
922
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
923
    def name_dbus_property(self):
1300
924
        return dbus.String(self.name)
1301
925
    
1302
 
    # Fingerprint - property
1303
 
    @dbus_service_property(_interface, signature="s", access="read")
1304
 
    def Fingerprint_dbus_property(self):
 
926
    # fingerprint - property
 
927
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
928
    def fingerprint_dbus_property(self):
1305
929
        return dbus.String(self.fingerprint)
1306
930
    
1307
 
    # Host - property
1308
 
    @dbus_service_property(_interface, signature="s",
1309
 
                           access="readwrite")
1310
 
    def Host_dbus_property(self, value=None):
 
931
    # host - property
 
932
    @dbus_service_property(_interface, signature=u"s",
 
933
                           access=u"readwrite")
 
934
    def host_dbus_property(self, value=None):
1311
935
        if value is None:       # get
1312
936
            return dbus.String(self.host)
1313
 
        self.host = unicode(value)
1314
 
    
1315
 
    # Created - property
1316
 
    @dbus_service_property(_interface, signature="s", access="read")
1317
 
    def Created_dbus_property(self):
1318
 
        return datetime_to_dbus(self.created)
1319
 
    
1320
 
    # LastEnabled - property
1321
 
    @dbus_service_property(_interface, signature="s", access="read")
1322
 
    def LastEnabled_dbus_property(self):
1323
 
        return datetime_to_dbus(self.last_enabled)
1324
 
    
1325
 
    # Enabled - property
1326
 
    @dbus_service_property(_interface, signature="b",
1327
 
                           access="readwrite")
1328
 
    def Enabled_dbus_property(self, value=None):
 
937
        self.host = value
 
938
        # Emit D-Bus signal
 
939
        self.PropertyChanged(dbus.String(u"host"),
 
940
                             dbus.String(value, variant_level=1))
 
941
    
 
942
    # created - property
 
943
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
944
    def created_dbus_property(self):
 
945
        return dbus.String(self._datetime_to_dbus(self.created))
 
946
    
 
947
    # last_enabled - property
 
948
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
949
    def last_enabled_dbus_property(self):
 
950
        if self.last_enabled is None:
 
951
            return dbus.String(u"")
 
952
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
953
    
 
954
    # enabled - property
 
955
    @dbus_service_property(_interface, signature=u"b",
 
956
                           access=u"readwrite")
 
957
    def enabled_dbus_property(self, value=None):
1329
958
        if value is None:       # get
1330
959
            return dbus.Boolean(self.enabled)
1331
960
        if value:
1333
962
        else:
1334
963
            self.disable()
1335
964
    
1336
 
    # LastCheckedOK - property
1337
 
    @dbus_service_property(_interface, signature="s",
1338
 
                           access="readwrite")
1339
 
    def LastCheckedOK_dbus_property(self, value=None):
 
965
    # last_checked_ok - property
 
966
    @dbus_service_property(_interface, signature=u"s",
 
967
                           access=u"readwrite")
 
968
    def last_checked_ok_dbus_property(self, value=None):
1340
969
        if value is not None:
1341
970
            self.checked_ok()
1342
971
            return
1343
 
        return datetime_to_dbus(self.last_checked_ok)
1344
 
    
1345
 
    # LastCheckerStatus - property
1346
 
    @dbus_service_property(_interface, signature="n",
1347
 
                           access="read")
1348
 
    def LastCheckerStatus_dbus_property(self):
1349
 
        return dbus.Int16(self.last_checker_status)
1350
 
    
1351
 
    # Expires - property
1352
 
    @dbus_service_property(_interface, signature="s", access="read")
1353
 
    def Expires_dbus_property(self):
1354
 
        return datetime_to_dbus(self.expires)
1355
 
    
1356
 
    # LastApprovalRequest - property
1357
 
    @dbus_service_property(_interface, signature="s", access="read")
1358
 
    def LastApprovalRequest_dbus_property(self):
1359
 
        return datetime_to_dbus(self.last_approval_request)
1360
 
    
1361
 
    # Timeout - property
1362
 
    @dbus_service_property(_interface, signature="t",
1363
 
                           access="readwrite")
1364
 
    def Timeout_dbus_property(self, value=None):
 
972
        if self.last_checked_ok is None:
 
973
            return dbus.String(u"")
 
974
        return dbus.String(self._datetime_to_dbus(self
 
975
                                                  .last_checked_ok))
 
976
    
 
977
    # timeout - property
 
978
    @dbus_service_property(_interface, signature=u"t",
 
979
                           access=u"readwrite")
 
980
    def timeout_dbus_property(self, value=None):
1365
981
        if value is None:       # get
1366
982
            return dbus.UInt64(self.timeout_milliseconds())
1367
983
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
984
        # Emit D-Bus signal
 
985
        self.PropertyChanged(dbus.String(u"timeout"),
 
986
                             dbus.UInt64(value, variant_level=1))
 
987
        if getattr(self, u"disable_initiator_tag", None) is None:
 
988
            return
1368
989
        # Reschedule timeout
1369
 
        if self.enabled:
1370
 
            now = datetime.datetime.utcnow()
1371
 
            time_to_die = timedelta_to_milliseconds(
1372
 
                (self.last_checked_ok + self.timeout) - now)
1373
 
            if time_to_die <= 0:
1374
 
                # The timeout has passed
1375
 
                self.disable()
1376
 
            else:
1377
 
                self.expires = (now +
1378
 
                                datetime.timedelta(milliseconds =
1379
 
                                                   time_to_die))
1380
 
                if (getattr(self, "disable_initiator_tag", None)
1381
 
                    is None):
1382
 
                    return
1383
 
                gobject.source_remove(self.disable_initiator_tag)
1384
 
                self.disable_initiator_tag = (gobject.timeout_add
1385
 
                                              (time_to_die,
1386
 
                                               self.disable))
1387
 
    
1388
 
    # ExtendedTimeout - property
1389
 
    @dbus_service_property(_interface, signature="t",
1390
 
                           access="readwrite")
1391
 
    def ExtendedTimeout_dbus_property(self, value=None):
1392
 
        if value is None:       # get
1393
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1394
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1395
 
    
1396
 
    # Interval - property
1397
 
    @dbus_service_property(_interface, signature="t",
1398
 
                           access="readwrite")
1399
 
    def Interval_dbus_property(self, value=None):
 
990
        gobject.source_remove(self.disable_initiator_tag)
 
991
        self.disable_initiator_tag = None
 
992
        time_to_die = (self.
 
993
                       _timedelta_to_milliseconds((self
 
994
                                                   .last_checked_ok
 
995
                                                   + self.timeout)
 
996
                                                  - datetime.datetime
 
997
                                                  .utcnow()))
 
998
        if time_to_die <= 0:
 
999
            # The timeout has passed
 
1000
            self.disable()
 
1001
        else:
 
1002
            self.disable_initiator_tag = (gobject.timeout_add
 
1003
                                          (time_to_die, self.disable))
 
1004
    
 
1005
    # interval - property
 
1006
    @dbus_service_property(_interface, signature=u"t",
 
1007
                           access=u"readwrite")
 
1008
    def interval_dbus_property(self, value=None):
1400
1009
        if value is None:       # get
1401
1010
            return dbus.UInt64(self.interval_milliseconds())
1402
1011
        self.interval = datetime.timedelta(0, 0, 0, value)
1403
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1012
        # Emit D-Bus signal
 
1013
        self.PropertyChanged(dbus.String(u"interval"),
 
1014
                             dbus.UInt64(value, variant_level=1))
 
1015
        if getattr(self, u"checker_initiator_tag", None) is None:
1404
1016
            return
1405
 
        if self.enabled:
1406
 
            # Reschedule checker run
1407
 
            gobject.source_remove(self.checker_initiator_tag)
1408
 
            self.checker_initiator_tag = (gobject.timeout_add
1409
 
                                          (value, self.start_checker))
1410
 
            self.start_checker()    # Start one now, too
1411
 
    
1412
 
    # Checker - property
1413
 
    @dbus_service_property(_interface, signature="s",
1414
 
                           access="readwrite")
1415
 
    def Checker_dbus_property(self, value=None):
 
1017
        # Reschedule checker run
 
1018
        gobject.source_remove(self.checker_initiator_tag)
 
1019
        self.checker_initiator_tag = (gobject.timeout_add
 
1020
                                      (value, self.start_checker))
 
1021
        self.start_checker()    # Start one now, too
 
1022
 
 
1023
    # checker - property
 
1024
    @dbus_service_property(_interface, signature=u"s",
 
1025
                           access=u"readwrite")
 
1026
    def checker_dbus_property(self, value=None):
1416
1027
        if value is None:       # get
1417
1028
            return dbus.String(self.checker_command)
1418
 
        self.checker_command = unicode(value)
 
1029
        self.checker_command = value
 
1030
        # Emit D-Bus signal
 
1031
        self.PropertyChanged(dbus.String(u"checker"),
 
1032
                             dbus.String(self.checker_command,
 
1033
                                         variant_level=1))
1419
1034
    
1420
 
    # CheckerRunning - property
1421
 
    @dbus_service_property(_interface, signature="b",
1422
 
                           access="readwrite")
1423
 
    def CheckerRunning_dbus_property(self, value=None):
 
1035
    # checker_running - property
 
1036
    @dbus_service_property(_interface, signature=u"b",
 
1037
                           access=u"readwrite")
 
1038
    def checker_running_dbus_property(self, value=None):
1424
1039
        if value is None:       # get
1425
1040
            return dbus.Boolean(self.checker is not None)
1426
1041
        if value:
1428
1043
        else:
1429
1044
            self.stop_checker()
1430
1045
    
1431
 
    # ObjectPath - property
1432
 
    @dbus_service_property(_interface, signature="o", access="read")
1433
 
    def ObjectPath_dbus_property(self):
 
1046
    # object_path - property
 
1047
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1048
    def object_path_dbus_property(self):
1434
1049
        return self.dbus_object_path # is already a dbus.ObjectPath
1435
1050
    
1436
 
    # Secret = property
1437
 
    @dbus_service_property(_interface, signature="ay",
1438
 
                           access="write", byte_arrays=True)
1439
 
    def Secret_dbus_property(self, value):
 
1051
    # secret = property
 
1052
    @dbus_service_property(_interface, signature=u"ay",
 
1053
                           access=u"write", byte_arrays=True)
 
1054
    def secret_dbus_property(self, value):
1440
1055
        self.secret = str(value)
1441
1056
    
1442
1057
    del _interface
1448
1063
        self._pipe.send(('init', fpr, address))
1449
1064
        if not self._pipe.recv():
1450
1065
            raise KeyError()
1451
 
    
 
1066
 
1452
1067
    def __getattribute__(self, name):
1453
 
        if name == '_pipe':
 
1068
        if(name == '_pipe'):
1454
1069
            return super(ProxyClient, self).__getattribute__(name)
1455
1070
        self._pipe.send(('getattr', name))
1456
1071
        data = self._pipe.recv()
1461
1076
                self._pipe.send(('funcall', name, args, kwargs))
1462
1077
                return self._pipe.recv()[1]
1463
1078
            return func
1464
 
    
 
1079
 
1465
1080
    def __setattr__(self, name, value):
1466
 
        if name == '_pipe':
 
1081
        if(name == '_pipe'):
1467
1082
            return super(ProxyClient, self).__setattr__(name, value)
1468
1083
        self._pipe.send(('setattr', name, value))
1469
1084
 
1470
1085
 
1471
 
class ClientDBusTransitional(ClientDBus):
1472
 
    __metaclass__ = AlternateDBusNamesMetaclass
1473
 
 
1474
 
 
1475
1086
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
1087
    """A class to handle client connections.
1477
1088
    
1480
1091
    
1481
1092
    def handle(self):
1482
1093
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1483
 
            logger.info("TCP connection from: %s",
 
1094
            logger.info(u"TCP connection from: %s",
1484
1095
                        unicode(self.client_address))
1485
 
            logger.debug("Pipe FD: %d",
 
1096
            logger.debug(u"Pipe FD: %d",
1486
1097
                         self.server.child_pipe.fileno())
1487
 
            
 
1098
 
1488
1099
            session = (gnutls.connection
1489
1100
                       .ClientSession(self.request,
1490
1101
                                      gnutls.connection
1491
1102
                                      .X509Credentials()))
1492
 
            
 
1103
 
1493
1104
            # Note: gnutls.connection.X509Credentials is really a
1494
1105
            # generic GnuTLS certificate credentials object so long as
1495
1106
            # no X.509 keys are added to it.  Therefore, we can use it
1496
1107
            # here despite using OpenPGP certificates.
1497
 
            
1498
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
 
            #                      "+AES-256-CBC", "+SHA1",
1500
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1501
 
            #                      "+DHE-DSS"))
 
1108
 
 
1109
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1110
            #                      u"+AES-256-CBC", u"+SHA1",
 
1111
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1112
            #                      u"+DHE-DSS"))
1502
1113
            # Use a fallback default, since this MUST be set.
1503
1114
            priority = self.server.gnutls_priority
1504
1115
            if priority is None:
1505
 
                priority = "NORMAL"
 
1116
                priority = u"NORMAL"
1506
1117
            (gnutls.library.functions
1507
1118
             .gnutls_priority_set_direct(session._c_object,
1508
1119
                                         priority, None))
1509
 
            
 
1120
 
1510
1121
            # Start communication using the Mandos protocol
1511
1122
            # Get protocol number
1512
1123
            line = self.request.makefile().readline()
1513
 
            logger.debug("Protocol version: %r", line)
 
1124
            logger.debug(u"Protocol version: %r", line)
1514
1125
            try:
1515
1126
                if int(line.strip().split()[0]) > 1:
1516
1127
                    raise RuntimeError
1517
 
            except (ValueError, IndexError, RuntimeError) as error:
1518
 
                logger.error("Unknown protocol version: %s", error)
 
1128
            except (ValueError, IndexError, RuntimeError), error:
 
1129
                logger.error(u"Unknown protocol version: %s", error)
1519
1130
                return
1520
 
            
 
1131
 
1521
1132
            # Start GnuTLS connection
1522
1133
            try:
1523
1134
                session.handshake()
1524
 
            except gnutls.errors.GNUTLSError as error:
1525
 
                logger.warning("Handshake failed: %s", error)
 
1135
            except gnutls.errors.GNUTLSError, error:
 
1136
                logger.warning(u"Handshake failed: %s", error)
1526
1137
                # Do not run session.bye() here: the session is not
1527
1138
                # established.  Just abandon the request.
1528
1139
                return
1529
 
            logger.debug("Handshake succeeded")
1530
 
            
 
1140
            logger.debug(u"Handshake succeeded")
 
1141
 
1531
1142
            approval_required = False
1532
1143
            try:
1533
1144
                try:
1534
1145
                    fpr = self.fingerprint(self.peer_certificate
1535
1146
                                           (session))
1536
 
                except (TypeError,
1537
 
                        gnutls.errors.GNUTLSError) as error:
1538
 
                    logger.warning("Bad certificate: %s", error)
 
1147
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1148
                    logger.warning(u"Bad certificate: %s", error)
1539
1149
                    return
1540
 
                logger.debug("Fingerprint: %s", fpr)
1541
 
                
 
1150
                logger.debug(u"Fingerprint: %s", fpr)
 
1151
 
1542
1152
                try:
1543
1153
                    client = ProxyClient(child_pipe, fpr,
1544
1154
                                         self.client_address)
1545
1155
                except KeyError:
1546
1156
                    return
1547
1157
                
1548
 
                if client.approval_delay:
1549
 
                    delay = client.approval_delay
 
1158
                if client.approved_delay:
 
1159
                    delay = client.approved_delay
1550
1160
                    client.approvals_pending += 1
1551
1161
                    approval_required = True
1552
1162
                
1553
1163
                while True:
1554
1164
                    if not client.enabled:
1555
 
                        logger.info("Client %s is disabled",
 
1165
                        logger.warning(u"Client %s is disabled",
1556
1166
                                       client.name)
1557
1167
                        if self.server.use_dbus:
1558
1168
                            # Emit D-Bus signal
1559
 
                            client.Rejected("Disabled")
 
1169
                            client.Rejected("Disabled")                    
1560
1170
                        return
1561
1171
                    
1562
 
                    if client.approved or not client.approval_delay:
 
1172
                    if client._approved or not client.approved_delay:
1563
1173
                        #We are approved or approval is disabled
1564
1174
                        break
1565
 
                    elif client.approved is None:
1566
 
                        logger.info("Client %s needs approval",
 
1175
                    elif client._approved is None:
 
1176
                        logger.info(u"Client %s need approval",
1567
1177
                                    client.name)
1568
1178
                        if self.server.use_dbus:
1569
1179
                            # Emit D-Bus signal
1570
1180
                            client.NeedApproval(
1571
 
                                client.approval_delay_milliseconds(),
 
1181
                                client.approved_delay_milliseconds(),
1572
1182
                                client.approved_by_default)
1573
1183
                    else:
1574
 
                        logger.warning("Client %s was not approved",
 
1184
                        logger.warning(u"Client %s was not approved",
1575
1185
                                       client.name)
1576
1186
                        if self.server.use_dbus:
1577
1187
                            # Emit D-Bus signal
1578
 
                            client.Rejected("Denied")
 
1188
                            client.Rejected("Disapproved")
1579
1189
                        return
1580
1190
                    
1581
1191
                    #wait until timeout or approved
 
1192
                    #x = float(client._timedelta_to_milliseconds(delay))
1582
1193
                    time = datetime.datetime.now()
1583
1194
                    client.changedstate.acquire()
1584
 
                    (client.changedstate.wait
1585
 
                     (float(client.timedelta_to_milliseconds(delay)
1586
 
                            / 1000)))
 
1195
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1587
1196
                    client.changedstate.release()
1588
1197
                    time2 = datetime.datetime.now()
1589
1198
                    if (time2 - time) >= delay:
1593
1202
                                           client.name)
1594
1203
                            if self.server.use_dbus:
1595
1204
                                # Emit D-Bus signal
1596
 
                                client.Rejected("Approval timed out")
 
1205
                                client.Rejected("Time out")
1597
1206
                            return
1598
1207
                        else:
1599
1208
                            break
1602
1211
                
1603
1212
                sent_size = 0
1604
1213
                while sent_size < len(client.secret):
1605
 
                    try:
1606
 
                        sent = session.send(client.secret[sent_size:])
1607
 
                    except gnutls.errors.GNUTLSError as error:
1608
 
                        logger.warning("gnutls send failed")
1609
 
                        return
1610
 
                    logger.debug("Sent: %d, remaining: %d",
 
1214
                    # XXX handle session exception
 
1215
                    sent = session.send(client.secret[sent_size:])
 
1216
                    logger.debug(u"Sent: %d, remaining: %d",
1611
1217
                                 sent, len(client.secret)
1612
1218
                                 - (sent_size + sent))
1613
1219
                    sent_size += sent
1614
 
                
1615
 
                logger.info("Sending secret to %s", client.name)
1616
 
                # bump the timeout using extended_timeout
1617
 
                client.bump_timeout(client.extended_timeout)
 
1220
 
 
1221
                logger.info(u"Sending secret to %s", client.name)
 
1222
                # bump the timeout as if seen
 
1223
                client.checked_ok()
1618
1224
                if self.server.use_dbus:
1619
1225
                    # Emit D-Bus signal
1620
1226
                    client.GotSecret()
1622
1228
            finally:
1623
1229
                if approval_required:
1624
1230
                    client.approvals_pending -= 1
1625
 
                try:
1626
 
                    session.bye()
1627
 
                except gnutls.errors.GNUTLSError as error:
1628
 
                    logger.warning("GnuTLS bye failed")
 
1231
                session.bye()
1629
1232
    
1630
1233
    @staticmethod
1631
1234
    def peer_certificate(session):
1641
1244
                     .gnutls_certificate_get_peers
1642
1245
                     (session._c_object, ctypes.byref(list_size)))
1643
1246
        if not bool(cert_list) and list_size.value != 0:
1644
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1645
 
                                            " certificate")
 
1247
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1248
                                            u" certificate")
1646
1249
        if list_size.value == 0:
1647
1250
            return None
1648
1251
        cert = cert_list[0]
1674
1277
        if crtverify.value != 0:
1675
1278
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1676
1279
            raise (gnutls.errors.CertificateSecurityError
1677
 
                   ("Verify failed"))
 
1280
                   (u"Verify failed"))
1678
1281
        # New buffer for the fingerprint
1679
1282
        buf = ctypes.create_string_buffer(20)
1680
1283
        buf_len = ctypes.c_size_t()
1687
1290
        # Convert the buffer to a Python bytestring
1688
1291
        fpr = ctypes.string_at(buf, buf_len.value)
1689
1292
        # Convert the bytestring to hexadecimal notation
1690
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1293
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1691
1294
        return hex_fpr
1692
1295
 
1693
1296
 
1696
1299
    def sub_process_main(self, request, address):
1697
1300
        try:
1698
1301
            self.finish_request(request, address)
1699
 
        except Exception:
 
1302
        except:
1700
1303
            self.handle_error(request, address)
1701
1304
        self.close_request(request)
1702
 
    
 
1305
            
1703
1306
    def process_request(self, request, address):
1704
1307
        """Start a new process to process the request."""
1705
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1706
 
                                       args = (request,
1707
 
                                               address))
1708
 
        proc.start()
1709
 
        return proc
1710
 
 
 
1308
        multiprocessing.Process(target = self.sub_process_main,
 
1309
                                args = (request, address)).start()
1711
1310
 
1712
1311
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
1312
    """ adds a pipe to the MixIn """
1717
1316
        This function creates a new pipe in self.pipe
1718
1317
        """
1719
1318
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
 
        
1721
 
        proc = MultiprocessingMixIn.process_request(self, request,
1722
 
                                                    client_address)
 
1319
 
 
1320
        super(MultiprocessingMixInWithPipe,
 
1321
              self).process_request(request, client_address)
1723
1322
        self.child_pipe.close()
1724
 
        self.add_pipe(parent_pipe, proc)
1725
 
    
1726
 
    def add_pipe(self, parent_pipe, proc):
 
1323
        self.add_pipe(parent_pipe)
 
1324
        
 
1325
    def add_pipe(self, parent_pipe):
1727
1326
        """Dummy function; override as necessary"""
1728
 
        raise NotImplementedError
1729
 
 
 
1327
        pass
1730
1328
 
1731
1329
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1732
1330
                     socketserver.TCPServer, object):
1750
1348
        bind to an address or port if they were not specified."""
1751
1349
        if self.interface is not None:
1752
1350
            if SO_BINDTODEVICE is None:
1753
 
                logger.error("SO_BINDTODEVICE does not exist;"
1754
 
                             " cannot bind to interface %s",
 
1351
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1352
                             u" cannot bind to interface %s",
1755
1353
                             self.interface)
1756
1354
            else:
1757
1355
                try:
1758
1356
                    self.socket.setsockopt(socket.SOL_SOCKET,
1759
1357
                                           SO_BINDTODEVICE,
1760
1358
                                           str(self.interface
1761
 
                                               + '\0'))
1762
 
                except socket.error as error:
 
1359
                                               + u'\0'))
 
1360
                except socket.error, error:
1763
1361
                    if error[0] == errno.EPERM:
1764
 
                        logger.error("No permission to"
1765
 
                                     " bind to interface %s",
 
1362
                        logger.error(u"No permission to"
 
1363
                                     u" bind to interface %s",
1766
1364
                                     self.interface)
1767
1365
                    elif error[0] == errno.ENOPROTOOPT:
1768
 
                        logger.error("SO_BINDTODEVICE not available;"
1769
 
                                     " cannot bind to interface %s",
 
1366
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1367
                                     u" cannot bind to interface %s",
1770
1368
                                     self.interface)
1771
1369
                    else:
1772
1370
                        raise
1774
1372
        if self.server_address[0] or self.server_address[1]:
1775
1373
            if not self.server_address[0]:
1776
1374
                if self.address_family == socket.AF_INET6:
1777
 
                    any_address = "::" # in6addr_any
 
1375
                    any_address = u"::" # in6addr_any
1778
1376
                else:
1779
1377
                    any_address = socket.INADDR_ANY
1780
1378
                self.server_address = (any_address,
1807
1405
        self.enabled = False
1808
1406
        self.clients = clients
1809
1407
        if self.clients is None:
1810
 
            self.clients = {}
 
1408
            self.clients = set()
1811
1409
        self.use_dbus = use_dbus
1812
1410
        self.gnutls_priority = gnutls_priority
1813
1411
        IPv6_TCPServer.__init__(self, server_address,
1817
1415
    def server_activate(self):
1818
1416
        if self.enabled:
1819
1417
            return socketserver.TCPServer.server_activate(self)
1820
 
    
1821
1418
    def enable(self):
1822
1419
        self.enabled = True
1823
 
    
1824
 
    def add_pipe(self, parent_pipe, proc):
 
1420
    def add_pipe(self, parent_pipe):
1825
1421
        # Call "handle_ipc" for both data and EOF events
1826
1422
        gobject.io_add_watch(parent_pipe.fileno(),
1827
1423
                             gobject.IO_IN | gobject.IO_HUP,
1828
1424
                             functools.partial(self.handle_ipc,
1829
 
                                               parent_pipe =
1830
 
                                               parent_pipe,
1831
 
                                               proc = proc))
1832
 
    
 
1425
                                               parent_pipe = parent_pipe))
 
1426
        
1833
1427
    def handle_ipc(self, source, condition, parent_pipe=None,
1834
 
                   proc = None, client_object=None):
 
1428
                   client_object=None):
1835
1429
        condition_names = {
1836
 
            gobject.IO_IN: "IN",   # There is data to read.
1837
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1430
            gobject.IO_IN: u"IN",   # There is data to read.
 
1431
            gobject.IO_OUT: u"OUT", # Data can be written (without
1838
1432
                                    # blocking).
1839
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1840
 
            gobject.IO_ERR: "ERR", # Error condition.
1841
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1433
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1434
            gobject.IO_ERR: u"ERR", # Error condition.
 
1435
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1842
1436
                                    # broken, usually for pipes and
1843
1437
                                    # sockets).
1844
1438
            }
1846
1440
                                       for cond, name in
1847
1441
                                       condition_names.iteritems()
1848
1442
                                       if cond & condition)
1849
 
        # error, or the other end of multiprocessing.Pipe has closed
1850
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1851
 
            # Wait for other process to exit
1852
 
            proc.join()
 
1443
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1444
                     conditions_string)
 
1445
 
 
1446
        # error or the other end of multiprocessing.Pipe has closed
 
1447
        if condition & gobject.IO_HUP or condition & gobject.IO_ERR:
1853
1448
            return False
1854
1449
        
1855
1450
        # Read a request from the child
1856
1451
        request = parent_pipe.recv()
 
1452
        logger.debug(u"IPC request: %s", repr(request))
1857
1453
        command = request[0]
1858
1454
        
1859
1455
        if command == 'init':
1860
1456
            fpr = request[1]
1861
1457
            address = request[2]
1862
1458
            
1863
 
            for c in self.clients.itervalues():
 
1459
            for c in self.clients:
1864
1460
                if c.fingerprint == fpr:
1865
1461
                    client = c
1866
1462
                    break
1867
1463
            else:
1868
 
                logger.info("Client not found for fingerprint: %s, ad"
1869
 
                            "dress: %s", fpr, address)
 
1464
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1465
                               u"dress: %s", fpr, address)
1870
1466
                if self.use_dbus:
1871
1467
                    # Emit D-Bus signal
1872
 
                    mandos_dbus_service.ClientNotFound(fpr,
1873
 
                                                       address[0])
 
1468
                    mandos_dbus_service.ClientNotFound(fpr, address)
1874
1469
                parent_pipe.send(False)
1875
1470
                return False
1876
1471
            
1877
1472
            gobject.io_add_watch(parent_pipe.fileno(),
1878
1473
                                 gobject.IO_IN | gobject.IO_HUP,
1879
1474
                                 functools.partial(self.handle_ipc,
1880
 
                                                   parent_pipe =
1881
 
                                                   parent_pipe,
1882
 
                                                   proc = proc,
1883
 
                                                   client_object =
1884
 
                                                   client))
 
1475
                                                   parent_pipe = parent_pipe,
 
1476
                                                   client_object = client))
1885
1477
            parent_pipe.send(True)
1886
 
            # remove the old hook in favor of the new above hook on
1887
 
            # same fileno
 
1478
            # remove the old hook in favor of the new above hook on same fileno
1888
1479
            return False
1889
1480
        if command == 'funcall':
1890
1481
            funcname = request[1]
1891
1482
            args = request[2]
1892
1483
            kwargs = request[3]
1893
1484
            
1894
 
            parent_pipe.send(('data', getattr(client_object,
1895
 
                                              funcname)(*args,
1896
 
                                                         **kwargs)))
1897
 
        
 
1485
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1486
 
1898
1487
        if command == 'getattr':
1899
1488
            attrname = request[1]
1900
1489
            if callable(client_object.__getattribute__(attrname)):
1901
1490
                parent_pipe.send(('function',))
1902
1491
            else:
1903
 
                parent_pipe.send(('data', client_object
1904
 
                                  .__getattribute__(attrname)))
1905
 
        
 
1492
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1493
 
1906
1494
        if command == 'setattr':
1907
1495
            attrname = request[1]
1908
1496
            value = request[2]
1909
1497
            setattr(client_object, attrname, value)
1910
 
        
 
1498
            
1911
1499
        return True
1912
1500
 
1913
1501
 
1914
1502
def string_to_delta(interval):
1915
1503
    """Parse a string and return a datetime.timedelta
1916
1504
    
1917
 
    >>> string_to_delta('7d')
 
1505
    >>> string_to_delta(u'7d')
1918
1506
    datetime.timedelta(7)
1919
 
    >>> string_to_delta('60s')
 
1507
    >>> string_to_delta(u'60s')
1920
1508
    datetime.timedelta(0, 60)
1921
 
    >>> string_to_delta('60m')
 
1509
    >>> string_to_delta(u'60m')
1922
1510
    datetime.timedelta(0, 3600)
1923
 
    >>> string_to_delta('24h')
 
1511
    >>> string_to_delta(u'24h')
1924
1512
    datetime.timedelta(1)
1925
 
    >>> string_to_delta('1w')
 
1513
    >>> string_to_delta(u'1w')
1926
1514
    datetime.timedelta(7)
1927
 
    >>> string_to_delta('5m 30s')
 
1515
    >>> string_to_delta(u'5m 30s')
1928
1516
    datetime.timedelta(0, 330)
1929
1517
    """
1930
1518
    timevalue = datetime.timedelta(0)
1932
1520
        try:
1933
1521
            suffix = unicode(s[-1])
1934
1522
            value = int(s[:-1])
1935
 
            if suffix == "d":
 
1523
            if suffix == u"d":
1936
1524
                delta = datetime.timedelta(value)
1937
 
            elif suffix == "s":
 
1525
            elif suffix == u"s":
1938
1526
                delta = datetime.timedelta(0, value)
1939
 
            elif suffix == "m":
 
1527
            elif suffix == u"m":
1940
1528
                delta = datetime.timedelta(0, 0, 0, 0, value)
1941
 
            elif suffix == "h":
 
1529
            elif suffix == u"h":
1942
1530
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1943
 
            elif suffix == "w":
 
1531
            elif suffix == u"w":
1944
1532
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1945
1533
            else:
1946
 
                raise ValueError("Unknown suffix %r" % suffix)
1947
 
        except (ValueError, IndexError) as e:
1948
 
            raise ValueError(*(e.args))
 
1534
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1535
        except (ValueError, IndexError), e:
 
1536
            raise ValueError(e.message)
1949
1537
        timevalue += delta
1950
1538
    return timevalue
1951
1539
 
1952
1540
 
 
1541
def if_nametoindex(interface):
 
1542
    """Call the C function if_nametoindex(), or equivalent
 
1543
    
 
1544
    Note: This function cannot accept a unicode string."""
 
1545
    global if_nametoindex
 
1546
    try:
 
1547
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1548
                          (ctypes.util.find_library(u"c"))
 
1549
                          .if_nametoindex)
 
1550
    except (OSError, AttributeError):
 
1551
        logger.warning(u"Doing if_nametoindex the hard way")
 
1552
        def if_nametoindex(interface):
 
1553
            "Get an interface index the hard way, i.e. using fcntl()"
 
1554
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1555
            with contextlib.closing(socket.socket()) as s:
 
1556
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1557
                                    struct.pack(str(u"16s16x"),
 
1558
                                                interface))
 
1559
            interface_index = struct.unpack(str(u"I"),
 
1560
                                            ifreq[16:20])[0]
 
1561
            return interface_index
 
1562
    return if_nametoindex(interface)
 
1563
 
 
1564
 
1953
1565
def daemon(nochdir = False, noclose = False):
1954
1566
    """See daemon(3).  Standard BSD Unix function.
1955
1567
    
1958
1570
        sys.exit()
1959
1571
    os.setsid()
1960
1572
    if not nochdir:
1961
 
        os.chdir("/")
 
1573
        os.chdir(u"/")
1962
1574
    if os.fork():
1963
1575
        sys.exit()
1964
1576
    if not noclose:
1966
1578
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1967
1579
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1968
1580
            raise OSError(errno.ENODEV,
1969
 
                          "%s not a character device"
 
1581
                          u"%s not a character device"
1970
1582
                          % os.path.devnull)
1971
1583
        os.dup2(null, sys.stdin.fileno())
1972
1584
        os.dup2(null, sys.stdout.fileno())
1980
1592
    ##################################################################
1981
1593
    # Parsing of options, both command line and config file
1982
1594
    
1983
 
    parser = argparse.ArgumentParser()
1984
 
    parser.add_argument("-v", "--version", action="version",
1985
 
                        version = "%%(prog)s %s" % version,
1986
 
                        help="show version number and exit")
1987
 
    parser.add_argument("-i", "--interface", metavar="IF",
1988
 
                        help="Bind to interface IF")
1989
 
    parser.add_argument("-a", "--address",
1990
 
                        help="Address to listen for requests on")
1991
 
    parser.add_argument("-p", "--port", type=int,
1992
 
                        help="Port number to receive requests on")
1993
 
    parser.add_argument("--check", action="store_true",
1994
 
                        help="Run self-test")
1995
 
    parser.add_argument("--debug", action="store_true",
1996
 
                        help="Debug mode; run in foreground and log"
1997
 
                        " to terminal")
1998
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1999
 
                        help="Debug level for stdout output")
2000
 
    parser.add_argument("--priority", help="GnuTLS"
2001
 
                        " priority string (see GnuTLS documentation)")
2002
 
    parser.add_argument("--servicename",
2003
 
                        metavar="NAME", help="Zeroconf service name")
2004
 
    parser.add_argument("--configdir",
2005
 
                        default="/etc/mandos", metavar="DIR",
2006
 
                        help="Directory to search for configuration"
2007
 
                        " files")
2008
 
    parser.add_argument("--no-dbus", action="store_false",
2009
 
                        dest="use_dbus", help="Do not provide D-Bus"
2010
 
                        " system bus interface")
2011
 
    parser.add_argument("--no-ipv6", action="store_false",
2012
 
                        dest="use_ipv6", help="Do not use IPv6")
2013
 
    parser.add_argument("--no-restore", action="store_false",
2014
 
                        dest="restore", help="Do not restore stored"
2015
 
                        " state")
2016
 
    parser.add_argument("--statedir", metavar="DIR",
2017
 
                        help="Directory to save/restore state in")
2018
 
    
2019
 
    options = parser.parse_args()
 
1595
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1596
    parser.add_option("-i", u"--interface", type=u"string",
 
1597
                      metavar="IF", help=u"Bind to interface IF")
 
1598
    parser.add_option("-a", u"--address", type=u"string",
 
1599
                      help=u"Address to listen for requests on")
 
1600
    parser.add_option("-p", u"--port", type=u"int",
 
1601
                      help=u"Port number to receive requests on")
 
1602
    parser.add_option("--check", action=u"store_true",
 
1603
                      help=u"Run self-test")
 
1604
    parser.add_option("--debug", action=u"store_true",
 
1605
                      help=u"Debug mode; run in foreground and log to"
 
1606
                      u" terminal")
 
1607
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1608
                      u" priority string (see GnuTLS documentation)")
 
1609
    parser.add_option("--servicename", type=u"string",
 
1610
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1611
    parser.add_option("--configdir", type=u"string",
 
1612
                      default=u"/etc/mandos", metavar=u"DIR",
 
1613
                      help=u"Directory to search for configuration"
 
1614
                      u" files")
 
1615
    parser.add_option("--no-dbus", action=u"store_false",
 
1616
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1617
                      u" system bus interface")
 
1618
    parser.add_option("--no-ipv6", action=u"store_false",
 
1619
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1620
    options = parser.parse_args()[0]
2020
1621
    
2021
1622
    if options.check:
2022
1623
        import doctest
2024
1625
        sys.exit()
2025
1626
    
2026
1627
    # Default values for config file for server-global settings
2027
 
    server_defaults = { "interface": "",
2028
 
                        "address": "",
2029
 
                        "port": "",
2030
 
                        "debug": "False",
2031
 
                        "priority":
2032
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2033
 
                        "servicename": "Mandos",
2034
 
                        "use_dbus": "True",
2035
 
                        "use_ipv6": "True",
2036
 
                        "debuglevel": "",
2037
 
                        "restore": "True",
2038
 
                        "statedir": "/var/lib/mandos"
 
1628
    server_defaults = { u"interface": u"",
 
1629
                        u"address": u"",
 
1630
                        u"port": u"",
 
1631
                        u"debug": u"False",
 
1632
                        u"priority":
 
1633
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1634
                        u"servicename": u"Mandos",
 
1635
                        u"use_dbus": u"True",
 
1636
                        u"use_ipv6": u"True",
2039
1637
                        }
2040
1638
    
2041
1639
    # Parse config file for server-global settings
2042
1640
    server_config = configparser.SafeConfigParser(server_defaults)
2043
1641
    del server_defaults
2044
1642
    server_config.read(os.path.join(options.configdir,
2045
 
                                    "mandos.conf"))
 
1643
                                    u"mandos.conf"))
2046
1644
    # Convert the SafeConfigParser object to a dict
2047
1645
    server_settings = server_config.defaults()
2048
1646
    # Use the appropriate methods on the non-string config options
2049
 
    for option in ("debug", "use_dbus", "use_ipv6"):
2050
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1647
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1648
        server_settings[option] = server_config.getboolean(u"DEFAULT",
2051
1649
                                                           option)
2052
1650
    if server_settings["port"]:
2053
 
        server_settings["port"] = server_config.getint("DEFAULT",
2054
 
                                                       "port")
 
1651
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1652
                                                       u"port")
2055
1653
    del server_config
2056
1654
    
2057
1655
    # Override the settings from the config file with command line
2058
1656
    # options, if set.
2059
 
    for option in ("interface", "address", "port", "debug",
2060
 
                   "priority", "servicename", "configdir",
2061
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2062
 
                   "statedir"):
 
1657
    for option in (u"interface", u"address", u"port", u"debug",
 
1658
                   u"priority", u"servicename", u"configdir",
 
1659
                   u"use_dbus", u"use_ipv6"):
2063
1660
        value = getattr(options, option)
2064
1661
        if value is not None:
2065
1662
            server_settings[option] = value
2073
1670
    ##################################################################
2074
1671
    
2075
1672
    # For convenience
2076
 
    debug = server_settings["debug"]
2077
 
    debuglevel = server_settings["debuglevel"]
2078
 
    use_dbus = server_settings["use_dbus"]
2079
 
    use_ipv6 = server_settings["use_ipv6"]
2080
 
    stored_state_path = os.path.join(server_settings["statedir"],
2081
 
                                     stored_state_file)
2082
 
    
2083
 
    if debug:
2084
 
        initlogger(debug, logging.DEBUG)
2085
 
    else:
2086
 
        if not debuglevel:
2087
 
            initlogger(debug)
2088
 
        else:
2089
 
            level = getattr(logging, debuglevel.upper())
2090
 
            initlogger(debug, level)
2091
 
    
2092
 
    if server_settings["servicename"] != "Mandos":
 
1673
    debug = server_settings[u"debug"]
 
1674
    use_dbus = server_settings[u"use_dbus"]
 
1675
    use_ipv6 = server_settings[u"use_ipv6"]
 
1676
    
 
1677
    if not debug:
 
1678
        syslogger.setLevel(logging.WARNING)
 
1679
        console.setLevel(logging.WARNING)
 
1680
    
 
1681
    if server_settings[u"servicename"] != u"Mandos":
2093
1682
        syslogger.setFormatter(logging.Formatter
2094
 
                               ('Mandos (%s) [%%(process)d]:'
2095
 
                                ' %%(levelname)s: %%(message)s'
2096
 
                                % server_settings["servicename"]))
 
1683
                               (u'Mandos (%s) [%%(process)d]:'
 
1684
                                u' %%(levelname)s: %%(message)s'
 
1685
                                % server_settings[u"servicename"]))
2097
1686
    
2098
1687
    # Parse config file with clients
2099
 
    client_config = configparser.SafeConfigParser(Client
2100
 
                                                  .client_defaults)
2101
 
    client_config.read(os.path.join(server_settings["configdir"],
2102
 
                                    "clients.conf"))
 
1688
    client_defaults = { u"timeout": u"1h",
 
1689
                        u"interval": u"5m",
 
1690
                        u"checker": u"fping -q -- %%(host)s",
 
1691
                        u"host": u"",
 
1692
                        u"approved_delay": u"5m",
 
1693
                        u"approved_duration": u"1s",
 
1694
                        }
 
1695
    client_config = configparser.SafeConfigParser(client_defaults)
 
1696
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1697
                                    u"clients.conf"))
2103
1698
    
2104
1699
    global mandos_dbus_service
2105
1700
    mandos_dbus_service = None
2106
1701
    
2107
 
    tcp_server = MandosServer((server_settings["address"],
2108
 
                               server_settings["port"]),
 
1702
    tcp_server = MandosServer((server_settings[u"address"],
 
1703
                               server_settings[u"port"]),
2109
1704
                              ClientHandler,
2110
 
                              interface=(server_settings["interface"]
2111
 
                                         or None),
 
1705
                              interface=server_settings[u"interface"],
2112
1706
                              use_ipv6=use_ipv6,
2113
1707
                              gnutls_priority=
2114
 
                              server_settings["priority"],
 
1708
                              server_settings[u"priority"],
2115
1709
                              use_dbus=use_dbus)
2116
 
    if not debug:
2117
 
        pidfilename = "/var/run/mandos.pid"
2118
 
        try:
2119
 
            pidfile = open(pidfilename, "w")
2120
 
        except IOError:
2121
 
            logger.error("Could not open file %r", pidfilename)
 
1710
    pidfilename = u"/var/run/mandos.pid"
 
1711
    try:
 
1712
        pidfile = open(pidfilename, u"w")
 
1713
    except IOError:
 
1714
        logger.error(u"Could not open file %r", pidfilename)
2122
1715
    
2123
1716
    try:
2124
 
        uid = pwd.getpwnam("_mandos").pw_uid
2125
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1717
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1718
        gid = pwd.getpwnam(u"_mandos").pw_gid
2126
1719
    except KeyError:
2127
1720
        try:
2128
 
            uid = pwd.getpwnam("mandos").pw_uid
2129
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1721
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1722
            gid = pwd.getpwnam(u"mandos").pw_gid
2130
1723
        except KeyError:
2131
1724
            try:
2132
 
                uid = pwd.getpwnam("nobody").pw_uid
2133
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1725
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1726
                gid = pwd.getpwnam(u"nobody").pw_gid
2134
1727
            except KeyError:
2135
1728
                uid = 65534
2136
1729
                gid = 65534
2137
1730
    try:
2138
1731
        os.setgid(gid)
2139
1732
        os.setuid(uid)
2140
 
    except OSError as error:
 
1733
    except OSError, error:
2141
1734
        if error[0] != errno.EPERM:
2142
1735
            raise error
2143
1736
    
 
1737
    # Enable all possible GnuTLS debugging
2144
1738
    if debug:
2145
 
        # Enable all possible GnuTLS debugging
2146
 
        
2147
1739
        # "Use a log level over 10 to enable all debugging options."
2148
1740
        # - GnuTLS manual
2149
1741
        gnutls.library.functions.gnutls_global_set_log_level(11)
2150
1742
        
2151
1743
        @gnutls.library.types.gnutls_log_func
2152
1744
        def debug_gnutls(level, string):
2153
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1745
            logger.debug(u"GnuTLS: %s", string[:-1])
2154
1746
        
2155
1747
        (gnutls.library.functions
2156
1748
         .gnutls_global_set_log_function(debug_gnutls))
2157
 
        
2158
 
        # Redirect stdin so all checkers get /dev/null
2159
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2160
 
        os.dup2(null, sys.stdin.fileno())
2161
 
        if null > 2:
2162
 
            os.close(null)
2163
 
    
2164
 
    # Need to fork before connecting to D-Bus
2165
 
    if not debug:
2166
 
        # Close all input and output, do double fork, etc.
2167
 
        daemon()
2168
 
    
2169
 
    gobject.threads_init()
2170
1749
    
2171
1750
    global main_loop
2172
1751
    # From the Avahi example code
2176
1755
    # End of Avahi example code
2177
1756
    if use_dbus:
2178
1757
        try:
2179
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1758
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2180
1759
                                            bus, do_not_queue=True)
2181
 
            old_bus_name = (dbus.service.BusName
2182
 
                            ("se.bsnet.fukt.Mandos", bus,
2183
 
                             do_not_queue=True))
2184
 
        except dbus.exceptions.NameExistsException as e:
2185
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1760
        except dbus.exceptions.NameExistsException, e:
 
1761
            logger.error(unicode(e) + u", disabling D-Bus")
2186
1762
            use_dbus = False
2187
 
            server_settings["use_dbus"] = False
 
1763
            server_settings[u"use_dbus"] = False
2188
1764
            tcp_server.use_dbus = False
2189
1765
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
 
    service = AvahiServiceToSyslog(name =
2191
 
                                   server_settings["servicename"],
2192
 
                                   servicetype = "_mandos._tcp",
2193
 
                                   protocol = protocol, bus = bus)
 
1766
    service = AvahiService(name = server_settings[u"servicename"],
 
1767
                           servicetype = u"_mandos._tcp",
 
1768
                           protocol = protocol, bus = bus)
2194
1769
    if server_settings["interface"]:
2195
1770
        service.interface = (if_nametoindex
2196
 
                             (str(server_settings["interface"])))
2197
 
    
 
1771
                             (str(server_settings[u"interface"])))
 
1772
 
2198
1773
    global multiprocessing_manager
2199
1774
    multiprocessing_manager = multiprocessing.Manager()
2200
1775
    
2201
1776
    client_class = Client
2202
1777
    if use_dbus:
2203
 
        client_class = functools.partial(ClientDBusTransitional,
2204
 
                                         bus = bus)
2205
 
    
2206
 
    client_settings = Client.config_parser(client_config)
2207
 
    old_client_settings = {}
2208
 
    clients_data = {}
2209
 
    
2210
 
    # Get client data and settings from last running state.
2211
 
    if server_settings["restore"]:
2212
 
        try:
2213
 
            with open(stored_state_path, "rb") as stored_state:
2214
 
                clients_data, old_client_settings = (pickle.load
2215
 
                                                     (stored_state))
2216
 
            os.remove(stored_state_path)
2217
 
        except IOError as e:
2218
 
            logger.warning("Could not load persistent state: {0}"
2219
 
                           .format(e))
2220
 
            if e.errno != errno.ENOENT:
2221
 
                raise
2222
 
        except EOFError as e:
2223
 
            logger.warning("Could not load persistent state: "
2224
 
                           "EOFError: {0}".format(e))
2225
 
    
2226
 
    with PGPEngine() as pgp:
2227
 
        for client_name, client in clients_data.iteritems():
2228
 
            # Decide which value to use after restoring saved state.
2229
 
            # We have three different values: Old config file,
2230
 
            # new config file, and saved state.
2231
 
            # New config value takes precedence if it differs from old
2232
 
            # config value, otherwise use saved state.
2233
 
            for name, value in client_settings[client_name].items():
2234
 
                try:
2235
 
                    # For each value in new config, check if it
2236
 
                    # differs from the old config value (Except for
2237
 
                    # the "secret" attribute)
2238
 
                    if (name != "secret" and
2239
 
                        value != old_client_settings[client_name]
2240
 
                        [name]):
2241
 
                        client[name] = value
2242
 
                except KeyError:
2243
 
                    pass
2244
 
            
2245
 
            # Clients who has passed its expire date can still be
2246
 
            # enabled if its last checker was successful.  Clients
2247
 
            # whose checker succeeded before we stored its state is
2248
 
            # assumed to have successfully run all checkers during
2249
 
            # downtime.
2250
 
            if client["enabled"]:
2251
 
                if datetime.datetime.utcnow() >= client["expires"]:
2252
 
                    if not client["last_checked_ok"]:
2253
 
                        logger.warning(
2254
 
                            "disabling client {0} - Client never "
2255
 
                            "performed a successful checker"
2256
 
                            .format(client_name))
2257
 
                        client["enabled"] = False
2258
 
                    elif client["last_checker_status"] != 0:
2259
 
                        logger.warning(
2260
 
                            "disabling client {0} - Client "
2261
 
                            "last checker failed with error code {1}"
2262
 
                            .format(client_name,
2263
 
                                    client["last_checker_status"]))
2264
 
                        client["enabled"] = False
2265
 
                    else:
2266
 
                        client["expires"] = (datetime.datetime
2267
 
                                             .utcnow()
2268
 
                                             + client["timeout"])
2269
 
                        logger.debug("Last checker succeeded,"
2270
 
                                     " keeping {0} enabled"
2271
 
                                     .format(client_name))
 
1778
        client_class = functools.partial(ClientDBus, bus = bus)
 
1779
    def client_config_items(config, section):
 
1780
        special_settings = {
 
1781
            "approved_by_default":
 
1782
                lambda: config.getboolean(section,
 
1783
                                          "approved_by_default"),
 
1784
            }
 
1785
        for name, value in config.items(section):
2272
1786
            try:
2273
 
                client["secret"] = (
2274
 
                    pgp.decrypt(client["encrypted_secret"],
2275
 
                                client_settings[client_name]
2276
 
                                ["secret"]))
2277
 
            except PGPError:
2278
 
                # If decryption fails, we use secret from new settings
2279
 
                logger.debug("Failed to decrypt {0} old secret"
2280
 
                             .format(client_name))
2281
 
                client["secret"] = (
2282
 
                    client_settings[client_name]["secret"])
2283
 
 
2284
 
    
2285
 
    # Add/remove clients based on new changes made to config
2286
 
    for client_name in (set(old_client_settings)
2287
 
                        - set(client_settings)):
2288
 
        del clients_data[client_name]
2289
 
    for client_name in (set(client_settings)
2290
 
                        - set(old_client_settings)):
2291
 
        clients_data[client_name] = client_settings[client_name]
2292
 
 
2293
 
    # Create all client objects
2294
 
    for client_name, client in clients_data.iteritems():
2295
 
        tcp_server.clients[client_name] = client_class(
2296
 
            name = client_name, settings = client)
2297
 
    
 
1787
                yield (name, special_settings[name]())
 
1788
            except KeyError:
 
1789
                yield (name, value)
 
1790
    
 
1791
    tcp_server.clients.update(set(
 
1792
            client_class(name = section,
 
1793
                         config= dict(client_config_items(
 
1794
                        client_config, section)))
 
1795
            for section in client_config.sections()))
2298
1796
    if not tcp_server.clients:
2299
 
        logger.warning("No clients defined")
2300
 
        
 
1797
        logger.warning(u"No clients defined")
 
1798
    
 
1799
    if debug:
 
1800
        # Redirect stdin so all checkers get /dev/null
 
1801
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1802
        os.dup2(null, sys.stdin.fileno())
 
1803
        if null > 2:
 
1804
            os.close(null)
 
1805
    else:
 
1806
        # No console logging
 
1807
        logger.removeHandler(console)
 
1808
        # Close all input and output, do double fork, etc.
 
1809
        daemon()
 
1810
    
 
1811
    try:
 
1812
        with pidfile:
 
1813
            pid = os.getpid()
 
1814
            pidfile.write(str(pid) + "\n")
 
1815
        del pidfile
 
1816
    except IOError:
 
1817
        logger.error(u"Could not write to file %r with PID %d",
 
1818
                     pidfilename, pid)
 
1819
    except NameError:
 
1820
        # "pidfile" was never created
 
1821
        pass
 
1822
    del pidfilename
 
1823
    
2301
1824
    if not debug:
2302
 
        try:
2303
 
            with pidfile:
2304
 
                pid = os.getpid()
2305
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2306
 
            del pidfile
2307
 
        except IOError:
2308
 
            logger.error("Could not write to file %r with PID %d",
2309
 
                         pidfilename, pid)
2310
 
        except NameError:
2311
 
            # "pidfile" was never created
2312
 
            pass
2313
 
        del pidfilename
2314
1825
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2315
 
    
2316
1826
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
1827
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2318
1828
    
2320
1830
        class MandosDBusService(dbus.service.Object):
2321
1831
            """A D-Bus proxy object"""
2322
1832
            def __init__(self):
2323
 
                dbus.service.Object.__init__(self, bus, "/")
2324
 
            _interface = "se.recompile.Mandos"
 
1833
                dbus.service.Object.__init__(self, bus, u"/")
 
1834
            _interface = u"se.bsnet.fukt.Mandos"
2325
1835
            
2326
 
            @dbus.service.signal(_interface, signature="o")
 
1836
            @dbus.service.signal(_interface, signature=u"o")
2327
1837
            def ClientAdded(self, objpath):
2328
1838
                "D-Bus signal"
2329
1839
                pass
2330
1840
            
2331
 
            @dbus.service.signal(_interface, signature="ss")
 
1841
            @dbus.service.signal(_interface, signature=u"ss")
2332
1842
            def ClientNotFound(self, fingerprint, address):
2333
1843
                "D-Bus signal"
2334
1844
                pass
2335
1845
            
2336
 
            @dbus.service.signal(_interface, signature="os")
 
1846
            @dbus.service.signal(_interface, signature=u"os")
2337
1847
            def ClientRemoved(self, objpath, name):
2338
1848
                "D-Bus signal"
2339
1849
                pass
2340
1850
            
2341
 
            @dbus.service.method(_interface, out_signature="ao")
 
1851
            @dbus.service.method(_interface, out_signature=u"ao")
2342
1852
            def GetAllClients(self):
2343
1853
                "D-Bus method"
2344
1854
                return dbus.Array(c.dbus_object_path
2345
 
                                  for c in
2346
 
                                  tcp_server.clients.itervalues())
 
1855
                                  for c in tcp_server.clients)
2347
1856
            
2348
1857
            @dbus.service.method(_interface,
2349
 
                                 out_signature="a{oa{sv}}")
 
1858
                                 out_signature=u"a{oa{sv}}")
2350
1859
            def GetAllClientsWithProperties(self):
2351
1860
                "D-Bus method"
2352
1861
                return dbus.Dictionary(
2353
 
                    ((c.dbus_object_path, c.GetAll(""))
2354
 
                     for c in tcp_server.clients.itervalues()),
2355
 
                    signature="oa{sv}")
 
1862
                    ((c.dbus_object_path, c.GetAll(u""))
 
1863
                     for c in tcp_server.clients),
 
1864
                    signature=u"oa{sv}")
2356
1865
            
2357
 
            @dbus.service.method(_interface, in_signature="o")
 
1866
            @dbus.service.method(_interface, in_signature=u"o")
2358
1867
            def RemoveClient(self, object_path):
2359
1868
                "D-Bus method"
2360
 
                for c in tcp_server.clients.itervalues():
 
1869
                for c in tcp_server.clients:
2361
1870
                    if c.dbus_object_path == object_path:
2362
 
                        del tcp_server.clients[c.name]
 
1871
                        tcp_server.clients.remove(c)
2363
1872
                        c.remove_from_connection()
2364
1873
                        # Don't signal anything except ClientRemoved
2365
1874
                        c.disable(quiet=True)
2370
1879
            
2371
1880
            del _interface
2372
1881
        
2373
 
        class MandosDBusServiceTransitional(MandosDBusService):
2374
 
            __metaclass__ = AlternateDBusNamesMetaclass
2375
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1882
        mandos_dbus_service = MandosDBusService()
2376
1883
    
2377
1884
    def cleanup():
2378
1885
        "Cleanup function; run on exit"
2379
1886
        service.cleanup()
2380
1887
        
2381
 
        multiprocessing.active_children()
2382
 
        if not (tcp_server.clients or client_settings):
2383
 
            return
2384
 
        
2385
 
        # Store client before exiting. Secrets are encrypted with key
2386
 
        # based on what config file has. If config file is
2387
 
        # removed/edited, old secret will thus be unrecovable.
2388
 
        clients = {}
2389
 
        with PGPEngine() as pgp:
2390
 
            for client in tcp_server.clients.itervalues():
2391
 
                key = client_settings[client.name]["secret"]
2392
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2393
 
                                                      key)
2394
 
                client_dict = {}
2395
 
                
2396
 
                # A list of attributes that can not be pickled
2397
 
                # + secret.
2398
 
                exclude = set(("bus", "changedstate", "secret",
2399
 
                               "checker"))
2400
 
                for name, typ in (inspect.getmembers
2401
 
                                  (dbus.service.Object)):
2402
 
                    exclude.add(name)
2403
 
                
2404
 
                client_dict["encrypted_secret"] = (client
2405
 
                                                   .encrypted_secret)
2406
 
                for attr in client.client_structure:
2407
 
                    if attr not in exclude:
2408
 
                        client_dict[attr] = getattr(client, attr)
2409
 
                
2410
 
                clients[client.name] = client_dict
2411
 
                del client_settings[client.name]["secret"]
2412
 
        
2413
 
        try:
2414
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
 
                                                prefix="clients-",
2416
 
                                                dir=os.path.dirname
2417
 
                                                (stored_state_path))
2418
 
            with os.fdopen(tempfd, "wb") as stored_state:
2419
 
                pickle.dump((clients, client_settings), stored_state)
2420
 
            os.rename(tempname, stored_state_path)
2421
 
        except (IOError, OSError) as e:
2422
 
            logger.warning("Could not save persistent state: {0}"
2423
 
                           .format(e))
2424
 
            if not debug:
2425
 
                try:
2426
 
                    os.remove(tempname)
2427
 
                except NameError:
2428
 
                    pass
2429
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
 
                                   errno.EEXIST)):
2431
 
                raise e
2432
 
        
2433
 
        # Delete all clients, and settings from config
2434
1888
        while tcp_server.clients:
2435
 
            name, client = tcp_server.clients.popitem()
 
1889
            client = tcp_server.clients.pop()
2436
1890
            if use_dbus:
2437
1891
                client.remove_from_connection()
 
1892
            client.disable_hook = None
2438
1893
            # Don't signal anything except ClientRemoved
2439
1894
            client.disable(quiet=True)
2440
1895
            if use_dbus:
2441
1896
                # Emit D-Bus signal
2442
 
                mandos_dbus_service.ClientRemoved(client
2443
 
                                                  .dbus_object_path,
 
1897
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2444
1898
                                                  client.name)
2445
 
        client_settings.clear()
2446
1899
    
2447
1900
    atexit.register(cleanup)
2448
1901
    
2449
 
    for client in tcp_server.clients.itervalues():
 
1902
    for client in tcp_server.clients:
2450
1903
        if use_dbus:
2451
1904
            # Emit D-Bus signal
2452
1905
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2453
 
        # Need to initiate checking of clients
2454
 
        if client.enabled:
2455
 
            client.init_checker()
 
1906
        client.enable()
2456
1907
    
2457
1908
    tcp_server.enable()
2458
1909
    tcp_server.server_activate()
2460
1911
    # Find out what port we got
2461
1912
    service.port = tcp_server.socket.getsockname()[1]
2462
1913
    if use_ipv6:
2463
 
        logger.info("Now listening on address %r, port %d,"
 
1914
        logger.info(u"Now listening on address %r, port %d,"
2464
1915
                    " flowinfo %d, scope_id %d"
2465
1916
                    % tcp_server.socket.getsockname())
2466
1917
    else:                       # IPv4
2467
 
        logger.info("Now listening on address %r, port %d"
 
1918
        logger.info(u"Now listening on address %r, port %d"
2468
1919
                    % tcp_server.socket.getsockname())
2469
1920
    
2470
1921
    #service.interface = tcp_server.socket.getsockname()[3]
2473
1924
        # From the Avahi example code
2474
1925
        try:
2475
1926
            service.activate()
2476
 
        except dbus.exceptions.DBusException as error:
2477
 
            logger.critical("DBusException: %s", error)
 
1927
        except dbus.exceptions.DBusException, error:
 
1928
            logger.critical(u"DBusException: %s", error)
2478
1929
            cleanup()
2479
1930
            sys.exit(1)
2480
1931
        # End of Avahi example code
2484
1935
                             (tcp_server.handle_request
2485
1936
                              (*args[2:], **kwargs) or True))
2486
1937
        
2487
 
        logger.debug("Starting main loop")
 
1938
        logger.debug(u"Starting main loop")
2488
1939
        main_loop.run()
2489
 
    except AvahiError as error:
2490
 
        logger.critical("AvahiError: %s", error)
 
1940
    except AvahiError, error:
 
1941
        logger.critical(u"AvahiError: %s", error)
2491
1942
        cleanup()
2492
1943
        sys.exit(1)
2493
1944
    except KeyboardInterrupt:
2494
1945
        if debug:
2495
 
            print("", file=sys.stderr)
2496
 
        logger.debug("Server received KeyboardInterrupt")
2497
 
    logger.debug("Server exiting")
 
1946
            print >> sys.stderr
 
1947
        logger.debug(u"Server received KeyboardInterrupt")
 
1948
    logger.debug(u"Server exiting")
2498
1949
    # Must run before the D-Bus bus name gets deregistered
2499
1950
    cleanup()
2500
1951