/mandos/trunk

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