/mandos/trunk

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