/mandos/trunk

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