/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2010-09-12 18:12:11 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

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