/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-09-19 17:41:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090919174118-274yt9wptmtx0ykn
* plugins.d/password-prompt.c (main): Fix "-Wconversion" warning.

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