/mandos/trunk

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