/mandos/trunk

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