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