/mandos/trunk

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