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