/mandos/trunk

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