/mandos/trunk

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