/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-11-19 18:31:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

Show diffs side-by-side

added added

removed removed

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