/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-29 20:58:01 UTC
  • mto: (237.12.13 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111129205801-oufxx7hwq0nq2zau
* mandos (main): Bug fix: Syntax fix when restoring settings.

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