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