/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
660
        # did that, then if a checker (for some reason) started
661
        # running slowly and taking more than 'interval' time, the
662
        # client would inevitably timeout, since no checker would get
663
        # a chance to run to completion.  If we instead leave running
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(
982
                    itertools.chain(
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
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1025
                                  .__metaclass__):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1026
    """Applied to an empty subclass of a D-Bus object, this metaclass
1027
    will add additional D-Bus attributes matching a certain pattern.
1028
    """
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1029
    def __new__(mcs, name, bases, attr):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1030
        # Go through all the base classes which could have D-Bus
1031
        # methods, signals, or properties in them
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1032
        old_interface_names = []
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1033
        for base in (b for b in bases
1034
                     if issubclass(b, dbus.service.Object)):
1035
            # Go though all attributes of the base class
1036
            for attrname, attribute in inspect.getmembers(base):
1037
                # Ignore non-D-Bus attributes, and D-Bus attributes
1038
                # with the wrong interface name
1039
                if (not hasattr(attribute, "_dbus_interface")
1040
                    or not attribute._dbus_interface
1041
                    .startswith("se.recompile.Mandos")):
1042
                    continue
1043
                # Create an alternate D-Bus interface name based on
1044
                # the current name
1045
                alt_interface = (attribute._dbus_interface
1046
                                 .replace("se.recompile.Mandos",
1047
                                          "se.bsnet.fukt.Mandos"))
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1048
                if alt_interface != attribute._dbus_interface:
1049
                    old_interface_names.append(alt_interface)
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1050
                # Is this a D-Bus signal?
1051
                if getattr(attribute, "_dbus_is_signal", False):
1052
                    # Extract the original non-method function by
1053
                    # black magic
1054
                    nonmethod_func = (dict(
1055
                            zip(attribute.func_code.co_freevars,
1056
                                attribute.__closure__))["func"]
1057
                                      .cell_contents)
1058
                    # Create a new, but exactly alike, function
1059
                    # object, and decorate it to be a new D-Bus signal
1060
                    # with the alternate D-Bus interface name
1061
                    new_function = (dbus.service.signal
1062
                                    (alt_interface,
1063
                                     attribute._dbus_signature)
1064
                                    (types.FunctionType(
1065
                                nonmethod_func.func_code,
1066
                                nonmethod_func.func_globals,
1067
                                nonmethod_func.func_name,
1068
                                nonmethod_func.func_defaults,
1069
                                nonmethod_func.func_closure)))
561.1.1 by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties.
1070
                    # Copy annotations, if any
1071
                    try:
1072
                        new_function._dbus_annotations = (
1073
                            dict(attribute._dbus_annotations))
1074
                    except AttributeError:
1075
                        pass
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1076
                    # Define a creator of a function to call both the
1077
                    # old and new functions, so both the old and new
1078
                    # signals gets sent when the function is called
1079
                    def fixscope(func1, func2):
1080
                        """This function is a scope container to pass
1081
                        func1 and func2 to the "call_both" function
1082
                        outside of its arguments"""
1083
                        def call_both(*args, **kwargs):
1084
                            """This function will emit two D-Bus
1085
                            signals by calling func1 and func2"""
1086
                            func1(*args, **kwargs)
1087
                            func2(*args, **kwargs)
1088
                        return call_both
1089
                    # Create the "call_both" function and add it to
1090
                    # the class
1091
                    attr[attrname] = fixscope(attribute,
1092
                                              new_function)
1093
                # Is this a D-Bus method?
1094
                elif getattr(attribute, "_dbus_is_method", False):
1095
                    # Create a new, but exactly alike, function
1096
                    # object.  Decorate it to be a new D-Bus method
1097
                    # with the alternate D-Bus interface name.  Add it
1098
                    # to the class.
1099
                    attr[attrname] = (dbus.service.method
1100
                                      (alt_interface,
1101
                                       attribute._dbus_in_signature,
1102
                                       attribute._dbus_out_signature)
1103
                                      (types.FunctionType
1104
                                       (attribute.func_code,
1105
                                        attribute.func_globals,
1106
                                        attribute.func_name,
1107
                                        attribute.func_defaults,
1108
                                        attribute.func_closure)))
561.1.1 by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties.
1109
                    # Copy annotations, if any
1110
                    try:
1111
                        attr[attrname]._dbus_annotations = (
1112
                            dict(attribute._dbus_annotations))
1113
                    except AttributeError:
1114
                        pass
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1115
                # Is this a D-Bus property?
1116
                elif getattr(attribute, "_dbus_is_property", False):
1117
                    # Create a new, but exactly alike, function
1118
                    # object, and decorate it to be a new D-Bus
1119
                    # property with the alternate D-Bus interface
1120
                    # name.  Add it to the class.
1121
                    attr[attrname] = (dbus_service_property
1122
                                      (alt_interface,
1123
                                       attribute._dbus_signature,
1124
                                       attribute._dbus_access,
1125
                                       attribute
1126
                                       ._dbus_get_args_options
1127
                                       ["byte_arrays"])
1128
                                      (types.FunctionType
1129
                                       (attribute.func_code,
1130
                                        attribute.func_globals,
1131
                                        attribute.func_name,
1132
                                        attribute.func_defaults,
1133
                                        attribute.func_closure)))
561.1.1 by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties.
1134
                    # Copy annotations, if any
1135
                    try:
1136
                        attr[attrname]._dbus_annotations = (
1137
                            dict(attribute._dbus_annotations))
1138
                    except AttributeError:
1139
                        pass
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1140
                # Is this a D-Bus interface?
1141
                elif getattr(attribute, "_dbus_is_interface", False):
1142
                    # Create a new, but exactly alike, function
1143
                    # object.  Decorate it to be a new D-Bus interface
1144
                    # with the alternate D-Bus interface name.  Add it
1145
                    # to the class.
1146
                    attr[attrname] = (dbus_interface_annotations
1147
                                      (alt_interface)
1148
                                      (types.FunctionType
1149
                                       (attribute.func_code,
1150
                                        attribute.func_globals,
1151
                                        attribute.func_name,
1152
                                        attribute.func_defaults,
1153
                                        attribute.func_closure)))
1154
        # Deprecate all old interfaces
573 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
1155
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1156
        for old_interface_name in old_interface_names:
1157
            @dbus_interface_annotations(old_interface_name)
1158
            def func(self):
1159
                return { "org.freedesktop.DBus.Deprecated": "true" }
1160
            # Find an unused name
573 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
1161
            for aname in (iname.format(i) for i in itertools.count()):
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1162
                if aname not in attr:
1163
                    attr[aname] = func
1164
                    break
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1165
        return type.__new__(mcs, name, bases, attr)
1166
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1167
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1168
class ClientDBus(Client, DBusObjectWithProperties):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1169
    """A Client class using D-Bus
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1170
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1171
    Attributes:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1172
    dbus_object_path: dbus.ObjectPath
1173
    bus: dbus.SystemBus()
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1174
    """
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
1175
    
1176
    runtime_expansions = (Client.runtime_expansions
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1177
                          + ("dbus_object_path",))
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
1178
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1179
    # dbus.service.Object doesn't use super(), so we can't either.
1180
    
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1181
    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
1182
        self.bus = bus
1183
        Client.__init__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1184
        # Only now, when this client is initialized, can it show up on
1185
        # the D-Bus
441 by Teddy Hogeborn
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
1186
        client_object_name = unicode(self.name).translate(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1187
            {ord("."): ord("_"),
1188
             ord("-"): ord("_")})
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1189
        self.dbus_object_path = (dbus.ObjectPath
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1190
                                 ("/clients/" + client_object_name))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1191
        DBusObjectWithProperties.__init__(self, self.bus,
1192
                                          self.dbus_object_path)
573 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
1193
    
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1194
    def notifychangeproperty(transform_func,
1195
                             dbus_name, type_func=lambda x: x,
1196
                             variant_level=1):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1197
        """ Modify a variable so that it's a property which announces
1198
        its changes to DBus.
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1199
        
505.1.15 by Teddy Hogeborn
Bug fix: Make D-Bus properties settable again.
1200
        transform_fun: Function that takes a value and a variant_level
1201
                       and transforms it to a D-Bus type.
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1202
        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
1203
        type_func: Function that transform the value before sending it
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1204
                   to the D-Bus.  Default: no transform
1205
        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
1206
        """
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1207
        attrname = "_{0}".format(dbus_name)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1208
        def setter(self, value):
1209
            if hasattr(self, "dbus_object_path"):
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1210
                if (not hasattr(self, attrname) or
1211
                    type_func(getattr(self, attrname, None))
1212
                    != type_func(value)):
1213
                    dbus_value = transform_func(type_func(value),
505.1.15 by Teddy Hogeborn
Bug fix: Make D-Bus properties settable again.
1214
                                                variant_level
1215
                                                =variant_level)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1216
                    self.PropertyChanged(dbus.String(dbus_name),
1217
                                         dbus_value)
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1218
            setattr(self, attrname, value)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1219
        
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1220
        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
1221
    
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1222
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1223
    approvals_pending = notifychangeproperty(dbus.Boolean,
1224
                                             "ApprovalPending",
1225
                                             type_func = bool)
1226
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1227
    last_enabled = notifychangeproperty(datetime_to_dbus,
1228
                                        "LastEnabled")
1229
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1230
                                   type_func = lambda checker:
1231
                                       checker is not None)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1232
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1233
                                           "LastCheckedOK")
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1234
    last_checker_status = notifychangeproperty(dbus.Int16,
1235
                                               "LastCheckerStatus")
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1236
    last_approval_request = notifychangeproperty(
1237
        datetime_to_dbus, "LastApprovalRequest")
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1238
    approved_by_default = notifychangeproperty(dbus.Boolean,
1239
                                               "ApprovedByDefault")
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
1240
    approval_delay = notifychangeproperty(dbus.UInt64,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1241
                                          "ApprovalDelay",
1242
                                          type_func =
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1243
                                          timedelta_to_milliseconds)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1244
    approval_duration = notifychangeproperty(
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
1245
        dbus.UInt64, "ApprovalDuration",
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1246
        type_func = timedelta_to_milliseconds)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1247
    host = notifychangeproperty(dbus.String, "Host")
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
1248
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1249
                                   type_func =
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1250
                                   timedelta_to_milliseconds)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1251
    extended_timeout = notifychangeproperty(
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
1252
        dbus.UInt64, "ExtendedTimeout",
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1253
        type_func = timedelta_to_milliseconds)
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
1254
    interval = notifychangeproperty(dbus.UInt64,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1255
                                    "Interval",
1256
                                    type_func =
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1257
                                    timedelta_to_milliseconds)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1258
    checker_command = notifychangeproperty(dbus.String, "Checker")
1259
    
1260
    del notifychangeproperty
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1261
    
1262
    def __del__(self, *args, **kwargs):
1263
        try:
1264
            self.remove_from_connection()
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
1265
        except LookupError:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1266
            pass
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1267
        if hasattr(DBusObjectWithProperties, "__del__"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1268
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1269
        Client.__del__(self, *args, **kwargs)
1270
    
1271
    def checker_callback(self, pid, condition, command,
1272
                         *args, **kwargs):
1273
        self.checker_callback_tag = None
1274
        self.checker = None
1275
        if os.WIFEXITED(condition):
1276
            exitstatus = os.WEXITSTATUS(condition)
1277
            # Emit D-Bus signal
1278
            self.CheckerCompleted(dbus.Int16(exitstatus),
1279
                                  dbus.Int64(condition),
1280
                                  dbus.String(command))
1281
        else:
1282
            # Emit D-Bus signal
1283
            self.CheckerCompleted(dbus.Int16(-1),
1284
                                  dbus.Int64(condition),
1285
                                  dbus.String(command))
1286
        
1287
        return Client.checker_callback(self, pid, condition, command,
1288
                                       *args, **kwargs)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1289
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1290
    def start_checker(self, *args, **kwargs):
1291
        old_checker = self.checker
1292
        if self.checker is not None:
1293
            old_checker_pid = self.checker.pid
1294
        else:
1295
            old_checker_pid = None
1296
        r = Client.start_checker(self, *args, **kwargs)
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
1297
        # Only if new checker process was started
1298
        if (self.checker is not None
1299
            and old_checker_pid != self.checker.pid):
1300
            # Emit D-Bus signal
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1301
            self.CheckerStarted(self.current_checker_command)
1302
        return r
1303
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1304
    def _reset_approved(self):
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1305
        self.approved = None
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1306
        return False
1307
    
1308
    def approve(self, value=True):
24.1.154 by Björn Påhlsson
merge
1309
        self.send_changedstate()
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1310
        self.approved = value
1311
        gobject.timeout_add(timedelta_to_milliseconds
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1312
                            (self.approval_duration),
24.1.154 by Björn Påhlsson
merge
1313
                            self._reset_approved)
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
1314
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1315
    ## D-Bus methods, signals & properties
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1316
    _interface = "se.recompile.Mandos.Client"
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1317
    
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
1318
    ## Interfaces
1319
    
1320
    @dbus_interface_annotations(_interface)
1321
    def _foo(self):
1322
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
                     "false"}
1324
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1325
    ## Signals
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1326
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1327
    # CheckerCompleted - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1328
    @dbus.service.signal(_interface, signature="nxs")
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
1329
    def CheckerCompleted(self, exitcode, waitstatus, command):
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1330
        "D-Bus signal"
1331
        pass
1332
    
1333
    # CheckerStarted - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1334
    @dbus.service.signal(_interface, signature="s")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1335
    def CheckerStarted(self, command):
1336
        "D-Bus signal"
1337
        pass
1338
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1339
    # PropertyChanged - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1340
    @dbus.service.signal(_interface, signature="sv")
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1341
    def PropertyChanged(self, property, value):
1342
        "D-Bus signal"
1343
        pass
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1344
    
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
1345
    # GotSecret - signal
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1346
    @dbus.service.signal(_interface)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
1347
    def GotSecret(self):
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1348
        """D-Bus signal
1349
        Is sent after a successful transfer of secret from the Mandos
1350
        server to mandos-client
1351
        """
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1352
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1353
    
1354
    # Rejected - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1355
    @dbus.service.signal(_interface, signature="s")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1356
    def Rejected(self, reason):
1357
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1358
        pass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1359
    
1360
    # NeedApproval - signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1361
    @dbus.service.signal(_interface, signature="tb")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1362
    def NeedApproval(self, timeout, default):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1363
        "D-Bus signal"
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1364
        return self.need_approval()
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1365
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1366
    ## Methods
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1367
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1368
    # Approve - method
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1369
    @dbus.service.method(_interface, in_signature="b")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1370
    def Approve(self, value):
1371
        self.approve(value)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1372
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1373
    # CheckedOK - method
1374
    @dbus.service.method(_interface)
1375
    def CheckedOK(self):
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1376
        self.checked_ok()
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1377
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1378
    # Enable - method
1379
    @dbus.service.method(_interface)
1380
    def Enable(self):
1381
        "D-Bus method"
1382
        self.enable()
1383
    
1384
    # StartChecker - method
1385
    @dbus.service.method(_interface)
1386
    def StartChecker(self):
1387
        "D-Bus method"
1388
        self.start_checker()
1389
    
1390
    # Disable - method
1391
    @dbus.service.method(_interface)
1392
    def Disable(self):
1393
        "D-Bus method"
1394
        self.disable()
1395
    
1396
    # StopChecker - method
1397
    @dbus.service.method(_interface)
1398
    def StopChecker(self):
1399
        self.stop_checker()
1400
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1401
    ## Properties
1402
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1403
    # ApprovalPending - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1404
    @dbus_service_property(_interface, signature="b", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1405
    def ApprovalPending_dbus_property(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1406
        return dbus.Boolean(bool(self.approvals_pending))
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1407
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1408
    # ApprovedByDefault - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1409
    @dbus_service_property(_interface, signature="b",
1410
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1411
    def ApprovedByDefault_dbus_property(self, value=None):
1412
        if value is None:       # get
1413
            return dbus.Boolean(self.approved_by_default)
1414
        self.approved_by_default = bool(value)
1415
    
1416
    # ApprovalDelay - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1417
    @dbus_service_property(_interface, signature="t",
1418
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1419
    def ApprovalDelay_dbus_property(self, value=None):
1420
        if value is None:       # get
1421
            return dbus.UInt64(self.approval_delay_milliseconds())
1422
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1423
    
1424
    # ApprovalDuration - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1425
    @dbus_service_property(_interface, signature="t",
1426
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1427
    def ApprovalDuration_dbus_property(self, value=None):
1428
        if value is None:       # get
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1429
            return dbus.UInt64(timedelta_to_milliseconds(
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1430
                    self.approval_duration))
1431
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
    
1433
    # Name - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1434
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1435
    def Name_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1436
        return dbus.String(self.name)
1437
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1438
    # Fingerprint - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1439
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1440
    def Fingerprint_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1441
        return dbus.String(self.fingerprint)
1442
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1443
    # Host - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1444
    @dbus_service_property(_interface, signature="s",
1445
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1446
    def Host_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1447
        if value is None:       # get
1448
            return dbus.String(self.host)
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
1449
        self.host = unicode(value)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1450
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1451
    # Created - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1452
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1453
    def Created_dbus_property(self):
518.2.3 by Teddy Hogeborn
Make "enabled" a client config option.
1454
        return datetime_to_dbus(self.created)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1455
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1456
    # LastEnabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1457
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1458
    def LastEnabled_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1459
        return datetime_to_dbus(self.last_enabled)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1460
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1461
    # Enabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1462
    @dbus_service_property(_interface, signature="b",
1463
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1464
    def Enabled_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1465
        if value is None:       # get
1466
            return dbus.Boolean(self.enabled)
1467
        if value:
1468
            self.enable()
1469
        else:
1470
            self.disable()
1471
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1472
    # LastCheckedOK - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1473
    @dbus_service_property(_interface, signature="s",
1474
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1475
    def LastCheckedOK_dbus_property(self, value=None):
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1476
        if value is not None:
1477
            self.checked_ok()
1478
            return
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1479
        return datetime_to_dbus(self.last_checked_ok)
24.1.179 by Björn Påhlsson
New feature:
1480
    
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1481
    # LastCheckerStatus - property
1482
    @dbus_service_property(_interface, signature="n",
1483
                           access="read")
1484
    def LastCheckerStatus_dbus_property(self):
1485
        return dbus.Int16(self.last_checker_status)
1486
    
24.1.179 by Björn Påhlsson
New feature:
1487
    # Expires - property
1488
    @dbus_service_property(_interface, signature="s", access="read")
1489
    def Expires_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1490
        return datetime_to_dbus(self.expires)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1491
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1492
    # LastApprovalRequest - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1493
    @dbus_service_property(_interface, signature="s", access="read")
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1494
    def LastApprovalRequest_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1495
        return datetime_to_dbus(self.last_approval_request)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1496
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1497
    # Timeout - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1498
    @dbus_service_property(_interface, signature="t",
1499
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1500
    def Timeout_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1501
        if value is None:       # get
1502
            return dbus.UInt64(self.timeout_milliseconds())
1503
        self.timeout = datetime.timedelta(0, 0, 0, value)
1504
        # Reschedule timeout
543 by Teddy Hogeborn
* mandos: Break some long lines.
1505
        if self.enabled:
1506
            now = datetime.datetime.utcnow()
1507
            time_to_die = timedelta_to_milliseconds(
1508
                (self.last_checked_ok + self.timeout) - now)
1509
            if time_to_die <= 0:
1510
                # The timeout has passed
1511
                self.disable()
1512
            else:
1513
                self.expires = (now +
1514
                                datetime.timedelta(milliseconds =
1515
                                                   time_to_die))
1516
                if (getattr(self, "disable_initiator_tag", None)
1517
                    is None):
1518
                    return
1519
                gobject.source_remove(self.disable_initiator_tag)
1520
                self.disable_initiator_tag = (gobject.timeout_add
1521
                                              (time_to_die,
1522
                                               self.disable))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1523
    
24.1.179 by Björn Påhlsson
New feature:
1524
    # ExtendedTimeout - property
1525
    @dbus_service_property(_interface, signature="t",
1526
                           access="readwrite")
1527
    def ExtendedTimeout_dbus_property(self, value=None):
1528
        if value is None:       # get
1529
            return dbus.UInt64(self.extended_timeout_milliseconds())
1530
        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
1531
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1532
    # Interval - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1533
    @dbus_service_property(_interface, signature="t",
1534
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1535
    def Interval_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1536
        if value is None:       # get
1537
            return dbus.UInt64(self.interval_milliseconds())
1538
        self.interval = datetime.timedelta(0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1539
        if getattr(self, "checker_initiator_tag", None) is None:
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1540
            return
518.2.3 by Teddy Hogeborn
Make "enabled" a client config option.
1541
        if self.enabled:
1542
            # Reschedule checker run
1543
            gobject.source_remove(self.checker_initiator_tag)
1544
            self.checker_initiator_tag = (gobject.timeout_add
1545
                                          (value, self.start_checker))
1546
            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
1547
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1548
    # Checker - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1549
    @dbus_service_property(_interface, signature="s",
1550
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1551
    def Checker_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1552
        if value is None:       # get
1553
            return dbus.String(self.checker_command)
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
1554
        self.checker_command = unicode(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1555
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1556
    # CheckerRunning - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1557
    @dbus_service_property(_interface, signature="b",
1558
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1559
    def CheckerRunning_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1560
        if value is None:       # get
1561
            return dbus.Boolean(self.checker is not None)
1562
        if value:
1563
            self.start_checker()
1564
        else:
1565
            self.stop_checker()
1566
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1567
    # ObjectPath - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1568
    @dbus_service_property(_interface, signature="o", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1569
    def ObjectPath_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1570
        return self.dbus_object_path # is already a dbus.ObjectPath
1571
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1572
    # Secret = property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1573
    @dbus_service_property(_interface, signature="ay",
1574
                           access="write", byte_arrays=True)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1575
    def Secret_dbus_property(self, value):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1576
        self.secret = str(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1577
    
1578
    del _interface
3 by Björn Påhlsson
Python based server
1579
1580
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1581
class ProxyClient(object):
1582
    def __init__(self, child_pipe, fpr, address):
1583
        self._pipe = child_pipe
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1584
        self._pipe.send(('init', fpr, address))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1585
        if not self._pipe.recv():
1586
            raise KeyError()
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1587
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1588
    def __getattribute__(self, name):
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1589
        if name == '_pipe':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1590
            return super(ProxyClient, self).__getattribute__(name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1591
        self._pipe.send(('getattr', name))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1592
        data = self._pipe.recv()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1593
        if data[0] == 'data':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1594
            return data[1]
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1595
        if data[0] == 'function':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1596
            def func(*args, **kwargs):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1597
                self._pipe.send(('funcall', name, args, kwargs))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1598
                return self._pipe.recv()[1]
1599
            return func
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1600
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1601
    def __setattr__(self, name, value):
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1602
        if name == '_pipe':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1603
            return super(ProxyClient, self).__setattr__(name, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1604
        self._pipe.send(('setattr', name, value))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1605
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1606
24.1.186 by Björn Påhlsson
transitional stuff actually working
1607
class ClientDBusTransitional(ClientDBus):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1608
    __metaclass__ = AlternateDBusNamesMetaclass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1609
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1610
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1612
    """A class to handle client connections.
1613
    
1614
    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
1615
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1616
    
3 by Björn Påhlsson
Python based server
1617
    def handle(self):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1618
        with contextlib.closing(self.server.child_pipe) as child_pipe:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1619
            logger.info("TCP connection from: %s",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1620
                        unicode(self.client_address))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1621
            logger.debug("Pipe FD: %d",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1622
                         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
1623
            
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1624
            session = (gnutls.connection
1625
                       .ClientSession(self.request,
1626
                                      gnutls.connection
1627
                                      .X509Credentials()))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1628
            
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1629
            # Note: gnutls.connection.X509Credentials is really a
1630
            # generic GnuTLS certificate credentials object so long as
1631
            # no X.509 keys are added to it.  Therefore, we can use it
1632
            # 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
1633
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1634
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
            #                      "+AES-256-CBC", "+SHA1",
1636
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1637
            #                      "+DHE-DSS"))
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1638
            # Use a fallback default, since this MUST be set.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1639
            priority = self.server.gnutls_priority
1640
            if priority is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1641
                priority = "NORMAL"
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1642
            (gnutls.library.functions
1643
             .gnutls_priority_set_direct(session._c_object,
1644
                                         priority, None))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1645
            
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1646
            # Start communication using the Mandos protocol
1647
            # Get protocol number
1648
            line = self.request.makefile().readline()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1649
            logger.debug("Protocol version: %r", line)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1650
            try:
1651
                if int(line.strip().split()[0]) > 1:
1652
                    raise RuntimeError
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1653
            except (ValueError, IndexError, RuntimeError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1654
                logger.error("Unknown protocol version: %s", error)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1655
                return
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1656
            
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1657
            # Start GnuTLS connection
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1658
            try:
1659
                session.handshake()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1660
            except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1661
                logger.warning("Handshake failed: %s", error)
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1662
                # Do not run session.bye() here: the session is not
1663
                # established.  Just abandon the request.
1664
                return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1665
            logger.debug("Handshake succeeded")
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1666
            
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1667
            approval_required = False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1668
            try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1669
                try:
1670
                    fpr = self.fingerprint(self.peer_certificate
1671
                                           (session))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1672
                except (TypeError,
1673
                        gnutls.errors.GNUTLSError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1674
                    logger.warning("Bad certificate: %s", error)
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1675
                    return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1676
                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
1677
                
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1678
                try:
1679
                    client = ProxyClient(child_pipe, fpr,
1680
                                         self.client_address)
1681
                except KeyError:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1682
                    return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1683
                
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1684
                if client.approval_delay:
1685
                    delay = client.approval_delay
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1686
                    client.approvals_pending += 1
1687
                    approval_required = True
1688
                
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1689
                while True:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1690
                    if not client.enabled:
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1691
                        logger.info("Client %s is disabled",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1692
                                       client.name)
1693
                        if self.server.use_dbus:
1694
                            # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1695
                            client.Rejected("Disabled")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1696
                        return
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1697
                    
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1698
                    if client.approved or not client.approval_delay:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1699
                        #We are approved or approval is disabled
1700
                        break
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1701
                    elif client.approved is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1702
                        logger.info("Client %s needs approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1703
                                    client.name)
1704
                        if self.server.use_dbus:
1705
                            # Emit D-Bus signal
1706
                            client.NeedApproval(
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1707
                                client.approval_delay_milliseconds(),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1708
                                client.approved_by_default)
1709
                    else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1710
                        logger.warning("Client %s was not approved",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1711
                                       client.name)
1712
                        if self.server.use_dbus:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1713
                            # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1714
                            client.Rejected("Denied")
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1715
                        return
1716
                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1717
                    #wait until timeout or approved
1718
                    time = datetime.datetime.now()
1719
                    client.changedstate.acquire()
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1720
                    (client.changedstate.wait
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1721
                     (float(client.timedelta_to_milliseconds(delay)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1722
                            / 1000)))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1723
                    client.changedstate.release()
1724
                    time2 = datetime.datetime.now()
1725
                    if (time2 - time) >= delay:
1726
                        if not client.approved_by_default:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1727
                            logger.warning("Client %s timed out while"
1728
                                           " waiting for approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1729
                                           client.name)
1730
                            if self.server.use_dbus:
1731
                                # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1732
                                client.Rejected("Approval timed out")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1733
                            return
1734
                        else:
1735
                            break
1736
                    else:
1737
                        delay -= time2 - time
1738
                
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1739
                sent_size = 0
1740
                while sent_size < len(client.secret):
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1741
                    try:
1742
                        sent = session.send(client.secret[sent_size:])
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1743
                    except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1744
                        logger.warning("gnutls send failed")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1745
                        return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1746
                    logger.debug("Sent: %d, remaining: %d",
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1747
                                 sent, len(client.secret)
1748
                                 - (sent_size + sent))
1749
                    sent_size += sent
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1750
                
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1751
                logger.info("Sending secret to %s", client.name)
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1752
                # bump the timeout using extended_timeout
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1753
                client.bump_timeout(client.extended_timeout)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1754
                if self.server.use_dbus:
1755
                    # Emit D-Bus signal
1756
                    client.GotSecret()
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1757
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1758
            finally:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1759
                if approval_required:
1760
                    client.approvals_pending -= 1
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1761
                try:
1762
                    session.bye()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1763
                except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1764
                    logger.warning("GnuTLS bye failed")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1765
    
1766
    @staticmethod
1767
    def peer_certificate(session):
1768
        "Return the peer's OpenPGP certificate as a bytestring"
1769
        # If not an OpenPGP certificate...
1770
        if (gnutls.library.functions
1771
            .gnutls_certificate_type_get(session._c_object)
1772
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
            # ...do the normal thing
1774
            return session.peer_certificate
1775
        list_size = ctypes.c_uint(1)
1776
        cert_list = (gnutls.library.functions
1777
                     .gnutls_certificate_get_peers
1778
                     (session._c_object, ctypes.byref(list_size)))
1779
        if not bool(cert_list) and list_size.value != 0:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1780
            raise gnutls.errors.GNUTLSError("error getting peer"
1781
                                            " certificate")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1782
        if list_size.value == 0:
1783
            return None
1784
        cert = cert_list[0]
1785
        return ctypes.string_at(cert.data, cert.size)
1786
    
1787
    @staticmethod
1788
    def fingerprint(openpgp):
1789
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
        # New GnuTLS "datum" with the OpenPGP public key
1791
        datum = (gnutls.library.types
1792
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1793
                                             ctypes.POINTER
1794
                                             (ctypes.c_ubyte)),
1795
                                 ctypes.c_uint(len(openpgp))))
1796
        # New empty GnuTLS certificate
1797
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
        (gnutls.library.functions
1799
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1800
        # Import the OpenPGP public key into the certificate
1801
        (gnutls.library.functions
1802
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
                                    gnutls.library.constants
1804
                                    .GNUTLS_OPENPGP_FMT_RAW))
1805
        # Verify the self signature in the key
1806
        crtverify = ctypes.c_uint()
1807
        (gnutls.library.functions
1808
         .gnutls_openpgp_crt_verify_self(crt, 0,
1809
                                         ctypes.byref(crtverify)))
1810
        if crtverify.value != 0:
1811
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
            raise (gnutls.errors.CertificateSecurityError
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1813
                   ("Verify failed"))
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1814
        # New buffer for the fingerprint
1815
        buf = ctypes.create_string_buffer(20)
1816
        buf_len = ctypes.c_size_t()
1817
        # Get the fingerprint from the certificate into the buffer
1818
        (gnutls.library.functions
1819
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
                                             ctypes.byref(buf_len)))
1821
        # Deinit the certificate
1822
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1823
        # Convert the buffer to a Python bytestring
1824
        fpr = ctypes.string_at(buf, buf_len.value)
1825
        # Convert the bytestring to hexadecimal notation
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
1826
        hex_fpr = binascii.hexlify(fpr).upper()
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1827
        return hex_fpr
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1828
1829
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1830
class MultiprocessingMixIn(object):
1831
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
    def sub_process_main(self, request, address):
1833
        try:
1834
            self.finish_request(request, address)
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
1835
        except Exception:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1836
            self.handle_error(request, address)
1837
        self.close_request(request)
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1838
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1839
    def process_request(self, request, address):
1840
        """Start a new process to process the request."""
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1841
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
                                       args = (request,
1843
                                               address))
1844
        proc.start()
1845
        return proc
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1846
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1847
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
    """ adds a pipe to the MixIn """
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1850
    def process_request(self, request, client_address):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1851
        """Overrides and wraps the original process_request().
1852
        
355 by Teddy Hogeborn
* mandos: White-space fixes only.
1853
        This function creates a new pipe in self.pipe
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1854
        """
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1855
        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
1856
        
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1857
        proc = MultiprocessingMixIn.process_request(self, request,
1858
                                                    client_address)
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1859
        self.child_pipe.close()
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1860
        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
1861
    
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1862
    def add_pipe(self, parent_pipe, proc):
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1863
        """Dummy function; override as necessary"""
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
1864
        raise NotImplementedError
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1865
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1866
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1867
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1868
                     socketserver.TCPServer, object):
237.2.13 by Teddy Hogeborn
Merge from trunk. Notable changes:
1869
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1870
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1871
    Attributes:
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1872
        enabled:        Boolean; whether this server is activated yet
1873
        interface:      None or a network interface name (string)
1874
        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
1875
    """
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1876
    def __init__(self, server_address, RequestHandlerClass,
339 by Teddy Hogeborn
Code cleanup.
1877
                 interface=None, use_ipv6=True):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1878
        self.interface = interface
1879
        if use_ipv6:
1880
            self.address_family = socket.AF_INET6
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1881
        socketserver.TCPServer.__init__(self, server_address,
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1882
                                        RequestHandlerClass)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1883
    def server_bind(self):
1884
        """This overrides the normal server_bind() function
1885
        to bind to an interface if one was specified, and also NOT to
1886
        bind to an address or port if they were not specified."""
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1887
        if self.interface is not None:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1888
            if SO_BINDTODEVICE is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1889
                logger.error("SO_BINDTODEVICE does not exist;"
1890
                             " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1891
                             self.interface)
1892
            else:
1893
                try:
1894
                    self.socket.setsockopt(socket.SOL_SOCKET,
1895
                                           SO_BINDTODEVICE,
1896
                                           str(self.interface
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1897
                                               + '\0'))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1898
                except socket.error as error:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1899
                    if error[0] == errno.EPERM:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1900
                        logger.error("No permission to"
1901
                                     " bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1902
                                     self.interface)
1903
                    elif error[0] == errno.ENOPROTOOPT:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1904
                        logger.error("SO_BINDTODEVICE not available;"
1905
                                     " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1906
                                     self.interface)
1907
                    else:
1908
                        raise
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1909
        # Only bind(2) the socket if we really need to.
1910
        if self.server_address[0] or self.server_address[1]:
1911
            if not self.server_address[0]:
314 by Teddy Hogeborn
Support not using IPv6 in server:
1912
                if self.address_family == socket.AF_INET6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1913
                    any_address = "::" # in6addr_any
314 by Teddy Hogeborn
Support not using IPv6 in server:
1914
                else:
1915
                    any_address = socket.INADDR_ANY
1916
                self.server_address = (any_address,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1917
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1918
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1919
                self.server_address = (self.server_address[0],
1920
                                       0)
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1921
#                 if self.interface:
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1922
#                     self.server_address = (self.server_address[0],
1923
#                                            0, # port
1924
#                                            0, # flowinfo
1925
#                                            if_nametoindex
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1926
#                                            (self.interface))
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1927
            return socketserver.TCPServer.server_bind(self)
339 by Teddy Hogeborn
Code cleanup.
1928
1929
1930
class MandosServer(IPv6_TCPServer):
1931
    """Mandos server.
1932
    
1933
    Attributes:
1934
        clients:        set of Client objects
1935
        gnutls_priority GnuTLS priority string
1936
        use_dbus:       Boolean; to emit D-Bus signals or not
340 by Teddy Hogeborn
Code cleanup.
1937
    
1938
    Assumes a gobject.MainLoop event loop.
339 by Teddy Hogeborn
Code cleanup.
1939
    """
1940
    def __init__(self, server_address, RequestHandlerClass,
1941
                 interface=None, use_ipv6=True, clients=None,
1942
                 gnutls_priority=None, use_dbus=True):
1943
        self.enabled = False
1944
        self.clients = clients
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1945
        if self.clients is None:
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
1946
            self.clients = {}
339 by Teddy Hogeborn
Code cleanup.
1947
        self.use_dbus = use_dbus
1948
        self.gnutls_priority = gnutls_priority
1949
        IPv6_TCPServer.__init__(self, server_address,
1950
                                RequestHandlerClass,
1951
                                interface = interface,
1952
                                use_ipv6 = use_ipv6)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1953
    def server_activate(self):
1954
        if self.enabled:
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1955
            return socketserver.TCPServer.server_activate(self)
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1956
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1957
    def enable(self):
1958
        self.enabled = True
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1959
    
1960
    def add_pipe(self, parent_pipe, proc):
340 by Teddy Hogeborn
Code cleanup.
1961
        # Call "handle_ipc" for both data and EOF events
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1962
        gobject.io_add_watch(parent_pipe.fileno(),
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1963
                             gobject.IO_IN | gobject.IO_HUP,
1964
                             functools.partial(self.handle_ipc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1965
                                               parent_pipe =
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1966
                                               parent_pipe,
1967
                                               proc = proc))
505.1.9 by Teddy Hogeborn
Whitespace
1968
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1969
    def handle_ipc(self, source, condition, parent_pipe=None,
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1970
                   proc = None, client_object=None):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1971
        condition_names = {
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1972
            gobject.IO_IN: "IN",   # There is data to read.
1973
            gobject.IO_OUT: "OUT", # Data can be written (without
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1974
                                    # blocking).
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1975
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
            gobject.IO_ERR: "ERR", # Error condition.
1977
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1978
                                    # broken, usually for pipes and
1979
                                    # sockets).
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1980
            }
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1981
        conditions_string = ' | '.join(name
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1982
                                       for cond, name in
1983
                                       condition_names.iteritems()
1984
                                       if cond & condition)
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1985
        # error, or the other end of multiprocessing.Pipe has closed
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1986
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1987
            # Wait for other process to exit
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1988
            proc.join()
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1989
            return False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1990
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1991
        # Read a request from the child
1992
        request = parent_pipe.recv()
1993
        command = request[0]
1994
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1995
        if command == 'init':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1996
            fpr = request[1]
1997
            address = request[2]
1998
            
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
1999
            for c in self.clients.itervalues():
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2000
                if c.fingerprint == fpr:
2001
                    client = c
2002
                    break
2003
            else:
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2004
                logger.info("Client not found for fingerprint: %s, ad"
2005
                            "dress: %s", fpr, address)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2006
                if self.use_dbus:
2007
                    # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2008
                    mandos_dbus_service.ClientNotFound(fpr,
2009
                                                       address[0])
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2010
                parent_pipe.send(False)
2011
                return False
2012
            
2013
            gobject.io_add_watch(parent_pipe.fileno(),
2014
                                 gobject.IO_IN | gobject.IO_HUP,
2015
                                 functools.partial(self.handle_ipc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2016
                                                   parent_pipe =
2017
                                                   parent_pipe,
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
2018
                                                   proc = proc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2019
                                                   client_object =
2020
                                                   client))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2021
            parent_pipe.send(True)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2022
            # remove the old hook in favor of the new above hook on
2023
            # same fileno
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
2024
            return False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2025
        if command == 'funcall':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2026
            funcname = request[1]
2027
            args = request[2]
2028
            kwargs = request[3]
2029
            
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2030
            parent_pipe.send(('data', getattr(client_object,
2031
                                              funcname)(*args,
2032
                                                         **kwargs)))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
2033
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2034
        if command == 'getattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2035
            attrname = request[1]
2036
            if callable(client_object.__getattribute__(attrname)):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2037
                parent_pipe.send(('function',))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2038
            else:
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2039
                parent_pipe.send(('data', client_object
2040
                                  .__getattribute__(attrname)))
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
2041
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2042
        if command == 'setattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2043
            attrname = request[1]
2044
            value = request[2]
2045
            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
2046
        
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
2047
        return True
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
2048
3 by Björn Påhlsson
Python based server
2049
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2050
def string_to_delta(interval):
2051
    """Parse a string and return a datetime.timedelta
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2052
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2053
    >>> string_to_delta('7d')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2054
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2055
    >>> string_to_delta('60s')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2056
    datetime.timedelta(0, 60)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2057
    >>> string_to_delta('60m')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2058
    datetime.timedelta(0, 3600)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2059
    >>> string_to_delta('24h')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2060
    datetime.timedelta(1)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2061
    >>> string_to_delta('1w')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2062
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2063
    >>> string_to_delta('5m 30s')
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2064
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2065
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2066
    timevalue = datetime.timedelta(0)
2067
    for s in interval.split():
2068
        try:
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
2069
            suffix = unicode(s[-1])
2070
            value = int(s[:-1])
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2071
            if suffix == "d":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2072
                delta = datetime.timedelta(value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2073
            elif suffix == "s":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2074
                delta = datetime.timedelta(0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2075
            elif suffix == "m":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2076
                delta = datetime.timedelta(0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2077
            elif suffix == "h":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2078
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2079
            elif suffix == "w":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2080
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
            else:
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2082
                raise ValueError("Unknown suffix {0!r}"
2083
                                 .format(suffix))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2084
        except (ValueError, IndexError) as e:
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
2085
            raise ValueError(*(e.args))
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
2086
        timevalue += delta
2087
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2088
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
2089
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
2090
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2091
    """See daemon(3).  Standard BSD Unix function.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
2092
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2093
    This should really exist as os.daemon, but it doesn't (yet)."""
2094
    if os.fork():
2095
        sys.exit()
2096
    os.setsid()
2097
    if not nochdir:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2098
        os.chdir("/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
2099
    if os.fork():
2100
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2101
    if not noclose:
2102
        # 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
2103
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2104
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
            raise OSError(errno.ENODEV,
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2106
                          "{0} not a character device"
2107
                          .format(os.devnull))
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2108
        os.dup2(null, sys.stdin.fileno())
2109
        os.dup2(null, sys.stdout.fileno())
2110
        os.dup2(null, sys.stderr.fileno())
2111
        if null > 2:
2112
            os.close(null)
2113
2114
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2115
def main():
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2116
    
379 by Teddy Hogeborn
* mandos: Fix line lengths.
2117
    ##################################################################
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2118
    # Parsing of options, both command line and config file
2119
    
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
2120
    parser = argparse.ArgumentParser()
2121
    parser.add_argument("-v", "--version", action="version",
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2122
                        version = "%(prog)s {0}".format(version),
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
2123
                        help="show version number and exit")
2124
    parser.add_argument("-i", "--interface", metavar="IF",
2125
                        help="Bind to interface IF")
2126
    parser.add_argument("-a", "--address",
2127
                        help="Address to listen for requests on")
2128
    parser.add_argument("-p", "--port", type=int,
2129
                        help="Port number to receive requests on")
2130
    parser.add_argument("--check", action="store_true",
2131
                        help="Run self-test")
2132
    parser.add_argument("--debug", action="store_true",
2133
                        help="Debug mode; run in foreground and log"
2134
                        " to terminal")
2135
    parser.add_argument("--debuglevel", metavar="LEVEL",
2136
                        help="Debug level for stdout output")
2137
    parser.add_argument("--priority", help="GnuTLS"
2138
                        " priority string (see GnuTLS documentation)")
2139
    parser.add_argument("--servicename",
2140
                        metavar="NAME", help="Zeroconf service name")
2141
    parser.add_argument("--configdir",
2142
                        default="/etc/mandos", metavar="DIR",
2143
                        help="Directory to search for configuration"
2144
                        " files")
2145
    parser.add_argument("--no-dbus", action="store_false",
2146
                        dest="use_dbus", help="Do not provide D-Bus"
2147
                        " system bus interface")
2148
    parser.add_argument("--no-ipv6", action="store_false",
2149
                        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
2150
    parser.add_argument("--no-restore", action="store_false",
518.1.7 by Teddy Hogeborn
* mandos: Break long lines and fix some more white space.
2151
                        dest="restore", help="Do not restore stored"
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2152
                        " state")
2153
    parser.add_argument("--statedir", metavar="DIR",
2154
                        help="Directory to save/restore state in")
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2155
    
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
2156
    options = parser.parse_args()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2157
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2158
    if options.check:
2159
        import doctest
2160
        doctest.testmod()
2161
        sys.exit()
3 by Björn Påhlsson
Python based server
2162
    
28 by Teddy Hogeborn
* server.conf: New file.
2163
    # Default values for config file for server-global settings
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2164
    server_defaults = { "interface": "",
2165
                        "address": "",
2166
                        "port": "",
2167
                        "debug": "False",
2168
                        "priority":
2169
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2170
                        "servicename": "Mandos",
2171
                        "use_dbus": "True",
2172
                        "use_ipv6": "True",
2173
                        "debuglevel": "",
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2174
                        "restore": "True",
2175
                        "statedir": "/var/lib/mandos"
28 by Teddy Hogeborn
* server.conf: New file.
2176
                        }
2177
    
2178
    # Parse config file for server-global settings
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
2179
    server_config = configparser.SafeConfigParser(server_defaults)
28 by Teddy Hogeborn
* server.conf: New file.
2180
    del server_defaults
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2181
    server_config.read(os.path.join(options.configdir,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2182
                                    "mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
2183
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
2184
    server_settings = server_config.defaults()
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
2185
    # Use the appropriate methods on the non-string config options
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2186
    for option in ("debug", "use_dbus", "use_ipv6"):
2187
        server_settings[option] = server_config.getboolean("DEFAULT",
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2188
                                                           option)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2189
    if server_settings["port"]:
2190
        server_settings["port"] = server_config.getint("DEFAULT",
2191
                                                       "port")
28 by Teddy Hogeborn
* server.conf: New file.
2192
    del server_config
2193
    
2194
    # Override the settings from the config file with command line
2195
    # options, if set.
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2196
    for option in ("interface", "address", "port", "debug",
2197
                   "priority", "servicename", "configdir",
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2198
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2199
                   "statedir"):
28 by Teddy Hogeborn
* server.conf: New file.
2200
        value = getattr(options, option)
2201
        if value is not None:
2202
            server_settings[option] = value
2203
    del options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2204
    # Force all strings to be unicode
2205
    for option in server_settings.keys():
2206
        if type(server_settings[option]) is str:
2207
            server_settings[option] = unicode(server_settings[option])
28 by Teddy Hogeborn
* server.conf: New file.
2208
    # Now we have our good server settings in "server_settings"
2209
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2210
    ##################################################################
2211
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2212
    # For convenience
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2213
    debug = server_settings["debug"]
2214
    debuglevel = server_settings["debuglevel"]
2215
    use_dbus = server_settings["use_dbus"]
2216
    use_ipv6 = server_settings["use_ipv6"]
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2217
    stored_state_path = os.path.join(server_settings["statedir"],
2218
                                     stored_state_file)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
2219
    
518.1.4 by Björn Påhlsson
restructured logger
2220
    if debug:
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2221
        initlogger(debug, logging.DEBUG)
518.1.4 by Björn Påhlsson
restructured logger
2222
    else:
2223
        if not debuglevel:
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2224
            initlogger(debug)
518.1.4 by Björn Påhlsson
restructured logger
2225
        else:
2226
            level = getattr(logging, debuglevel.upper())
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2227
            initlogger(debug, level)
518.1.4 by Björn Påhlsson
restructured logger
2228
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2229
    if server_settings["servicename"] != "Mandos":
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
2230
        syslogger.setFormatter(logging.Formatter
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2231
                               ('Mandos ({0}) [%(process)d]:'
2232
                                ' %(levelname)s: %(message)s'
2233
                                .format(server_settings
2234
                                        ["servicename"])))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
2235
    
28 by Teddy Hogeborn
* server.conf: New file.
2236
    # Parse config file with clients
543 by Teddy Hogeborn
* mandos: Break some long lines.
2237
    client_config = configparser.SafeConfigParser(Client
2238
                                                  .client_defaults)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2239
    client_config.read(os.path.join(server_settings["configdir"],
2240
                                    "clients.conf"))
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2241
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2242
    global mandos_dbus_service
2243
    mandos_dbus_service = None
28 by Teddy Hogeborn
* server.conf: New file.
2244
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2245
    tcp_server = MandosServer((server_settings["address"],
2246
                               server_settings["port"]),
339 by Teddy Hogeborn
Code cleanup.
2247
                              ClientHandler,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2248
                              interface=(server_settings["interface"]
237.2.35 by teddy at bsnet
* mandos (main): Bug fix: Don't try to bind to an empty string
2249
                                         or None),
339 by Teddy Hogeborn
Code cleanup.
2250
                              use_ipv6=use_ipv6,
2251
                              gnutls_priority=
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2252
                              server_settings["priority"],
339 by Teddy Hogeborn
Code cleanup.
2253
                              use_dbus=use_dbus)
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2254
    if not debug:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2255
        pidfilename = "/var/run/mandos.pid"
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2256
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2257
            pidfile = open(pidfilename, "w")
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2258
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2259
            logger.error("Could not open file %r", pidfilename)
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
2260
    
566 by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID
2261
    for name in ("_mandos", "mandos", "nobody"):
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2262
        try:
566 by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID
2263
            uid = pwd.getpwnam(name).pw_uid
2264
            gid = pwd.getpwnam(name).pw_gid
2265
            break
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2266
        except KeyError:
566 by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID
2267
            continue
2268
    else:
2269
        uid = 65534
2270
        gid = 65534
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2271
    try:
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2272
        os.setgid(gid)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2273
        os.setuid(uid)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2274
    except OSError as error:
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2275
        if error[0] != errno.EPERM:
2276
            raise error
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
2277
    
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2278
    if debug:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2279
        # Enable all possible GnuTLS debugging
2280
        
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2281
        # "Use a log level over 10 to enable all debugging options."
2282
        # - GnuTLS manual
2283
        gnutls.library.functions.gnutls_global_set_log_level(11)
2284
        
2285
        @gnutls.library.types.gnutls_log_func
2286
        def debug_gnutls(level, string):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2287
            logger.debug("GnuTLS: %s", string[:-1])
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2288
        
2289
        (gnutls.library.functions
2290
         .gnutls_global_set_log_function(debug_gnutls))
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2291
        
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
2292
        # 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
2293
        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
2294
        os.dup2(null, sys.stdin.fileno())
2295
        if null > 2:
2296
            os.close(null)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2297
    
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
2298
    # Need to fork before connecting to D-Bus
2299
    if not debug:
2300
        # Close all input and output, do double fork, etc.
2301
        daemon()
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2302
    
518.2.11 by Teddy Hogeborn
* mandos (main): Tell gobject we're (or, rather, multiprocessing is)
2303
    gobject.threads_init()
2304
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2305
    global main_loop
2306
    # From the Avahi example code
560.1.1 by teddy at recompile
* mandos: Use os.devnull instead of os.path.devnull. Fix some white
2307
    DBusGMainLoop(set_as_default=True)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2308
    main_loop = gobject.MainLoop()
2309
    bus = dbus.SystemBus()
2310
    # End of Avahi example code
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2311
    if use_dbus:
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2312
        try:
505 by Björn Påhlsson
The domain name has changed, so the D-Bus bus and interface names must
2313
            bus_name = dbus.service.BusName("se.recompile.Mandos",
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2314
                                            bus, do_not_queue=True)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2315
            old_bus_name = (dbus.service.BusName
2316
                            ("se.bsnet.fukt.Mandos", bus,
2317
                             do_not_queue=True))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2318
        except dbus.exceptions.NameExistsException as e:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2319
            logger.error(unicode(e) + ", disabling D-Bus")
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2320
            use_dbus = False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2321
            server_settings["use_dbus"] = False
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2322
            tcp_server.use_dbus = False
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
2323
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
505.1.20 by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning.
2324
    service = AvahiServiceToSyslog(name =
2325
                                   server_settings["servicename"],
2326
                                   servicetype = "_mandos._tcp",
2327
                                   protocol = protocol, bus = bus)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2328
    if server_settings["interface"]:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
2329
        service.interface = (if_nametoindex
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2330
                             (str(server_settings["interface"])))
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
2331
    
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
2332
    global multiprocessing_manager
2333
    multiprocessing_manager = multiprocessing.Manager()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2334
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
2335
    client_class = Client
2336
    if use_dbus:
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2337
        client_class = functools.partial(ClientDBusTransitional,
505.1.4 by Teddy Hogeborn
Removed superflous white space.
2338
                                         bus = bus)
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2339
    
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2340
    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
2341
    old_client_settings = {}
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2342
    clients_data = {}
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2343
    
518.1.7 by Teddy Hogeborn
* mandos: Break long lines and fix some more white space.
2344
    # 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
2345
    if server_settings["restore"]:
2346
        try:
2347
            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.
2348
                clients_data, old_client_settings = (pickle.load
2349
                                                     (stored_state))
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2350
            os.remove(stored_state_path)
2351
        except IOError as e:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2352
            logger.warning("Could not load persistent state: {0}"
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2353
                           .format(e))
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2354
            if e.errno != errno.ENOENT:
2355
                raise
505.1.23 by Teddy Hogeborn
* mandos (main): Handle EOFError when reading state file.
2356
        except EOFError as e:
2357
            logger.warning("Could not load persistent state: "
2358
                           "EOFError: {0}".format(e))
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2359
    
518.1.9 by Björn Påhlsson
renamed variables
2360
    with PGPEngine() as pgp:
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2361
        for client_name, client in clients_data.iteritems():
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2362
            # Decide which value to use after restoring saved state.
2363
            # We have three different values: Old config file,
2364
            # new config file, and saved state.
2365
            # New config value takes precedence if it differs from old
2366
            # config value, otherwise use saved state.
2367
            for name, value in client_settings[client_name].items():
2368
                try:
2369
                    # For each value in new config, check if it
2370
                    # differs from the old config value (Except for
2371
                    # the "secret" attribute)
2372
                    if (name != "secret" and
2373
                        value != old_client_settings[client_name]
2374
                        [name]):
518.2.10 by Teddy Hogeborn
* mandos (main): Bug fix: Syntax fix when restoring settings.
2375
                        client[name] = value
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2376
                except KeyError:
2377
                    pass
2378
            
2379
            # 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.
2380
            # enabled if its last checker was successful.  Clients
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2381
            # whose checker succeeded before we stored its state is
2382
            # assumed to have successfully run all checkers during
2383
            # downtime.
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
2384
            if client["enabled"]:
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2385
                if datetime.datetime.utcnow() >= client["expires"]:
2386
                    if not client["last_checked_ok"]:
2387
                        logger.warning(
2388
                            "disabling client {0} - Client never "
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2389
                            "performed a successful checker"
2390
                            .format(client_name))
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2391
                        client["enabled"] = False
2392
                    elif client["last_checker_status"] != 0:
2393
                        logger.warning(
2394
                            "disabling client {0} - Client "
2395
                            "last checker failed with error code {1}"
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2396
                            .format(client_name,
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2397
                                    client["last_checker_status"]))
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2398
                        client["enabled"] = False
2399
                    else:
2400
                        client["expires"] = (datetime.datetime
2401
                                             .utcnow()
2402
                                             + client["timeout"])
542 by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok.
2403
                        logger.debug("Last checker succeeded,"
2404
                                     " keeping {0} enabled"
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2405
                                     .format(client_name))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2406
            try:
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2407
                client["secret"] = (
2408
                    pgp.decrypt(client["encrypted_secret"],
518.1.9 by Björn Påhlsson
renamed variables
2409
                                client_settings[client_name]
2410
                                ["secret"]))
2411
            except PGPError:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2412
                # 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
2413
                logger.debug("Failed to decrypt {0} old secret"
2414
                             .format(client_name))
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2415
                client["secret"] = (
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2416
                    client_settings[client_name]["secret"])
2417
    
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2418
    # Add/remove clients based on new changes made to config
543 by Teddy Hogeborn
* mandos: Break some long lines.
2419
    for client_name in (set(old_client_settings)
2420
                        - set(client_settings)):
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2421
        del clients_data[client_name]
543 by Teddy Hogeborn
* mandos: Break some long lines.
2422
    for client_name in (set(client_settings)
2423
                        - set(old_client_settings)):
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2424
        clients_data[client_name] = client_settings[client_name]
573 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
2425
    
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2426
    # Create all client objects
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2427
    for client_name, client in clients_data.iteritems():
2428
        tcp_server.clients[client_name] = client_class(
2429
            name = client_name, settings = client)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2430
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
2431
    if not tcp_server.clients:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2432
        logger.warning("No clients defined")
573 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
2433
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2434
    if not debug:
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2435
        try:
2436
            with pidfile:
2437
                pid = os.getpid()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2438
                pidfile.write(str(pid) + "\n".encode("utf-8"))
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2439
            del pidfile
2440
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2441
            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.
2442
                         pidfilename, pid)
2443
        except NameError:
2444
            # "pidfile" was never created
2445
            pass
2446
        del pidfilename
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2447
        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
2448
    
28 by Teddy Hogeborn
* server.conf: New file.
2449
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2450
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2451
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2452
    if use_dbus:
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
2453
        class MandosDBusService(DBusObjectWithProperties):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2454
            """A D-Bus proxy object"""
2455
            def __init__(self):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2456
                dbus.service.Object.__init__(self, bus, "/")
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
2457
            _interface = "se.recompile.Mandos"
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2458
            
560.1.2 by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark
2459
            @dbus_interface_annotations(_interface)
2460
            def _foo(self):
2461
                return { "org.freedesktop.DBus.Property"
2462
                         ".EmitsChangedSignal":
2463
                             "false"}
2464
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2465
            @dbus.service.signal(_interface, signature="o")
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
2466
            def ClientAdded(self, objpath):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2467
                "D-Bus signal"
2468
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2469
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2470
            @dbus.service.signal(_interface, signature="ss")
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
2471
            def ClientNotFound(self, fingerprint, address):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2472
                "D-Bus signal"
2473
                pass
2474
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2475
            @dbus.service.signal(_interface, signature="os")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2476
            def ClientRemoved(self, objpath, name):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2477
                "D-Bus signal"
2478
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2479
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2480
            @dbus.service.method(_interface, out_signature="ao")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2481
            def GetAllClients(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2482
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
2483
                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
2484
                                  for c in
2485
                                  tcp_server.clients.itervalues())
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2486
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2487
            @dbus.service.method(_interface,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2488
                                 out_signature="a{oa{sv}}")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2489
            def GetAllClientsWithProperties(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2490
                "D-Bus method"
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2491
                return dbus.Dictionary(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2492
                    ((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
2493
                     for c in tcp_server.clients.itervalues()),
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2494
                    signature="oa{sv}")
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, in_signature="o")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2497
            def RemoveClient(self, object_path):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2498
                "D-Bus method"
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2499
                for c in tcp_server.clients.itervalues():
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2500
                    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
2501
                        del tcp_server.clients[c.name]
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
2502
                        c.remove_from_connection()
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2503
                        # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2504
                        c.disable(quiet=True)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2505
                        # Emit D-Bus signal
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2506
                        self.ClientRemoved(object_path, c.name)
2507
                        return
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2508
                raise KeyError(object_path)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2509
            
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2510
            del _interface
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2511
        
24.1.186 by Björn Påhlsson
transitional stuff actually working
2512
        class MandosDBusServiceTransitional(MandosDBusService):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
2513
            __metaclass__ = AlternateDBusNamesMetaclass
24.1.186 by Björn Påhlsson
transitional stuff actually working
2514
        mandos_dbus_service = MandosDBusServiceTransitional()
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2515
    
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2516
    def cleanup():
2517
        "Cleanup function; run on exit"
2518
        service.cleanup()
2519
        
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
2520
        multiprocessing.active_children()
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2521
        if not (tcp_server.clients or client_settings):
2522
            return
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2523
        
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2524
        # Store client before exiting. Secrets are encrypted with key
2525
        # based on what config file has. If config file is
2526
        # 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
2527
        clients = {}
518.1.9 by Björn Påhlsson
renamed variables
2528
        with PGPEngine() as pgp:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2529
            for client in tcp_server.clients.itervalues():
2530
                key = client_settings[client.name]["secret"]
518.1.9 by Björn Påhlsson
renamed variables
2531
                client.encrypted_secret = pgp.encrypt(client.secret,
2532
                                                      key)
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2533
                client_dict = {}
2534
                
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2535
                # A list of attributes that can not be pickled
2536
                # + secret.
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2537
                exclude = set(("bus", "changedstate", "secret",
2538
                               "checker"))
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2539
                for name, typ in (inspect.getmembers
2540
                                  (dbus.service.Object)):
2541
                    exclude.add(name)
2542
                
2543
                client_dict["encrypted_secret"] = (client
2544
                                                   .encrypted_secret)
2545
                for attr in client.client_structure:
2546
                    if attr not in exclude:
2547
                        client_dict[attr] = getattr(client, attr)
2548
                
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2549
                clients[client.name] = client_dict
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2550
                del client_settings[client.name]["secret"]
2551
        
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2552
        try:
505.1.26 by teddy at bsnet
* mandos (main/cleanup): Write new file, then rename. Use
2553
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2554
                                                prefix="clients-",
2555
                                                dir=os.path.dirname
2556
                                                (stored_state_path))
2557
            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
2558
                pickle.dump((clients, client_settings), stored_state)
505.1.26 by teddy at bsnet
* mandos (main/cleanup): Write new file, then rename. Use
2559
            os.rename(tempname, stored_state_path)
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2560
        except (IOError, OSError) as e:
2561
            logger.warning("Could not save persistent state: {0}"
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2562
                           .format(e))
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2563
            if not debug:
2564
                try:
2565
                    os.remove(tempname)
2566
                except NameError:
2567
                    pass
505.1.25 by Teddy Hogeborn
* mandos (main/cleanup): Use O_EXCL when creating saved state file;
2568
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2569
                                   errno.EEXIST)):
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2570
                raise e
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2571
        
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2572
        # Delete all clients, and settings from config
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2573
        while tcp_server.clients:
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2574
            name, client = tcp_server.clients.popitem()
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2575
            if use_dbus:
2576
                client.remove_from_connection()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2577
            # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2578
            client.disable(quiet=True)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2579
            if use_dbus:
2580
                # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2581
                mandos_dbus_service.ClientRemoved(client
2582
                                                  .dbus_object_path,
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2583
                                                  client.name)
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2584
        client_settings.clear()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2585
    
2586
    atexit.register(cleanup)
2587
    
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2588
    for client in tcp_server.clients.itervalues():
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2589
        if use_dbus:
2590
            # Emit D-Bus signal
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
2591
            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
2592
        # Need to initiate checking of clients
2593
        if client.enabled:
2594
            client.init_checker()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2595
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2596
    tcp_server.enable()
2597
    tcp_server.server_activate()
2598
    
28 by Teddy Hogeborn
* server.conf: New file.
2599
    # Find out what port we got
2600
    service.port = tcp_server.socket.getsockname()[1]
314 by Teddy Hogeborn
Support not using IPv6 in server:
2601
    if use_ipv6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2602
        logger.info("Now listening on address %r, port %d,"
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2603
                    " flowinfo %d, scope_id %d",
2604
                    *tcp_server.socket.getsockname())
314 by Teddy Hogeborn
Support not using IPv6 in server:
2605
    else:                       # IPv4
568 by Teddy Hogeborn
* mandos-monitor: Use new string format method.
2606
        logger.info("Now listening on address %r, port %d",
2607
                    *tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
2608
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
2609
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
2610
    
2611
    try:
2612
        # From the Avahi example code
2613
        try:
336 by Teddy Hogeborn
Code cleanup.
2614
            service.activate()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2615
        except dbus.exceptions.DBusException as error:
565 by Teddy Hogeborn
* mandos (AvahiService.rename, Client.start_checker,
2616
            logger.critical("D-Bus Exception", exc_info=error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2617
            cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2618
            sys.exit(1)
2619
        # End of Avahi example code
2620
        
2621
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2622
                             lambda *args, **kwargs:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
2623
                             (tcp_server.handle_request
2624
                              (*args[2:], **kwargs) or True))
28 by Teddy Hogeborn
* server.conf: New file.
2625
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2626
        logger.debug("Starting main loop")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2627
        main_loop.run()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2628
    except AvahiError as error:
565 by Teddy Hogeborn
* mandos (AvahiService.rename, Client.start_checker,
2629
        logger.critical("Avahi Error", exc_info=error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2630
        cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2631
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2632
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2633
        if debug:
463.1.5 by teddy at bsnet
* mandos: Use unicode string literals.
2634
            print("", file=sys.stderr)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2635
        logger.debug("Server received KeyboardInterrupt")
2636
    logger.debug("Server exiting")
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2637
    # Must run before the D-Bus bus name gets deregistered
2638
    cleanup()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2639
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2640
if __name__ == '__main__':
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2641
    main()