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