/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

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