/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-05-24 23:36:15 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090524233615-ux63hgxddxl3c7l4
* debian/mandos-client.postinst (configure): Don't look for user and
                                             group with the old name
                                             if upgrading from a new
                                             enough version.

Show diffs side-by-side

added added

removed removed

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