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