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