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