/mandos/trunk

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