/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2010-08-23 19:23:15 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100823192315-pefgye0l6cavcejs
* debian/control (mandos/Depends): Added "python-urwid".
* mandos (Client.approved_by_default): Changed default to "True".
  (Client.approved_delay): Changed default to "0s".
  (ClientDBus.GotSecret, ClientDBus.Rejected,
  ClientDBus.NeedApproval): Emit "PropertyChanged" signal for the
                            "approved_pending" property.

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