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