/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-09-17 11:42:12 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090917114212-bmb2eq0c3modtgme
* TODO: Updated.

Show diffs side-by-side

added added

removed removed

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