/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

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