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