/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2010-09-07 18:48:56 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100907184856-waz6cvxbm7ranha2
added the actually plugin file for plymouth

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