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