/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import (division, absolute_import, print_function,
35
 
                        unicode_literals)
 
34
from __future__ import division, with_statement, absolute_import
36
35
 
37
36
import SocketServer as socketserver
38
37
import socket
39
 
import argparse
 
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
62
61
import functools
63
62
import cPickle as pickle
64
63
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
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.5.0"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
83
 
 
84
version = "1.0.14"
 
85
 
 
86
logger = logging.Logger(u'mandos')
92
87
syslogger = (logging.handlers.SysLogHandler
93
88
             (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
 
 
 
89
              address = "/dev/log"))
 
90
syslogger.setFormatter(logging.Formatter
 
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
92
                        u' %(message)s'))
 
93
logger.addHandler(syslogger)
 
94
 
 
95
console = logging.StreamHandler()
 
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
97
                                       u' %(levelname)s:'
 
98
                                       u' %(message)s'))
 
99
logger.addHandler(console)
 
100
 
 
101
multiprocessing_manager = multiprocessing.Manager()
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
229
120
    Attributes:
230
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
231
122
               Used to optionally bind to the specified interface.
232
 
    name: string; Example: 'Mandos'
233
 
    type: string; Example: '_mandos._tcp'.
 
123
    name: string; Example: u'Mandos'
 
124
    type: string; Example: u'_mandos._tcp'.
234
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
235
126
    port: integer; what port to announce
236
127
    TXT: list of strings; TXT record for the service
245
136
    """
246
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
247
138
                 servicetype = None, port = None, TXT = None,
248
 
                 domain = "", host = "", max_renames = 32768,
 
139
                 domain = u"", host = u"", max_renames = 32768,
249
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
250
141
        self.interface = interface
251
142
        self.name = name
260
151
        self.group = None       # our entry group
261
152
        self.server = None
262
153
        self.bus = bus
263
 
        self.entry_group_state_changed_match = None
264
154
    def rename(self):
265
155
        """Derived from the Avahi example code"""
266
156
        if self.rename_count >= self.max_renames:
267
 
            logger.critical("No suitable Zeroconf service name found"
268
 
                            " after %i retries, exiting.",
 
157
            logger.critical(u"No suitable Zeroconf service name found"
 
158
                            u" after %i retries, exiting.",
269
159
                            self.rename_count)
270
 
            raise AvahiServiceError("Too many renames")
271
 
        self.name = unicode(self.server
272
 
                            .GetAlternativeServiceName(self.name))
273
 
        logger.info("Changing Zeroconf service name to %r ...",
274
 
                    self.name)
 
160
            raise AvahiServiceError(u"Too many renames")
 
161
        self.name = self.server.GetAlternativeServiceName(self.name)
 
162
        logger.info(u"Changing Zeroconf service name to %r ...",
 
163
                    unicode(self.name))
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               (u'Mandos (%s) [%%(process)d]:'
 
166
                                u' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
275
168
        self.remove()
276
 
        try:
277
 
            self.add()
278
 
        except dbus.exceptions.DBusException as error:
279
 
            logger.critical("DBusException: %s", error)
280
 
            self.cleanup()
281
 
            os._exit(1)
 
169
        self.add()
282
170
        self.rename_count += 1
283
171
    def remove(self):
284
172
        """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
173
        if self.group is not None:
289
174
            self.group.Reset()
290
175
    def add(self):
291
176
        """Derived from the Avahi example code"""
292
 
        self.remove()
293
177
        if self.group is None:
294
178
            self.group = dbus.Interface(
295
179
                self.bus.get_object(avahi.DBUS_NAME,
296
180
                                    self.server.EntryGroupNew()),
297
181
                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' ...",
 
182
            self.group.connect_to_signal('StateChanged',
 
183
                                         self
 
184
                                         .entry_group_state_changed)
 
185
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
302
186
                     self.name, self.type)
303
187
        self.group.AddService(
304
188
            self.interface,
311
195
        self.group.Commit()
312
196
    def entry_group_state_changed(self, state, error):
313
197
        """Derived from the Avahi example code"""
314
 
        logger.debug("Avahi entry group state change: %i", state)
 
198
        logger.debug(u"Avahi state change: %i", state)
315
199
        
316
200
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
317
 
            logger.debug("Zeroconf service established.")
 
201
            logger.debug(u"Zeroconf service established.")
318
202
        elif state == avahi.ENTRY_GROUP_COLLISION:
319
 
            logger.info("Zeroconf service name collision.")
 
203
            logger.warning(u"Zeroconf service name collision.")
320
204
            self.rename()
321
205
        elif state == avahi.ENTRY_GROUP_FAILURE:
322
 
            logger.critical("Avahi: Error in group state changed %s",
 
206
            logger.critical(u"Avahi: Error in group state changed %s",
323
207
                            unicode(error))
324
 
            raise AvahiGroupError("State changed: %s"
 
208
            raise AvahiGroupError(u"State changed: %s"
325
209
                                  % unicode(error))
326
210
    def cleanup(self):
327
211
        """Derived from the Avahi example code"""
328
212
        if self.group is not None:
329
 
            try:
330
 
                self.group.Free()
331
 
            except (dbus.exceptions.UnknownMethodException,
332
 
                    dbus.exceptions.DBusException):
333
 
                pass
 
213
            self.group.Free()
334
214
            self.group = None
335
 
        self.remove()
336
 
    def server_state_changed(self, state, error=None):
 
215
    def server_state_changed(self, state):
337
216
        """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()
 
217
        if state == avahi.SERVER_COLLISION:
 
218
            logger.error(u"Zeroconf server name collision")
 
219
            self.remove()
353
220
        elif state == avahi.SERVER_RUNNING:
354
221
            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
222
    def activate(self):
361
223
        """Derived from the Avahi example code"""
362
224
        if self.server is None:
363
225
            self.server = dbus.Interface(
364
226
                self.bus.get_object(avahi.DBUS_NAME,
365
 
                                    avahi.DBUS_PATH_SERVER,
366
 
                                    follow_name_owner_changes=True),
 
227
                                    avahi.DBUS_PATH_SERVER),
367
228
                avahi.DBUS_INTERFACE_SERVER)
368
 
        self.server.connect_to_signal("StateChanged",
 
229
        self.server.connect_to_signal(u"StateChanged",
369
230
                                 self.server_state_changed)
370
231
        self.server_state_changed(self.server.GetState())
371
232
 
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
233
 
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
234
class Client(object):
389
235
    """A representation of a client host served by this server.
390
236
    
391
237
    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
 
238
    name:       string; from the config file, used in log messages and
 
239
                        D-Bus identifiers
 
240
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
241
                 uniquely identify the client
 
242
    secret:     bytestring; sent verbatim (over TLS) to client
 
243
    host:       string; available for use by the checker command
 
244
    created:    datetime.datetime(); (UTC) object creation
 
245
    last_enabled: datetime.datetime(); (UTC)
 
246
    enabled:    bool()
 
247
    last_checked_ok: datetime.datetime(); (UTC) or None
 
248
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
249
                                      until this client is disabled
 
250
    interval:   datetime.timedelta(); How often to start a new checker
 
251
    disable_hook:  If set, called by disable() as disable_hook(self)
395
252
    checker:    subprocess.Popen(); a running checker process used
396
253
                                    to see if the client lives.
397
254
                                    '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
 
255
    checker_initiator_tag: a gobject event source tag, or None
 
256
    disable_initiator_tag: - '' -
 
257
    checker_callback_tag:  - '' -
 
258
    checker_command: string; External command which is run to check if
 
259
                     client lives.  %() expansions are done at
401
260
                     runtime with vars(self) as dict, so that for
402
261
                     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
262
    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
 
263
    approved_delay: datetime.timedelta(); Time to wait for approval
 
264
    _approved:   bool(); 'None' if not yet approved/disapproved
 
265
    approved_duration: datetime.timedelta(); Duration of one approval
429
266
    """
430
267
    
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
 
                        }
 
268
    @staticmethod
 
269
    def _timedelta_to_milliseconds(td):
 
270
        "Convert a datetime.timedelta() to milliseconds"
 
271
        return ((td.days * 24 * 60 * 60 * 1000)
 
272
                + (td.seconds * 1000)
 
273
                + (td.microseconds // 1000))
445
274
    
446
275
    def timeout_milliseconds(self):
447
276
        "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)
 
277
        return self._timedelta_to_milliseconds(self.timeout)
453
278
    
454
279
    def interval_milliseconds(self):
455
280
        "Return the 'interval' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.interval)
 
281
        return self._timedelta_to_milliseconds(self.interval)
 
282
 
 
283
    def approved_delay_milliseconds(self):
 
284
        return self._timedelta_to_milliseconds(self.approved_delay)
457
285
    
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):
 
286
    def __init__(self, name = None, disable_hook=None, config=None):
510
287
        """Note: the 'checker' key in 'config' sets the
511
288
        'checker_command' attribute and *not* the 'checker'
512
289
        attribute."""
513
290
        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)
 
291
        if config is None:
 
292
            config = {}
 
293
        logger.debug(u"Creating client %r", self.name)
529
294
        # Uppercase and remove spaces from fingerprint for later
530
295
        # comparison purposes with return value from the fingerprint()
531
296
        # 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
 
297
        self.fingerprint = (config[u"fingerprint"].upper()
 
298
                            .replace(u" ", u""))
 
299
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
300
        if u"secret" in config:
 
301
            self.secret = config[u"secret"].decode(u"base64")
 
302
        elif u"secfile" in config:
 
303
            with open(os.path.expanduser(os.path.expandvars
 
304
                                         (config[u"secfile"])),
 
305
                      "rb") as secfile:
 
306
                self.secret = secfile.read()
 
307
        else:
 
308
            #XXX Need to allow secret on demand!
 
309
            raise TypeError(u"No secret or secfile for client %s"
 
310
                            % self.name)
 
311
        self.host = config.get(u"host", u"")
 
312
        self.created = datetime.datetime.utcnow()
 
313
        self.enabled = False
 
314
        self.last_enabled = None
 
315
        self.last_checked_ok = None
 
316
        self.timeout = string_to_delta(config[u"timeout"])
 
317
        self.interval = string_to_delta(config[u"interval"])
 
318
        self.disable_hook = disable_hook
537
319
        self.checker = None
538
320
        self.checker_initiator_tag = None
539
321
        self.disable_initiator_tag = None
540
322
        self.checker_callback_tag = None
 
323
        self.checker_command = config[u"checker"]
541
324
        self.current_checker_command = None
542
 
        self.approved = None
 
325
        self.last_connect = None
543
326
        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)
558
 
    
559
 
    # Send notice to process children that client state has changed
 
327
        self._approved = None
 
328
        self.approved_by_default = config.get(u"approved_by_default",
 
329
                                              True)
 
330
        self.approved_delay = string_to_delta(
 
331
            config[u"approved_delay"])
 
332
        self.approved_duration = string_to_delta(
 
333
            config[u"approved_duration"])
 
334
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
335
 
560
336
    def send_changedstate(self):
561
 
        with self.changedstate:
562
 
            self.changedstate.notify_all()
563
 
    
 
337
        self.changedstate.acquire()
 
338
        self.changedstate.notify_all()
 
339
        self.changedstate.release()
 
340
        
564
341
    def enable(self):
565
342
        """Start this client's checker and timeout hooks"""
566
 
        if getattr(self, "enabled", False):
 
343
        if getattr(self, u"enabled", False):
567
344
            # Already enabled
568
345
            return
569
346
        self.send_changedstate()
570
 
        self.expires = datetime.datetime.utcnow() + self.timeout
571
 
        self.enabled = True
572
347
        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
348
        # Schedule a new checker to be started an 'interval' from now,
600
349
        # and every interval from then on.
601
350
        self.checker_initiator_tag = (gobject.timeout_add
605
354
        self.disable_initiator_tag = (gobject.timeout_add
606
355
                                   (self.timeout_milliseconds(),
607
356
                                    self.disable))
 
357
        self.enabled = True
608
358
        # Also start a new checker *right now*.
609
359
        self.start_checker()
610
360
    
 
361
    def disable(self, quiet=True):
 
362
        """Disable this client."""
 
363
        if not getattr(self, "enabled", False):
 
364
            return False
 
365
        if not quiet:
 
366
            self.send_changedstate()
 
367
        if not quiet:
 
368
            logger.info(u"Disabling client %s", self.name)
 
369
        if getattr(self, u"disable_initiator_tag", False):
 
370
            gobject.source_remove(self.disable_initiator_tag)
 
371
            self.disable_initiator_tag = None
 
372
        if getattr(self, u"checker_initiator_tag", False):
 
373
            gobject.source_remove(self.checker_initiator_tag)
 
374
            self.checker_initiator_tag = None
 
375
        self.stop_checker()
 
376
        if self.disable_hook:
 
377
            self.disable_hook(self)
 
378
        self.enabled = False
 
379
        # Do not run this again if called by a gobject.timeout_add
 
380
        return False
 
381
    
 
382
    def __del__(self):
 
383
        self.disable_hook = None
 
384
        self.disable()
 
385
    
611
386
    def checker_callback(self, pid, condition, command):
612
387
        """The checker has completed, so take appropriate actions."""
613
388
        self.checker_callback_tag = None
614
389
        self.checker = None
615
390
        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",
 
391
            exitstatus = os.WEXITSTATUS(condition)
 
392
            if exitstatus == 0:
 
393
                logger.info(u"Checker for %(name)s succeeded",
619
394
                            vars(self))
620
395
                self.checked_ok()
621
396
            else:
622
 
                logger.info("Checker for %(name)s failed",
 
397
                logger.info(u"Checker for %(name)s failed",
623
398
                            vars(self))
624
399
        else:
625
 
            self.last_checker_status = -1
626
 
            logger.warning("Checker for %(name)s crashed?",
 
400
            logger.warning(u"Checker for %(name)s crashed?",
627
401
                           vars(self))
628
402
    
629
 
    def checked_ok(self, timeout=None):
 
403
    def checked_ok(self):
630
404
        """Bump up the timeout for this client.
631
405
        
632
406
        This should only be called when the client has been seen,
633
407
        alive and well.
634
408
        """
635
 
        if timeout is None:
636
 
            timeout = self.timeout
637
409
        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()
 
410
        gobject.source_remove(self.disable_initiator_tag)
 
411
        self.disable_initiator_tag = (gobject.timeout_add
 
412
                                      (self.timeout_milliseconds(),
 
413
                                       self.disable))
648
414
    
649
415
    def start_checker(self):
650
416
        """Start a new checker subprocess if one is not running.
663
429
        # If a checker exists, make sure it is not a zombie
664
430
        try:
665
431
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
 
        except (AttributeError, OSError) as error:
 
432
        except (AttributeError, OSError), error:
667
433
            if (isinstance(error, OSError)
668
434
                and error.errno != errno.ECHILD):
669
435
                raise error
670
436
        else:
671
437
            if pid:
672
 
                logger.warning("Checker was a zombie")
 
438
                logger.warning(u"Checker was a zombie")
673
439
                gobject.source_remove(self.checker_callback_tag)
674
440
                self.checker_callback(pid, status,
675
441
                                      self.current_checker_command)
680
446
                command = self.checker_command % self.host
681
447
            except TypeError:
682
448
                # 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
 
                
 
449
                escaped_attrs = dict((key,
 
450
                                      re.escape(unicode(str(val),
 
451
                                                        errors=
 
452
                                                        u'replace')))
 
453
                                     for key, val in
 
454
                                     vars(self).iteritems())
691
455
                try:
692
456
                    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)
 
457
                except TypeError, error:
 
458
                    logger.error(u'Could not format string "%s":'
 
459
                                 u' %s', self.checker_command, error)
696
460
                    return True # Try again later
697
461
            self.current_checker_command = command
698
462
            try:
699
 
                logger.info("Starting checker %r for %s",
 
463
                logger.info(u"Starting checker %r for %s",
700
464
                            command, self.name)
701
465
                # We don't need to redirect stdout and stderr, since
702
466
                # in normal mode, that is already done by daemon(),
704
468
                # always replaced by /dev/null.)
705
469
                self.checker = subprocess.Popen(command,
706
470
                                                close_fds=True,
707
 
                                                shell=True, cwd="/")
 
471
                                                shell=True, cwd=u"/")
708
472
                self.checker_callback_tag = (gobject.child_watch_add
709
473
                                             (self.checker.pid,
710
474
                                              self.checker_callback,
715
479
                if pid:
716
480
                    gobject.source_remove(self.checker_callback_tag)
717
481
                    self.checker_callback(pid, status, command)
718
 
            except OSError as error:
719
 
                logger.error("Failed to start subprocess: %s",
 
482
            except OSError, error:
 
483
                logger.error(u"Failed to start subprocess: %s",
720
484
                             error)
721
485
        # Re-run this periodically if run by gobject.timeout_add
722
486
        return True
726
490
        if self.checker_callback_tag:
727
491
            gobject.source_remove(self.checker_callback_tag)
728
492
            self.checker_callback_tag = None
729
 
        if getattr(self, "checker", None) is None:
 
493
        if getattr(self, u"checker", None) is None:
730
494
            return
731
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
495
        logger.debug(u"Stopping checker for %(name)s", vars(self))
732
496
        try:
733
497
            os.kill(self.checker.pid, signal.SIGTERM)
734
498
            #time.sleep(0.5)
735
499
            #if self.checker.poll() is None:
736
500
            #    os.kill(self.checker.pid, signal.SIGKILL)
737
 
        except OSError as error:
 
501
        except OSError, error:
738
502
            if error.errno != errno.ESRCH: # No such process
739
503
                raise
740
504
        self.checker = None
741
505
 
742
 
 
743
 
def dbus_service_property(dbus_interface, signature="v",
744
 
                          access="readwrite", byte_arrays=False):
 
506
def dbus_service_property(dbus_interface, signature=u"v",
 
507
                          access=u"readwrite", byte_arrays=False):
745
508
    """Decorators for marking methods of a DBusObjectWithProperties to
746
509
    become properties on the D-Bus.
747
510
    
754
517
    """
755
518
    # Encoding deeply encoded byte arrays is not supported yet by the
756
519
    # "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)
 
520
    if byte_arrays and signature != u"ay":
 
521
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
522
                         u" signature %r" % signature)
760
523
    def decorator(func):
761
524
        func._dbus_is_property = True
762
525
        func._dbus_interface = dbus_interface
763
526
        func._dbus_signature = signature
764
527
        func._dbus_access = access
765
528
        func._dbus_name = func.__name__
766
 
        if func._dbus_name.endswith("_dbus_property"):
 
529
        if func._dbus_name.endswith(u"_dbus_property"):
767
530
            func._dbus_name = func._dbus_name[:-14]
768
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
531
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
769
532
        return func
770
533
    return decorator
771
534
 
791
554
 
792
555
class DBusObjectWithProperties(dbus.service.Object):
793
556
    """A D-Bus object with properties.
794
 
    
 
557
 
795
558
    Classes inheriting from this can use the dbus_service_property
796
559
    decorator to expose methods as D-Bus properties.  It exposes the
797
560
    standard Get(), Set(), and GetAll() methods on the D-Bus.
799
562
    
800
563
    @staticmethod
801
564
    def _is_dbus_property(obj):
802
 
        return getattr(obj, "_dbus_is_property", False)
 
565
        return getattr(obj, u"_dbus_is_property", False)
803
566
    
804
567
    def _get_all_dbus_properties(self):
805
568
        """Returns a generator of (name, attribute) pairs
806
569
        """
807
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
 
                for cls in self.__class__.__mro__
 
570
        return ((prop._dbus_name, prop)
809
571
                for name, prop in
810
 
                inspect.getmembers(cls, self._is_dbus_property))
 
572
                inspect.getmembers(self, self._is_dbus_property))
811
573
    
812
574
    def _get_dbus_property(self, interface_name, property_name):
813
575
        """Returns a bound method if one exists which is a D-Bus
814
576
        property with the specified name and interface.
815
577
        """
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
 
        
 
578
        for name in (property_name,
 
579
                     property_name + u"_dbus_property"):
 
580
            prop = getattr(self, name, None)
 
581
            if (prop is None
 
582
                or not self._is_dbus_property(prop)
 
583
                or prop._dbus_name != property_name
 
584
                or (interface_name and prop._dbus_interface
 
585
                    and interface_name != prop._dbus_interface)):
 
586
                continue
 
587
            return prop
823
588
        # No such property
824
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
 
                                   + interface_name + "."
 
589
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
590
                                   + interface_name + u"."
826
591
                                   + property_name)
827
592
    
828
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
829
 
                         out_signature="v")
 
593
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
594
                         out_signature=u"v")
830
595
    def Get(self, interface_name, property_name):
831
596
        """Standard D-Bus property Get() method, see D-Bus standard.
832
597
        """
833
598
        prop = self._get_dbus_property(interface_name, property_name)
834
 
        if prop._dbus_access == "write":
 
599
        if prop._dbus_access == u"write":
835
600
            raise DBusPropertyAccessException(property_name)
836
601
        value = prop()
837
 
        if not hasattr(value, "variant_level"):
 
602
        if not hasattr(value, u"variant_level"):
838
603
            return value
839
604
        return type(value)(value, variant_level=value.variant_level+1)
840
605
    
841
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
606
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
842
607
    def Set(self, interface_name, property_name, value):
843
608
        """Standard D-Bus property Set() method, see D-Bus standard.
844
609
        """
845
610
        prop = self._get_dbus_property(interface_name, property_name)
846
 
        if prop._dbus_access == "read":
 
611
        if prop._dbus_access == u"read":
847
612
            raise DBusPropertyAccessException(property_name)
848
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
613
        if prop._dbus_get_args_options[u"byte_arrays"]:
849
614
            # The byte_arrays option is not supported yet on
850
615
            # signatures other than "ay".
851
 
            if prop._dbus_signature != "ay":
 
616
            if prop._dbus_signature != u"ay":
852
617
                raise ValueError
853
 
            value = dbus.ByteArray(b''.join(chr(byte)
854
 
                                            for byte in value))
 
618
            value = dbus.ByteArray(''.join(unichr(byte)
 
619
                                           for byte in value))
855
620
        prop(value)
856
621
    
857
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
858
 
                         out_signature="a{sv}")
 
622
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
623
                         out_signature=u"a{sv}")
859
624
    def GetAll(self, interface_name):
860
625
        """Standard D-Bus property GetAll() method, see D-Bus
861
626
        standard.
862
 
        
 
627
 
863
628
        Note: Will not include properties with access="write".
864
629
        """
865
 
        properties = {}
 
630
        all = {}
866
631
        for name, prop in self._get_all_dbus_properties():
867
632
            if (interface_name
868
633
                and interface_name != prop._dbus_interface):
869
634
                # Interface non-empty but did not match
870
635
                continue
871
636
            # Ignore write-only properties
872
 
            if prop._dbus_access == "write":
 
637
            if prop._dbus_access == u"write":
873
638
                continue
874
639
            value = prop()
875
 
            if not hasattr(value, "variant_level"):
876
 
                properties[name] = value
 
640
            if not hasattr(value, u"variant_level"):
 
641
                all[name] = value
877
642
                continue
878
 
            properties[name] = type(value)(value, variant_level=
879
 
                                           value.variant_level+1)
880
 
        return dbus.Dictionary(properties, signature="sv")
 
643
            all[name] = type(value)(value, variant_level=
 
644
                                    value.variant_level+1)
 
645
        return dbus.Dictionary(all, signature=u"sv")
881
646
    
882
647
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
883
 
                         out_signature="s",
 
648
                         out_signature=u"s",
884
649
                         path_keyword='object_path',
885
650
                         connection_keyword='connection')
886
651
    def Introspect(self, object_path, connection):
891
656
        try:
892
657
            document = xml.dom.minidom.parseString(xmlstring)
893
658
            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)
 
659
                e = document.createElement(u"property")
 
660
                e.setAttribute(u"name", name)
 
661
                e.setAttribute(u"type", prop._dbus_signature)
 
662
                e.setAttribute(u"access", prop._dbus_access)
898
663
                return e
899
 
            for if_tag in document.getElementsByTagName("interface"):
 
664
            for if_tag in document.getElementsByTagName(u"interface"):
900
665
                for tag in (make_tag(document, name, prop)
901
666
                            for name, prop
902
667
                            in self._get_all_dbus_properties()
903
668
                            if prop._dbus_interface
904
 
                            == if_tag.getAttribute("name")):
 
669
                            == if_tag.getAttribute(u"name")):
905
670
                    if_tag.appendChild(tag)
906
671
                # Add the names to the return values for the
907
672
                # "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")
 
673
                if (if_tag.getAttribute(u"name")
 
674
                    == u"org.freedesktop.DBus.Properties"):
 
675
                    for cn in if_tag.getElementsByTagName(u"method"):
 
676
                        if cn.getAttribute(u"name") == u"Get":
 
677
                            for arg in cn.getElementsByTagName(u"arg"):
 
678
                                if (arg.getAttribute(u"direction")
 
679
                                    == u"out"):
 
680
                                    arg.setAttribute(u"name", u"value")
 
681
                        elif cn.getAttribute(u"name") == u"GetAll":
 
682
                            for arg in cn.getElementsByTagName(u"arg"):
 
683
                                if (arg.getAttribute(u"direction")
 
684
                                    == u"out"):
 
685
                                    arg.setAttribute(u"name", u"props")
 
686
            xmlstring = document.toxml(u"utf-8")
922
687
            document.unlink()
923
688
        except (AttributeError, xml.dom.DOMException,
924
 
                xml.parsers.expat.ExpatError) as error:
925
 
            logger.error("Failed to override Introspection method",
 
689
                xml.parsers.expat.ExpatError), error:
 
690
            logger.error(u"Failed to override Introspection method",
926
691
                         error)
927
692
        return xmlstring
928
693
 
929
694
 
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
695
class ClientDBus(Client, DBusObjectWithProperties):
1037
696
    """A Client class using D-Bus
1038
697
    
1040
699
    dbus_object_path: dbus.ObjectPath
1041
700
    bus: dbus.SystemBus()
1042
701
    """
1043
 
    
1044
 
    runtime_expansions = (Client.runtime_expansions
1045
 
                          + ("dbus_object_path",))
1046
 
    
1047
702
    # dbus.service.Object doesn't use super(), so we can't either.
1048
703
    
1049
704
    def __init__(self, bus = None, *args, **kwargs):
1050
705
        self.bus = bus
1051
706
        Client.__init__(self, *args, **kwargs)
1052
 
        self._approvals_pending = 0
1053
 
        
1054
 
        self._approvals_pending = 0
1055
707
        # Only now, when this client is initialized, can it show up on
1056
708
        # the D-Bus
1057
 
        client_object_name = unicode(self.name).translate(
1058
 
            {ord("."): ord("_"),
1059
 
             ord("-"): ord("_")})
1060
709
        self.dbus_object_path = (dbus.ObjectPath
1061
 
                                 ("/clients/" + client_object_name))
 
710
                                 (u"/clients/"
 
711
                                  + self.name.replace(u".", u"_")))
1062
712
        DBusObjectWithProperties.__init__(self, self.bus,
1063
713
                                          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
 
714
    
 
715
    @staticmethod
 
716
    def _datetime_to_dbus(dt, variant_level=0):
 
717
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
718
        return dbus.String(dt.isoformat(),
 
719
                           variant_level=variant_level)
 
720
    
 
721
    def enable(self):
 
722
        oldstate = getattr(self, u"enabled", False)
 
723
        r = Client.enable(self)
 
724
        if oldstate != self.enabled:
 
725
            # Emit D-Bus signals
 
726
            self.PropertyChanged(dbus.String(u"enabled"),
 
727
                                 dbus.Boolean(True, variant_level=1))
 
728
            self.PropertyChanged(
 
729
                dbus.String(u"last_enabled"),
 
730
                self._datetime_to_dbus(self.last_enabled,
 
731
                                       variant_level=1))
 
732
        return r
 
733
    
 
734
    def disable(self, quiet = False):
 
735
        oldstate = getattr(self, u"enabled", False)
 
736
        r = Client.disable(self, quiet=quiet)
 
737
        if not quiet and oldstate != self.enabled:
 
738
            # Emit D-Bus signal
 
739
            self.PropertyChanged(dbus.String(u"enabled"),
 
740
                                 dbus.Boolean(False, variant_level=1))
 
741
        return r
1131
742
    
1132
743
    def __del__(self, *args, **kwargs):
1133
744
        try:
1134
745
            self.remove_from_connection()
1135
746
        except LookupError:
1136
747
            pass
1137
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
748
        if hasattr(DBusObjectWithProperties, u"__del__"):
1138
749
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1139
750
        Client.__del__(self, *args, **kwargs)
1140
751
    
1142
753
                         *args, **kwargs):
1143
754
        self.checker_callback_tag = None
1144
755
        self.checker = None
 
756
        # Emit D-Bus signal
 
757
        self.PropertyChanged(dbus.String(u"checker_running"),
 
758
                             dbus.Boolean(False, variant_level=1))
1145
759
        if os.WIFEXITED(condition):
1146
760
            exitstatus = os.WEXITSTATUS(condition)
1147
761
            # Emit D-Bus signal
1157
771
        return Client.checker_callback(self, pid, condition, command,
1158
772
                                       *args, **kwargs)
1159
773
    
 
774
    def checked_ok(self, *args, **kwargs):
 
775
        r = Client.checked_ok(self, *args, **kwargs)
 
776
        # Emit D-Bus signal
 
777
        self.PropertyChanged(
 
778
            dbus.String(u"last_checked_ok"),
 
779
            (self._datetime_to_dbus(self.last_checked_ok,
 
780
                                    variant_level=1)))
 
781
        return r
 
782
    
1160
783
    def start_checker(self, *args, **kwargs):
1161
784
        old_checker = self.checker
1162
785
        if self.checker is not None:
1169
792
            and old_checker_pid != self.checker.pid):
1170
793
            # Emit D-Bus signal
1171
794
            self.CheckerStarted(self.current_checker_command)
 
795
            self.PropertyChanged(
 
796
                dbus.String(u"checker_running"),
 
797
                dbus.Boolean(True, variant_level=1))
1172
798
        return r
1173
799
    
 
800
    def stop_checker(self, *args, **kwargs):
 
801
        old_checker = getattr(self, u"checker", None)
 
802
        r = Client.stop_checker(self, *args, **kwargs)
 
803
        if (old_checker is not None
 
804
            and getattr(self, u"checker", None) is None):
 
805
            self.PropertyChanged(dbus.String(u"checker_running"),
 
806
                                 dbus.Boolean(False, variant_level=1))
 
807
        return r
 
808
 
1174
809
    def _reset_approved(self):
1175
 
        self.approved = None
 
810
        self._approved = None
1176
811
        return False
1177
812
    
1178
813
    def approve(self, value=True):
1179
 
        self.send_changedstate()
1180
 
        self.approved = value
1181
 
        gobject.timeout_add(timedelta_to_milliseconds
1182
 
                            (self.approval_duration),
1183
 
                            self._reset_approved)
 
814
        self._approved = value
 
815
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
 
816
 
 
817
    def approved_pending(self):
 
818
        return self.approvals_pending > 0
1184
819
    
1185
820
    
1186
821
    ## D-Bus methods, signals & properties
1187
 
    _interface = "se.recompile.Mandos.Client"
 
822
    _interface = u"se.bsnet.fukt.Mandos.Client"
1188
823
    
1189
824
    ## Signals
1190
825
    
1191
826
    # CheckerCompleted - signal
1192
 
    @dbus.service.signal(_interface, signature="nxs")
 
827
    @dbus.service.signal(_interface, signature=u"nxs")
1193
828
    def CheckerCompleted(self, exitcode, waitstatus, command):
1194
829
        "D-Bus signal"
1195
830
        pass
1196
831
    
1197
832
    # CheckerStarted - signal
1198
 
    @dbus.service.signal(_interface, signature="s")
 
833
    @dbus.service.signal(_interface, signature=u"s")
1199
834
    def CheckerStarted(self, command):
1200
835
        "D-Bus signal"
1201
836
        pass
1202
837
    
1203
838
    # PropertyChanged - signal
1204
 
    @dbus.service.signal(_interface, signature="sv")
 
839
    @dbus.service.signal(_interface, signature=u"sv")
1205
840
    def PropertyChanged(self, property, value):
1206
841
        "D-Bus signal"
1207
842
        pass
1209
844
    # GotSecret - signal
1210
845
    @dbus.service.signal(_interface)
1211
846
    def GotSecret(self):
1212
 
        """D-Bus signal
1213
 
        Is sent after a successful transfer of secret from the Mandos
1214
 
        server to mandos-client
1215
 
        """
1216
 
        pass
 
847
        "D-Bus signal"
 
848
        if self.approved_pending():
 
849
            self.PropertyChanged(dbus.String(u"checker_running"),
 
850
                                 dbus.Boolean(False, variant_level=1))
1217
851
    
1218
852
    # Rejected - signal
1219
 
    @dbus.service.signal(_interface, signature="s")
 
853
    @dbus.service.signal(_interface, signature=u"s")
1220
854
    def Rejected(self, reason):
1221
855
        "D-Bus signal"
1222
 
        pass
 
856
        if self.approved_pending():
 
857
            self.PropertyChanged(dbus.String(u"checker_running"),
 
858
                                 dbus.Boolean(False, variant_level=1))
1223
859
    
1224
860
    # NeedApproval - signal
1225
 
    @dbus.service.signal(_interface, signature="tb")
 
861
    @dbus.service.signal(_interface, signature=u"db")
1226
862
    def NeedApproval(self, timeout, default):
1227
863
        "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
 
        pass
 
864
        if not self.approved_pending():
 
865
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
866
                                 dbus.Boolean(True, variant_level=1))
1237
867
    
1238
868
    ## Methods
1239
 
    
 
869
 
1240
870
    # Approve - method
1241
 
    @dbus.service.method(_interface, in_signature="b")
 
871
    @dbus.service.method(_interface, in_signature=u"b")
1242
872
    def Approve(self, value):
1243
873
        self.approve(value)
1244
 
    
 
874
 
1245
875
    # CheckedOK - method
1246
876
    @dbus.service.method(_interface)
1247
877
    def CheckedOK(self):
1248
 
        self.checked_ok()
 
878
        return self.checked_ok()
1249
879
    
1250
880
    # Enable - method
1251
881
    @dbus.service.method(_interface)
1272
902
    
1273
903
    ## Properties
1274
904
    
1275
 
    # ApprovalPending - property
1276
 
    @dbus_service_property(_interface, signature="b", access="read")
1277
 
    def ApprovalPending_dbus_property(self):
1278
 
        return dbus.Boolean(bool(self.approvals_pending))
1279
 
    
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):
 
905
    # approved_pending - property
 
906
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
907
    def approved_pending_dbus_property(self):
 
908
        return dbus.Boolean(self.approved_pending())
 
909
    
 
910
    # approved_by_default - property
 
911
    @dbus_service_property(_interface, signature=u"b",
 
912
                           access=u"readwrite")
 
913
    def approved_by_default_dbus_property(self):
 
914
        return dbus.Boolean(self.approved_by_default)
 
915
    
 
916
    # approved_delay - property
 
917
    @dbus_service_property(_interface, signature=u"t",
 
918
                           access=u"readwrite")
 
919
    def approved_delay_dbus_property(self):
 
920
        return dbus.UInt64(self.approved_delay_milliseconds())
 
921
    
 
922
    # approved_duration - property
 
923
    @dbus_service_property(_interface, signature=u"t",
 
924
                           access=u"readwrite")
 
925
    def approved_duration_dbus_property(self):
 
926
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
927
                self.approved_duration))
 
928
    
 
929
    # name - property
 
930
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
931
    def name_dbus_property(self):
1308
932
        return dbus.String(self.name)
1309
933
    
1310
 
    # Fingerprint - property
1311
 
    @dbus_service_property(_interface, signature="s", access="read")
1312
 
    def Fingerprint_dbus_property(self):
 
934
    # fingerprint - property
 
935
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
936
    def fingerprint_dbus_property(self):
1313
937
        return dbus.String(self.fingerprint)
1314
938
    
1315
 
    # Host - property
1316
 
    @dbus_service_property(_interface, signature="s",
1317
 
                           access="readwrite")
1318
 
    def Host_dbus_property(self, value=None):
 
939
    # host - property
 
940
    @dbus_service_property(_interface, signature=u"s",
 
941
                           access=u"readwrite")
 
942
    def host_dbus_property(self, value=None):
1319
943
        if value is None:       # get
1320
944
            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):
 
945
        self.host = value
 
946
        # Emit D-Bus signal
 
947
        self.PropertyChanged(dbus.String(u"host"),
 
948
                             dbus.String(value, variant_level=1))
 
949
    
 
950
    # created - property
 
951
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
952
    def created_dbus_property(self):
 
953
        return dbus.String(self._datetime_to_dbus(self.created))
 
954
    
 
955
    # last_enabled - property
 
956
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
957
    def last_enabled_dbus_property(self):
 
958
        if self.last_enabled is None:
 
959
            return dbus.String(u"")
 
960
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
961
    
 
962
    # enabled - property
 
963
    @dbus_service_property(_interface, signature=u"b",
 
964
                           access=u"readwrite")
 
965
    def enabled_dbus_property(self, value=None):
1337
966
        if value is None:       # get
1338
967
            return dbus.Boolean(self.enabled)
1339
968
        if value:
1341
970
        else:
1342
971
            self.disable()
1343
972
    
1344
 
    # LastCheckedOK - property
1345
 
    @dbus_service_property(_interface, signature="s",
1346
 
                           access="readwrite")
1347
 
    def LastCheckedOK_dbus_property(self, value=None):
 
973
    # last_checked_ok - property
 
974
    @dbus_service_property(_interface, signature=u"s",
 
975
                           access=u"readwrite")
 
976
    def last_checked_ok_dbus_property(self, value=None):
1348
977
        if value is not None:
1349
978
            self.checked_ok()
1350
979
            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):
 
980
        if self.last_checked_ok is None:
 
981
            return dbus.String(u"")
 
982
        return dbus.String(self._datetime_to_dbus(self
 
983
                                                  .last_checked_ok))
 
984
    
 
985
    # timeout - property
 
986
    @dbus_service_property(_interface, signature=u"t",
 
987
                           access=u"readwrite")
 
988
    def timeout_dbus_property(self, value=None):
1367
989
        if value is None:       # get
1368
990
            return dbus.UInt64(self.timeout_milliseconds())
1369
991
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
992
        # Emit D-Bus signal
 
993
        self.PropertyChanged(dbus.String(u"timeout"),
 
994
                             dbus.UInt64(value, variant_level=1))
 
995
        if getattr(self, u"disable_initiator_tag", None) is None:
 
996
            return
1370
997
        # 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):
 
998
        gobject.source_remove(self.disable_initiator_tag)
 
999
        self.disable_initiator_tag = None
 
1000
        time_to_die = (self.
 
1001
                       _timedelta_to_milliseconds((self
 
1002
                                                   .last_checked_ok
 
1003
                                                   + self.timeout)
 
1004
                                                  - datetime.datetime
 
1005
                                                  .utcnow()))
 
1006
        if time_to_die <= 0:
 
1007
            # The timeout has passed
 
1008
            self.disable()
 
1009
        else:
 
1010
            self.disable_initiator_tag = (gobject.timeout_add
 
1011
                                          (time_to_die, self.disable))
 
1012
    
 
1013
    # interval - property
 
1014
    @dbus_service_property(_interface, signature=u"t",
 
1015
                           access=u"readwrite")
 
1016
    def interval_dbus_property(self, value=None):
1402
1017
        if value is None:       # get
1403
1018
            return dbus.UInt64(self.interval_milliseconds())
1404
1019
        self.interval = datetime.timedelta(0, 0, 0, value)
1405
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1020
        # Emit D-Bus signal
 
1021
        self.PropertyChanged(dbus.String(u"interval"),
 
1022
                             dbus.UInt64(value, variant_level=1))
 
1023
        if getattr(self, u"checker_initiator_tag", None) is None:
1406
1024
            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):
 
1025
        # Reschedule checker run
 
1026
        gobject.source_remove(self.checker_initiator_tag)
 
1027
        self.checker_initiator_tag = (gobject.timeout_add
 
1028
                                      (value, self.start_checker))
 
1029
        self.start_checker()    # Start one now, too
 
1030
 
 
1031
    # checker - property
 
1032
    @dbus_service_property(_interface, signature=u"s",
 
1033
                           access=u"readwrite")
 
1034
    def checker_dbus_property(self, value=None):
1418
1035
        if value is None:       # get
1419
1036
            return dbus.String(self.checker_command)
1420
 
        self.checker_command = unicode(value)
 
1037
        self.checker_command = value
 
1038
        # Emit D-Bus signal
 
1039
        self.PropertyChanged(dbus.String(u"checker"),
 
1040
                             dbus.String(self.checker_command,
 
1041
                                         variant_level=1))
1421
1042
    
1422
 
    # CheckerRunning - property
1423
 
    @dbus_service_property(_interface, signature="b",
1424
 
                           access="readwrite")
1425
 
    def CheckerRunning_dbus_property(self, value=None):
 
1043
    # checker_running - property
 
1044
    @dbus_service_property(_interface, signature=u"b",
 
1045
                           access=u"readwrite")
 
1046
    def checker_running_dbus_property(self, value=None):
1426
1047
        if value is None:       # get
1427
1048
            return dbus.Boolean(self.checker is not None)
1428
1049
        if value:
1430
1051
        else:
1431
1052
            self.stop_checker()
1432
1053
    
1433
 
    # ObjectPath - property
1434
 
    @dbus_service_property(_interface, signature="o", access="read")
1435
 
    def ObjectPath_dbus_property(self):
 
1054
    # object_path - property
 
1055
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1056
    def object_path_dbus_property(self):
1436
1057
        return self.dbus_object_path # is already a dbus.ObjectPath
1437
1058
    
1438
 
    # Secret = property
1439
 
    @dbus_service_property(_interface, signature="ay",
1440
 
                           access="write", byte_arrays=True)
1441
 
    def Secret_dbus_property(self, value):
 
1059
    # secret = property
 
1060
    @dbus_service_property(_interface, signature=u"ay",
 
1061
                           access=u"write", byte_arrays=True)
 
1062
    def secret_dbus_property(self, value):
1442
1063
        self.secret = str(value)
1443
1064
    
1444
1065
    del _interface
1450
1071
        self._pipe.send(('init', fpr, address))
1451
1072
        if not self._pipe.recv():
1452
1073
            raise KeyError()
1453
 
    
 
1074
 
1454
1075
    def __getattribute__(self, name):
1455
 
        if name == '_pipe':
 
1076
        if(name == '_pipe'):
1456
1077
            return super(ProxyClient, self).__getattribute__(name)
1457
1078
        self._pipe.send(('getattr', name))
1458
1079
        data = self._pipe.recv()
1463
1084
                self._pipe.send(('funcall', name, args, kwargs))
1464
1085
                return self._pipe.recv()[1]
1465
1086
            return func
1466
 
    
 
1087
 
1467
1088
    def __setattr__(self, name, value):
1468
 
        if name == '_pipe':
 
1089
        if(name == '_pipe'):
1469
1090
            return super(ProxyClient, self).__setattr__(name, value)
1470
1091
        self._pipe.send(('setattr', name, value))
1471
1092
 
1472
1093
 
1473
 
class ClientDBusTransitional(ClientDBus):
1474
 
    __metaclass__ = AlternateDBusNamesMetaclass
1475
 
 
1476
 
 
1477
1094
class ClientHandler(socketserver.BaseRequestHandler, object):
1478
1095
    """A class to handle client connections.
1479
1096
    
1482
1099
    
1483
1100
    def handle(self):
1484
1101
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1485
 
            logger.info("TCP connection from: %s",
 
1102
            logger.info(u"TCP connection from: %s",
1486
1103
                        unicode(self.client_address))
1487
 
            logger.debug("Pipe FD: %d",
 
1104
            logger.debug(u"Pipe FD: %d",
1488
1105
                         self.server.child_pipe.fileno())
1489
 
            
 
1106
 
1490
1107
            session = (gnutls.connection
1491
1108
                       .ClientSession(self.request,
1492
1109
                                      gnutls.connection
1493
1110
                                      .X509Credentials()))
1494
 
            
 
1111
 
1495
1112
            # Note: gnutls.connection.X509Credentials is really a
1496
1113
            # generic GnuTLS certificate credentials object so long as
1497
1114
            # no X.509 keys are added to it.  Therefore, we can use it
1498
1115
            # 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"))
 
1116
 
 
1117
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1118
            #                      u"+AES-256-CBC", u"+SHA1",
 
1119
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1120
            #                      u"+DHE-DSS"))
1504
1121
            # Use a fallback default, since this MUST be set.
1505
1122
            priority = self.server.gnutls_priority
1506
1123
            if priority is None:
1507
 
                priority = "NORMAL"
 
1124
                priority = u"NORMAL"
1508
1125
            (gnutls.library.functions
1509
1126
             .gnutls_priority_set_direct(session._c_object,
1510
1127
                                         priority, None))
1511
 
            
 
1128
 
1512
1129
            # Start communication using the Mandos protocol
1513
1130
            # Get protocol number
1514
1131
            line = self.request.makefile().readline()
1515
 
            logger.debug("Protocol version: %r", line)
 
1132
            logger.debug(u"Protocol version: %r", line)
1516
1133
            try:
1517
1134
                if int(line.strip().split()[0]) > 1:
1518
1135
                    raise RuntimeError
1519
 
            except (ValueError, IndexError, RuntimeError) as error:
1520
 
                logger.error("Unknown protocol version: %s", error)
 
1136
            except (ValueError, IndexError, RuntimeError), error:
 
1137
                logger.error(u"Unknown protocol version: %s", error)
1521
1138
                return
1522
 
            
 
1139
 
1523
1140
            # Start GnuTLS connection
1524
1141
            try:
1525
1142
                session.handshake()
1526
 
            except gnutls.errors.GNUTLSError as error:
1527
 
                logger.warning("Handshake failed: %s", error)
 
1143
            except gnutls.errors.GNUTLSError, error:
 
1144
                logger.warning(u"Handshake failed: %s", error)
1528
1145
                # Do not run session.bye() here: the session is not
1529
1146
                # established.  Just abandon the request.
1530
1147
                return
1531
 
            logger.debug("Handshake succeeded")
1532
 
            
 
1148
            logger.debug(u"Handshake succeeded")
 
1149
 
1533
1150
            approval_required = False
1534
1151
            try:
1535
1152
                try:
1536
1153
                    fpr = self.fingerprint(self.peer_certificate
1537
1154
                                           (session))
1538
 
                except (TypeError,
1539
 
                        gnutls.errors.GNUTLSError) as error:
1540
 
                    logger.warning("Bad certificate: %s", error)
 
1155
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1156
                    logger.warning(u"Bad certificate: %s", error)
1541
1157
                    return
1542
 
                logger.debug("Fingerprint: %s", fpr)
1543
 
                
 
1158
                logger.debug(u"Fingerprint: %s", fpr)
 
1159
 
1544
1160
                try:
1545
1161
                    client = ProxyClient(child_pipe, fpr,
1546
1162
                                         self.client_address)
1547
1163
                except KeyError:
1548
1164
                    return
1549
1165
                
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
 
1166
                if client.approved_delay:
 
1167
                    delay = client.approved_delay
1556
1168
                    client.approvals_pending += 1
1557
1169
                    approval_required = True
1558
1170
                
1559
1171
                while True:
1560
1172
                    if not client.enabled:
1561
 
                        logger.info("Client %s is disabled",
 
1173
                        logger.warning(u"Client %s is disabled",
1562
1174
                                       client.name)
1563
1175
                        if self.server.use_dbus:
1564
1176
                            # Emit D-Bus signal
1565
 
                            client.Rejected("Disabled")
 
1177
                            client.Rejected("Disabled")                    
1566
1178
                        return
1567
1179
                    
1568
 
                    if client.approved or not client.approval_delay:
 
1180
                    if client._approved or not client.approved_delay:
1569
1181
                        #We are approved or approval is disabled
1570
1182
                        break
1571
 
                    elif client.approved is None:
1572
 
                        logger.info("Client %s needs approval",
 
1183
                    elif client._approved is None:
 
1184
                        logger.info(u"Client %s need approval",
1573
1185
                                    client.name)
1574
1186
                        if self.server.use_dbus:
1575
1187
                            # Emit D-Bus signal
1576
1188
                            client.NeedApproval(
1577
 
                                client.approval_delay_milliseconds(),
 
1189
                                client.approved_delay_milliseconds(),
1578
1190
                                client.approved_by_default)
1579
1191
                    else:
1580
 
                        logger.warning("Client %s was not approved",
 
1192
                        logger.warning(u"Client %s was not approved",
1581
1193
                                       client.name)
1582
1194
                        if self.server.use_dbus:
1583
1195
                            # Emit D-Bus signal
1584
 
                            client.Rejected("Denied")
 
1196
                            client.Rejected("Disapproved")
1585
1197
                        return
1586
1198
                    
1587
1199
                    #wait until timeout or approved
 
1200
                    #x = float(client._timedelta_to_milliseconds(delay))
1588
1201
                    time = datetime.datetime.now()
1589
1202
                    client.changedstate.acquire()
1590
 
                    (client.changedstate.wait
1591
 
                     (float(client.timedelta_to_milliseconds(delay)
1592
 
                            / 1000)))
 
1203
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1593
1204
                    client.changedstate.release()
1594
1205
                    time2 = datetime.datetime.now()
1595
1206
                    if (time2 - time) >= delay:
1599
1210
                                           client.name)
1600
1211
                            if self.server.use_dbus:
1601
1212
                                # Emit D-Bus signal
1602
 
                                client.Rejected("Approval timed out")
 
1213
                                client.Rejected("Time out")
1603
1214
                            return
1604
1215
                        else:
1605
1216
                            break
1608
1219
                
1609
1220
                sent_size = 0
1610
1221
                while sent_size < len(client.secret):
1611
 
                    try:
1612
 
                        sent = session.send(client.secret[sent_size:])
1613
 
                    except gnutls.errors.GNUTLSError as error:
1614
 
                        logger.warning("gnutls send failed")
1615
 
                        return
1616
 
                    logger.debug("Sent: %d, remaining: %d",
 
1222
                    # XXX handle session exception
 
1223
                    sent = session.send(client.secret[sent_size:])
 
1224
                    logger.debug(u"Sent: %d, remaining: %d",
1617
1225
                                 sent, len(client.secret)
1618
1226
                                 - (sent_size + sent))
1619
1227
                    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)
 
1228
 
 
1229
                logger.info(u"Sending secret to %s", client.name)
 
1230
                # bump the timeout as if seen
 
1231
                client.checked_ok()
1624
1232
                if self.server.use_dbus:
1625
1233
                    # Emit D-Bus signal
1626
1234
                    client.GotSecret()
1628
1236
            finally:
1629
1237
                if approval_required:
1630
1238
                    client.approvals_pending -= 1
1631
 
                try:
1632
 
                    session.bye()
1633
 
                except gnutls.errors.GNUTLSError as error:
1634
 
                    logger.warning("GnuTLS bye failed")
 
1239
                session.bye()
1635
1240
    
1636
1241
    @staticmethod
1637
1242
    def peer_certificate(session):
1647
1252
                     .gnutls_certificate_get_peers
1648
1253
                     (session._c_object, ctypes.byref(list_size)))
1649
1254
        if not bool(cert_list) and list_size.value != 0:
1650
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1651
 
                                            " certificate")
 
1255
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1256
                                            u" certificate")
1652
1257
        if list_size.value == 0:
1653
1258
            return None
1654
1259
        cert = cert_list[0]
1680
1285
        if crtverify.value != 0:
1681
1286
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1682
1287
            raise (gnutls.errors.CertificateSecurityError
1683
 
                   ("Verify failed"))
 
1288
                   (u"Verify failed"))
1684
1289
        # New buffer for the fingerprint
1685
1290
        buf = ctypes.create_string_buffer(20)
1686
1291
        buf_len = ctypes.c_size_t()
1693
1298
        # Convert the buffer to a Python bytestring
1694
1299
        fpr = ctypes.string_at(buf, buf_len.value)
1695
1300
        # Convert the bytestring to hexadecimal notation
1696
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1301
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1697
1302
        return hex_fpr
1698
1303
 
1699
1304
 
1702
1307
    def sub_process_main(self, request, address):
1703
1308
        try:
1704
1309
            self.finish_request(request, address)
1705
 
        except Exception:
 
1310
        except:
1706
1311
            self.handle_error(request, address)
1707
1312
        self.close_request(request)
1708
 
    
 
1313
            
1709
1314
    def process_request(self, request, address):
1710
1315
        """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
 
 
 
1316
        multiprocessing.Process(target = self.sub_process_main,
 
1317
                                args = (request, address)).start()
1717
1318
 
1718
1319
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1719
1320
    """ adds a pipe to the MixIn """
1723
1324
        This function creates a new pipe in self.pipe
1724
1325
        """
1725
1326
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1726
 
        
1727
 
        proc = MultiprocessingMixIn.process_request(self, request,
1728
 
                                                    client_address)
1729
 
        self.child_pipe.close()
1730
 
        self.add_pipe(parent_pipe, proc)
1731
 
    
1732
 
    def add_pipe(self, parent_pipe, proc):
 
1327
 
 
1328
        super(MultiprocessingMixInWithPipe,
 
1329
              self).process_request(request, client_address)
 
1330
        self.add_pipe(parent_pipe)
 
1331
    def add_pipe(self, parent_pipe):
1733
1332
        """Dummy function; override as necessary"""
1734
 
        raise NotImplementedError
1735
 
 
 
1333
        pass
1736
1334
 
1737
1335
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1738
1336
                     socketserver.TCPServer, object):
1756
1354
        bind to an address or port if they were not specified."""
1757
1355
        if self.interface is not None:
1758
1356
            if SO_BINDTODEVICE is None:
1759
 
                logger.error("SO_BINDTODEVICE does not exist;"
1760
 
                             " cannot bind to interface %s",
 
1357
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1358
                             u" cannot bind to interface %s",
1761
1359
                             self.interface)
1762
1360
            else:
1763
1361
                try:
1764
1362
                    self.socket.setsockopt(socket.SOL_SOCKET,
1765
1363
                                           SO_BINDTODEVICE,
1766
1364
                                           str(self.interface
1767
 
                                               + '\0'))
1768
 
                except socket.error as error:
 
1365
                                               + u'\0'))
 
1366
                except socket.error, error:
1769
1367
                    if error[0] == errno.EPERM:
1770
 
                        logger.error("No permission to"
1771
 
                                     " bind to interface %s",
 
1368
                        logger.error(u"No permission to"
 
1369
                                     u" bind to interface %s",
1772
1370
                                     self.interface)
1773
1371
                    elif error[0] == errno.ENOPROTOOPT:
1774
 
                        logger.error("SO_BINDTODEVICE not available;"
1775
 
                                     " cannot bind to interface %s",
 
1372
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1373
                                     u" cannot bind to interface %s",
1776
1374
                                     self.interface)
1777
1375
                    else:
1778
1376
                        raise
1780
1378
        if self.server_address[0] or self.server_address[1]:
1781
1379
            if not self.server_address[0]:
1782
1380
                if self.address_family == socket.AF_INET6:
1783
 
                    any_address = "::" # in6addr_any
 
1381
                    any_address = u"::" # in6addr_any
1784
1382
                else:
1785
1383
                    any_address = socket.INADDR_ANY
1786
1384
                self.server_address = (any_address,
1813
1411
        self.enabled = False
1814
1412
        self.clients = clients
1815
1413
        if self.clients is None:
1816
 
            self.clients = {}
 
1414
            self.clients = set()
1817
1415
        self.use_dbus = use_dbus
1818
1416
        self.gnutls_priority = gnutls_priority
1819
1417
        IPv6_TCPServer.__init__(self, server_address,
1823
1421
    def server_activate(self):
1824
1422
        if self.enabled:
1825
1423
            return socketserver.TCPServer.server_activate(self)
1826
 
    
1827
1424
    def enable(self):
1828
1425
        self.enabled = True
1829
 
    
1830
 
    def add_pipe(self, parent_pipe, proc):
 
1426
    def add_pipe(self, parent_pipe):
1831
1427
        # Call "handle_ipc" for both data and EOF events
1832
1428
        gobject.io_add_watch(parent_pipe.fileno(),
1833
1429
                             gobject.IO_IN | gobject.IO_HUP,
1834
1430
                             functools.partial(self.handle_ipc,
1835
 
                                               parent_pipe =
1836
 
                                               parent_pipe,
1837
 
                                               proc = proc))
1838
 
    
 
1431
                                               parent_pipe = parent_pipe))
 
1432
        
1839
1433
    def handle_ipc(self, source, condition, parent_pipe=None,
1840
 
                   proc = None, client_object=None):
 
1434
                   client_object=None):
1841
1435
        condition_names = {
1842
 
            gobject.IO_IN: "IN",   # There is data to read.
1843
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1436
            gobject.IO_IN: u"IN",   # There is data to read.
 
1437
            gobject.IO_OUT: u"OUT", # Data can be written (without
1844
1438
                                    # 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
 
1439
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1440
            gobject.IO_ERR: u"ERR", # Error condition.
 
1441
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1848
1442
                                    # broken, usually for pipes and
1849
1443
                                    # sockets).
1850
1444
            }
1852
1446
                                       for cond, name in
1853
1447
                                       condition_names.iteritems()
1854
1448
                                       if cond & condition)
1855
 
        # error, or the other end of multiprocessing.Pipe has closed
1856
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1857
 
            # Wait for other process to exit
1858
 
            proc.join()
1859
 
            return False
 
1449
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1450
                     conditions_string)
1860
1451
        
1861
1452
        # Read a request from the child
1862
1453
        request = parent_pipe.recv()
1866
1457
            fpr = request[1]
1867
1458
            address = request[2]
1868
1459
            
1869
 
            for c in self.clients.itervalues():
 
1460
            for c in self.clients:
1870
1461
                if c.fingerprint == fpr:
1871
1462
                    client = c
1872
1463
                    break
1873
1464
            else:
1874
 
                logger.info("Client not found for fingerprint: %s, ad"
1875
 
                            "dress: %s", fpr, address)
 
1465
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1466
                               u"dress: %s", fpr, address)
1876
1467
                if self.use_dbus:
1877
1468
                    # Emit D-Bus signal
1878
 
                    mandos_dbus_service.ClientNotFound(fpr,
1879
 
                                                       address[0])
 
1469
                    mandos_dbus_service.ClientNotFound(fpr, address)
1880
1470
                parent_pipe.send(False)
1881
1471
                return False
1882
1472
            
1883
1473
            gobject.io_add_watch(parent_pipe.fileno(),
1884
1474
                                 gobject.IO_IN | gobject.IO_HUP,
1885
1475
                                 functools.partial(self.handle_ipc,
1886
 
                                                   parent_pipe =
1887
 
                                                   parent_pipe,
1888
 
                                                   proc = proc,
1889
 
                                                   client_object =
1890
 
                                                   client))
 
1476
                                                   parent_pipe = parent_pipe,
 
1477
                                                   client_object = client))
1891
1478
            parent_pipe.send(True)
1892
 
            # remove the old hook in favor of the new above hook on
1893
 
            # same fileno
 
1479
            # remove the old hook in favor of the new above hook on same fileno
1894
1480
            return False
1895
1481
        if command == 'funcall':
1896
1482
            funcname = request[1]
1897
1483
            args = request[2]
1898
1484
            kwargs = request[3]
1899
1485
            
1900
 
            parent_pipe.send(('data', getattr(client_object,
1901
 
                                              funcname)(*args,
1902
 
                                                         **kwargs)))
1903
 
        
 
1486
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1487
 
1904
1488
        if command == 'getattr':
1905
1489
            attrname = request[1]
1906
1490
            if callable(client_object.__getattribute__(attrname)):
1907
1491
                parent_pipe.send(('function',))
1908
1492
            else:
1909
 
                parent_pipe.send(('data', client_object
1910
 
                                  .__getattribute__(attrname)))
1911
 
        
 
1493
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1494
 
1912
1495
        if command == 'setattr':
1913
1496
            attrname = request[1]
1914
1497
            value = request[2]
1915
1498
            setattr(client_object, attrname, value)
1916
 
        
 
1499
            
1917
1500
        return True
1918
1501
 
1919
1502
 
1920
1503
def string_to_delta(interval):
1921
1504
    """Parse a string and return a datetime.timedelta
1922
1505
    
1923
 
    >>> string_to_delta('7d')
 
1506
    >>> string_to_delta(u'7d')
1924
1507
    datetime.timedelta(7)
1925
 
    >>> string_to_delta('60s')
 
1508
    >>> string_to_delta(u'60s')
1926
1509
    datetime.timedelta(0, 60)
1927
 
    >>> string_to_delta('60m')
 
1510
    >>> string_to_delta(u'60m')
1928
1511
    datetime.timedelta(0, 3600)
1929
 
    >>> string_to_delta('24h')
 
1512
    >>> string_to_delta(u'24h')
1930
1513
    datetime.timedelta(1)
1931
 
    >>> string_to_delta('1w')
 
1514
    >>> string_to_delta(u'1w')
1932
1515
    datetime.timedelta(7)
1933
 
    >>> string_to_delta('5m 30s')
 
1516
    >>> string_to_delta(u'5m 30s')
1934
1517
    datetime.timedelta(0, 330)
1935
1518
    """
1936
1519
    timevalue = datetime.timedelta(0)
1938
1521
        try:
1939
1522
            suffix = unicode(s[-1])
1940
1523
            value = int(s[:-1])
1941
 
            if suffix == "d":
 
1524
            if suffix == u"d":
1942
1525
                delta = datetime.timedelta(value)
1943
 
            elif suffix == "s":
 
1526
            elif suffix == u"s":
1944
1527
                delta = datetime.timedelta(0, value)
1945
 
            elif suffix == "m":
 
1528
            elif suffix == u"m":
1946
1529
                delta = datetime.timedelta(0, 0, 0, 0, value)
1947
 
            elif suffix == "h":
 
1530
            elif suffix == u"h":
1948
1531
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1949
 
            elif suffix == "w":
 
1532
            elif suffix == u"w":
1950
1533
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1951
1534
            else:
1952
 
                raise ValueError("Unknown suffix %r" % suffix)
1953
 
        except (ValueError, IndexError) as e:
1954
 
            raise ValueError(*(e.args))
 
1535
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1536
        except (ValueError, IndexError), e:
 
1537
            raise ValueError(e.message)
1955
1538
        timevalue += delta
1956
1539
    return timevalue
1957
1540
 
1958
1541
 
 
1542
def if_nametoindex(interface):
 
1543
    """Call the C function if_nametoindex(), or equivalent
 
1544
    
 
1545
    Note: This function cannot accept a unicode string."""
 
1546
    global if_nametoindex
 
1547
    try:
 
1548
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1549
                          (ctypes.util.find_library(u"c"))
 
1550
                          .if_nametoindex)
 
1551
    except (OSError, AttributeError):
 
1552
        logger.warning(u"Doing if_nametoindex the hard way")
 
1553
        def if_nametoindex(interface):
 
1554
            "Get an interface index the hard way, i.e. using fcntl()"
 
1555
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1556
            with contextlib.closing(socket.socket()) as s:
 
1557
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1558
                                    struct.pack(str(u"16s16x"),
 
1559
                                                interface))
 
1560
            interface_index = struct.unpack(str(u"I"),
 
1561
                                            ifreq[16:20])[0]
 
1562
            return interface_index
 
1563
    return if_nametoindex(interface)
 
1564
 
 
1565
 
1959
1566
def daemon(nochdir = False, noclose = False):
1960
1567
    """See daemon(3).  Standard BSD Unix function.
1961
1568
    
1964
1571
        sys.exit()
1965
1572
    os.setsid()
1966
1573
    if not nochdir:
1967
 
        os.chdir("/")
 
1574
        os.chdir(u"/")
1968
1575
    if os.fork():
1969
1576
        sys.exit()
1970
1577
    if not noclose:
1972
1579
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1973
1580
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1974
1581
            raise OSError(errno.ENODEV,
1975
 
                          "%s not a character device"
 
1582
                          u"%s not a character device"
1976
1583
                          % os.path.devnull)
1977
1584
        os.dup2(null, sys.stdin.fileno())
1978
1585
        os.dup2(null, sys.stdout.fileno())
1986
1593
    ##################################################################
1987
1594
    # Parsing of options, both command line and config file
1988
1595
    
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()
 
1596
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1597
    parser.add_option("-i", u"--interface", type=u"string",
 
1598
                      metavar="IF", help=u"Bind to interface IF")
 
1599
    parser.add_option("-a", u"--address", type=u"string",
 
1600
                      help=u"Address to listen for requests on")
 
1601
    parser.add_option("-p", u"--port", type=u"int",
 
1602
                      help=u"Port number to receive requests on")
 
1603
    parser.add_option("--check", action=u"store_true",
 
1604
                      help=u"Run self-test")
 
1605
    parser.add_option("--debug", action=u"store_true",
 
1606
                      help=u"Debug mode; run in foreground and log to"
 
1607
                      u" terminal")
 
1608
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1609
                      u" priority string (see GnuTLS documentation)")
 
1610
    parser.add_option("--servicename", type=u"string",
 
1611
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1612
    parser.add_option("--configdir", type=u"string",
 
1613
                      default=u"/etc/mandos", metavar=u"DIR",
 
1614
                      help=u"Directory to search for configuration"
 
1615
                      u" files")
 
1616
    parser.add_option("--no-dbus", action=u"store_false",
 
1617
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1618
                      u" system bus interface")
 
1619
    parser.add_option("--no-ipv6", action=u"store_false",
 
1620
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1621
    options = parser.parse_args()[0]
2026
1622
    
2027
1623
    if options.check:
2028
1624
        import doctest
2030
1626
        sys.exit()
2031
1627
    
2032
1628
    # 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"
 
1629
    server_defaults = { u"interface": u"",
 
1630
                        u"address": u"",
 
1631
                        u"port": u"",
 
1632
                        u"debug": u"False",
 
1633
                        u"priority":
 
1634
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1635
                        u"servicename": u"Mandos",
 
1636
                        u"use_dbus": u"True",
 
1637
                        u"use_ipv6": u"True",
2045
1638
                        }
2046
1639
    
2047
1640
    # Parse config file for server-global settings
2048
1641
    server_config = configparser.SafeConfigParser(server_defaults)
2049
1642
    del server_defaults
2050
1643
    server_config.read(os.path.join(options.configdir,
2051
 
                                    "mandos.conf"))
 
1644
                                    u"mandos.conf"))
2052
1645
    # Convert the SafeConfigParser object to a dict
2053
1646
    server_settings = server_config.defaults()
2054
1647
    # 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",
 
1648
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1649
        server_settings[option] = server_config.getboolean(u"DEFAULT",
2057
1650
                                                           option)
2058
1651
    if server_settings["port"]:
2059
 
        server_settings["port"] = server_config.getint("DEFAULT",
2060
 
                                                       "port")
 
1652
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1653
                                                       u"port")
2061
1654
    del server_config
2062
1655
    
2063
1656
    # Override the settings from the config file with command line
2064
1657
    # options, if set.
2065
 
    for option in ("interface", "address", "port", "debug",
2066
 
                   "priority", "servicename", "configdir",
2067
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2068
 
                   "statedir"):
 
1658
    for option in (u"interface", u"address", u"port", u"debug",
 
1659
                   u"priority", u"servicename", u"configdir",
 
1660
                   u"use_dbus", u"use_ipv6"):
2069
1661
        value = getattr(options, option)
2070
1662
        if value is not None:
2071
1663
            server_settings[option] = value
2079
1671
    ##################################################################
2080
1672
    
2081
1673
    # 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":
 
1674
    debug = server_settings[u"debug"]
 
1675
    use_dbus = server_settings[u"use_dbus"]
 
1676
    use_ipv6 = server_settings[u"use_ipv6"]
 
1677
    
 
1678
    if not debug:
 
1679
        syslogger.setLevel(logging.WARNING)
 
1680
        console.setLevel(logging.WARNING)
 
1681
    
 
1682
    if server_settings[u"servicename"] != u"Mandos":
2099
1683
        syslogger.setFormatter(logging.Formatter
2100
 
                               ('Mandos (%s) [%%(process)d]:'
2101
 
                                ' %%(levelname)s: %%(message)s'
2102
 
                                % server_settings["servicename"]))
 
1684
                               (u'Mandos (%s) [%%(process)d]:'
 
1685
                                u' %%(levelname)s: %%(message)s'
 
1686
                                % server_settings[u"servicename"]))
2103
1687
    
2104
1688
    # 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"))
 
1689
    client_defaults = { u"timeout": u"1h",
 
1690
                        u"interval": u"5m",
 
1691
                        u"checker": u"fping -q -- %%(host)s",
 
1692
                        u"host": u"",
 
1693
                        u"approved_delay": u"0s",
 
1694
                        u"approved_duration": u"1s",
 
1695
                        }
 
1696
    client_config = configparser.SafeConfigParser(client_defaults)
 
1697
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1698
                                    u"clients.conf"))
2109
1699
    
2110
1700
    global mandos_dbus_service
2111
1701
    mandos_dbus_service = None
2112
1702
    
2113
 
    tcp_server = MandosServer((server_settings["address"],
2114
 
                               server_settings["port"]),
 
1703
    tcp_server = MandosServer((server_settings[u"address"],
 
1704
                               server_settings[u"port"]),
2115
1705
                              ClientHandler,
2116
 
                              interface=(server_settings["interface"]
2117
 
                                         or None),
 
1706
                              interface=server_settings[u"interface"],
2118
1707
                              use_ipv6=use_ipv6,
2119
1708
                              gnutls_priority=
2120
 
                              server_settings["priority"],
 
1709
                              server_settings[u"priority"],
2121
1710
                              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)
 
1711
    pidfilename = u"/var/run/mandos.pid"
 
1712
    try:
 
1713
        pidfile = open(pidfilename, u"w")
 
1714
    except IOError:
 
1715
        logger.error(u"Could not open file %r", pidfilename)
2128
1716
    
2129
1717
    try:
2130
 
        uid = pwd.getpwnam("_mandos").pw_uid
2131
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1718
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1719
        gid = pwd.getpwnam(u"_mandos").pw_gid
2132
1720
    except KeyError:
2133
1721
        try:
2134
 
            uid = pwd.getpwnam("mandos").pw_uid
2135
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1722
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1723
            gid = pwd.getpwnam(u"mandos").pw_gid
2136
1724
        except KeyError:
2137
1725
            try:
2138
 
                uid = pwd.getpwnam("nobody").pw_uid
2139
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1726
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1727
                gid = pwd.getpwnam(u"nobody").pw_gid
2140
1728
            except KeyError:
2141
1729
                uid = 65534
2142
1730
                gid = 65534
2143
1731
    try:
2144
1732
        os.setgid(gid)
2145
1733
        os.setuid(uid)
2146
 
    except OSError as error:
 
1734
    except OSError, error:
2147
1735
        if error[0] != errno.EPERM:
2148
1736
            raise error
2149
1737
    
 
1738
    # Enable all possible GnuTLS debugging
2150
1739
    if debug:
2151
 
        # Enable all possible GnuTLS debugging
2152
 
        
2153
1740
        # "Use a log level over 10 to enable all debugging options."
2154
1741
        # - GnuTLS manual
2155
1742
        gnutls.library.functions.gnutls_global_set_log_level(11)
2156
1743
        
2157
1744
        @gnutls.library.types.gnutls_log_func
2158
1745
        def debug_gnutls(level, string):
2159
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1746
            logger.debug(u"GnuTLS: %s", string[:-1])
2160
1747
        
2161
1748
        (gnutls.library.functions
2162
1749
         .gnutls_global_set_log_function(debug_gnutls))
2163
 
        
2164
 
        # Redirect stdin so all checkers get /dev/null
2165
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2166
 
        os.dup2(null, sys.stdin.fileno())
2167
 
        if null > 2:
2168
 
            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()
2176
1750
    
2177
1751
    global main_loop
2178
1752
    # From the Avahi example code
2182
1756
    # End of Avahi example code
2183
1757
    if use_dbus:
2184
1758
        try:
2185
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1759
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2186
1760
                                            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")
 
1761
        except dbus.exceptions.NameExistsException, e:
 
1762
            logger.error(unicode(e) + u", disabling D-Bus")
2192
1763
            use_dbus = False
2193
 
            server_settings["use_dbus"] = False
 
1764
            server_settings[u"use_dbus"] = False
2194
1765
            tcp_server.use_dbus = False
2195
1766
    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)
 
1767
    service = AvahiService(name = server_settings[u"servicename"],
 
1768
                           servicetype = u"_mandos._tcp",
 
1769
                           protocol = protocol, bus = bus)
2200
1770
    if server_settings["interface"]:
2201
1771
        service.interface = (if_nametoindex
2202
 
                             (str(server_settings["interface"])))
2203
 
    
2204
 
    global multiprocessing_manager
2205
 
    multiprocessing_manager = multiprocessing.Manager()
 
1772
                             (str(server_settings[u"interface"])))
2206
1773
    
2207
1774
    client_class = Client
2208
1775
    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"]))
 
1776
        client_class = functools.partial(ClientDBus, bus = bus)
 
1777
    def client_config_items(config, section):
 
1778
        special_settings = {
 
1779
            "approved_by_default":
 
1780
                lambda: config.getboolean(section,
 
1781
                                          "approved_by_default"),
 
1782
            }
 
1783
        for name, value in config.items(section):
2277
1784
            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
 
    
 
1785
                yield (name, special_settings[name]())
 
1786
            except KeyError:
 
1787
                yield (name, value)
 
1788
    
 
1789
    tcp_server.clients.update(set(
 
1790
            client_class(name = section,
 
1791
                         config= dict(client_config_items(
 
1792
                        client_config, section)))
 
1793
            for section in client_config.sections()))
2303
1794
    if not tcp_server.clients:
2304
 
        logger.warning("No clients defined")
2305
 
        
 
1795
        logger.warning(u"No clients defined")
 
1796
    
 
1797
    if debug:
 
1798
        # Redirect stdin so all checkers get /dev/null
 
1799
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1800
        os.dup2(null, sys.stdin.fileno())
 
1801
        if null > 2:
 
1802
            os.close(null)
 
1803
    else:
 
1804
        # No console logging
 
1805
        logger.removeHandler(console)
 
1806
        # Close all input and output, do double fork, etc.
 
1807
        daemon()
 
1808
    
 
1809
    try:
 
1810
        with pidfile:
 
1811
            pid = os.getpid()
 
1812
            pidfile.write(str(pid) + "\n")
 
1813
        del pidfile
 
1814
    except IOError:
 
1815
        logger.error(u"Could not write to file %r with PID %d",
 
1816
                     pidfilename, pid)
 
1817
    except NameError:
 
1818
        # "pidfile" was never created
 
1819
        pass
 
1820
    del pidfilename
 
1821
    
2306
1822
    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
1823
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2320
 
    
2321
1824
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2322
1825
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2323
1826
    
2325
1828
        class MandosDBusService(dbus.service.Object):
2326
1829
            """A D-Bus proxy object"""
2327
1830
            def __init__(self):
2328
 
                dbus.service.Object.__init__(self, bus, "/")
2329
 
            _interface = "se.recompile.Mandos"
 
1831
                dbus.service.Object.__init__(self, bus, u"/")
 
1832
            _interface = u"se.bsnet.fukt.Mandos"
2330
1833
            
2331
 
            @dbus.service.signal(_interface, signature="o")
 
1834
            @dbus.service.signal(_interface, signature=u"o")
2332
1835
            def ClientAdded(self, objpath):
2333
1836
                "D-Bus signal"
2334
1837
                pass
2335
1838
            
2336
 
            @dbus.service.signal(_interface, signature="ss")
 
1839
            @dbus.service.signal(_interface, signature=u"ss")
2337
1840
            def ClientNotFound(self, fingerprint, address):
2338
1841
                "D-Bus signal"
2339
1842
                pass
2340
1843
            
2341
 
            @dbus.service.signal(_interface, signature="os")
 
1844
            @dbus.service.signal(_interface, signature=u"os")
2342
1845
            def ClientRemoved(self, objpath, name):
2343
1846
                "D-Bus signal"
2344
1847
                pass
2345
1848
            
2346
 
            @dbus.service.method(_interface, out_signature="ao")
 
1849
            @dbus.service.method(_interface, out_signature=u"ao")
2347
1850
            def GetAllClients(self):
2348
1851
                "D-Bus method"
2349
1852
                return dbus.Array(c.dbus_object_path
2350
 
                                  for c in
2351
 
                                  tcp_server.clients.itervalues())
 
1853
                                  for c in tcp_server.clients)
2352
1854
            
2353
1855
            @dbus.service.method(_interface,
2354
 
                                 out_signature="a{oa{sv}}")
 
1856
                                 out_signature=u"a{oa{sv}}")
2355
1857
            def GetAllClientsWithProperties(self):
2356
1858
                "D-Bus method"
2357
1859
                return dbus.Dictionary(
2358
 
                    ((c.dbus_object_path, c.GetAll(""))
2359
 
                     for c in tcp_server.clients.itervalues()),
2360
 
                    signature="oa{sv}")
 
1860
                    ((c.dbus_object_path, c.GetAll(u""))
 
1861
                     for c in tcp_server.clients),
 
1862
                    signature=u"oa{sv}")
2361
1863
            
2362
 
            @dbus.service.method(_interface, in_signature="o")
 
1864
            @dbus.service.method(_interface, in_signature=u"o")
2363
1865
            def RemoveClient(self, object_path):
2364
1866
                "D-Bus method"
2365
 
                for c in tcp_server.clients.itervalues():
 
1867
                for c in tcp_server.clients:
2366
1868
                    if c.dbus_object_path == object_path:
2367
 
                        del tcp_server.clients[c.name]
 
1869
                        tcp_server.clients.remove(c)
2368
1870
                        c.remove_from_connection()
2369
1871
                        # Don't signal anything except ClientRemoved
2370
1872
                        c.disable(quiet=True)
2375
1877
            
2376
1878
            del _interface
2377
1879
        
2378
 
        class MandosDBusServiceTransitional(MandosDBusService):
2379
 
            __metaclass__ = AlternateDBusNamesMetaclass
2380
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1880
        mandos_dbus_service = MandosDBusService()
2381
1881
    
2382
1882
    def cleanup():
2383
1883
        "Cleanup function; run on exit"
2384
1884
        service.cleanup()
2385
1885
        
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
1886
        while tcp_server.clients:
2440
 
            name, client = tcp_server.clients.popitem()
 
1887
            client = tcp_server.clients.pop()
2441
1888
            if use_dbus:
2442
1889
                client.remove_from_connection()
 
1890
            client.disable_hook = None
2443
1891
            # Don't signal anything except ClientRemoved
2444
1892
            client.disable(quiet=True)
2445
1893
            if use_dbus:
2446
1894
                # Emit D-Bus signal
2447
 
                mandos_dbus_service.ClientRemoved(client
2448
 
                                                  .dbus_object_path,
 
1895
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2449
1896
                                                  client.name)
2450
 
        client_settings.clear()
2451
1897
    
2452
1898
    atexit.register(cleanup)
2453
1899
    
2454
 
    for client in tcp_server.clients.itervalues():
 
1900
    for client in tcp_server.clients:
2455
1901
        if use_dbus:
2456
1902
            # Emit D-Bus signal
2457
1903
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2458
 
        # Need to initiate checking of clients
2459
 
        if client.enabled:
2460
 
            client.init_checker()
 
1904
        client.enable()
2461
1905
    
2462
1906
    tcp_server.enable()
2463
1907
    tcp_server.server_activate()
2465
1909
    # Find out what port we got
2466
1910
    service.port = tcp_server.socket.getsockname()[1]
2467
1911
    if use_ipv6:
2468
 
        logger.info("Now listening on address %r, port %d,"
 
1912
        logger.info(u"Now listening on address %r, port %d,"
2469
1913
                    " flowinfo %d, scope_id %d"
2470
1914
                    % tcp_server.socket.getsockname())
2471
1915
    else:                       # IPv4
2472
 
        logger.info("Now listening on address %r, port %d"
 
1916
        logger.info(u"Now listening on address %r, port %d"
2473
1917
                    % tcp_server.socket.getsockname())
2474
1918
    
2475
1919
    #service.interface = tcp_server.socket.getsockname()[3]
2478
1922
        # From the Avahi example code
2479
1923
        try:
2480
1924
            service.activate()
2481
 
        except dbus.exceptions.DBusException as error:
2482
 
            logger.critical("DBusException: %s", error)
 
1925
        except dbus.exceptions.DBusException, error:
 
1926
            logger.critical(u"DBusException: %s", error)
2483
1927
            cleanup()
2484
1928
            sys.exit(1)
2485
1929
        # End of Avahi example code
2489
1933
                             (tcp_server.handle_request
2490
1934
                              (*args[2:], **kwargs) or True))
2491
1935
        
2492
 
        logger.debug("Starting main loop")
 
1936
        logger.debug(u"Starting main loop")
2493
1937
        main_loop.run()
2494
 
    except AvahiError as error:
2495
 
        logger.critical("AvahiError: %s", error)
 
1938
    except AvahiError, error:
 
1939
        logger.critical(u"AvahiError: %s", error)
2496
1940
        cleanup()
2497
1941
        sys.exit(1)
2498
1942
    except KeyboardInterrupt:
2499
1943
        if debug:
2500
 
            print("", file=sys.stderr)
2501
 
        logger.debug("Server received KeyboardInterrupt")
2502
 
    logger.debug("Server exiting")
 
1944
            print >> sys.stderr
 
1945
        logger.debug(u"Server received KeyboardInterrupt")
 
1946
    logger.debug(u"Server exiting")
2503
1947
    # Must run before the D-Bus bus name gets deregistered
2504
1948
    cleanup()
2505
1949