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