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