/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-04-16 06:47:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416064728-c3d36mvgxo5q9aoh
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
          as "configparser".  All users changed.

Show diffs side-by-side

added added

removed removed

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