/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.26 by Teddy Hogeborn
* Makefile (version): Changed to "1.5.2".
88
version = "1.5.2"
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
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
418
                         checker, -2 means no checker completed yet.
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
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
425
    extended_timeout:   extra long timeout when secret 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
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
504
            client["last_checker_status"] = -2
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
    
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
629
    def checked_ok(self):
630
        """Assert that the client has been seen, alive and well."""
631
        self.last_checked_ok = datetime.datetime.utcnow()
632
        self.last_checker_status = 0
633
        self.bump_timeout()
634
    
635
    def bump_timeout(self, timeout=None):
636
        """Bump up the timeout for this client."""
24.1.179 by Björn Påhlsson
New feature:
637
        if timeout is None:
638
            timeout = self.timeout
505.1.17 by Teddy Hogeborn
* mandos (Client.checked_ok): Bug fix: Handle disabled client.
639
        if self.disable_initiator_tag is not None:
640
            gobject.source_remove(self.disable_initiator_tag)
641
        if getattr(self, "enabled", False):
642
            self.disable_initiator_tag = (gobject.timeout_add
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
643
                                          (timedelta_to_milliseconds
505.1.17 by Teddy Hogeborn
* mandos (Client.checked_ok): Bug fix: Handle disabled client.
644
                                           (timeout), self.disable))
645
            self.expires = datetime.datetime.utcnow() + timeout
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
646
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
647
    def need_approval(self):
648
        self.last_approval_request = datetime.datetime.utcnow()
649
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
650
    def start_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
651
        """Start a new checker subprocess if one is not running.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
652
        
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
653
        If a checker already exists, leave it running and do
654
        nothing."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
655
        # The reason for not killing a running checker is that if we
656
        # did that, then if a checker (for some reason) started
657
        # running slowly and taking more than 'interval' time, the
658
        # client would inevitably timeout, since no checker would get
659
        # a chance to run to completion.  If we instead leave running
660
        # checkers alone, the checker would have to take more time
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
661
        # than 'timeout' for the client to be disabled, which is as it
662
        # should be.
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
663
        
664
        # 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
665
        try:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
666
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
667
        except (AttributeError, OSError) as error:
383 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Fix race condition with
668
            if (isinstance(error, OSError)
669
                and error.errno != errno.ECHILD):
670
                raise error
671
        else:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
672
            if pid:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
673
                logger.warning("Checker was a zombie")
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
674
                gobject.source_remove(self.checker_callback_tag)
675
                self.checker_callback(pid, status,
676
                                      self.current_checker_command)
677
        # Start a new checker if needed
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
678
        if self.checker is None:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
679
            try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
680
                # In case checker_command has exactly one % operator
681
                command = self.checker_command % self.host
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
682
            except TypeError:
28 by Teddy Hogeborn
* server.conf: New file.
683
                # Escape attributes for the shell
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
684
                escaped_attrs = dict(
685
                    (attr,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
686
                     re.escape(unicode(str(getattr(self, attr, "")),
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
687
                                       errors=
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
688
                                       'replace')))
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
689
                    for attr in
690
                    self.runtime_expansions)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
691
                
13 by Björn Påhlsson
Added following support:
692
                try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
693
                    command = self.checker_command % escaped_attrs
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
694
                except TypeError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
695
                    logger.error('Could not format string "%s":'
696
                                 ' %s', self.checker_command, error)
13 by Björn Påhlsson
Added following support:
697
                    return True # Try again later
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
698
            self.current_checker_command = command
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
699
            try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
700
                logger.info("Starting checker %r for %s",
44 by Teddy Hogeborn
* ca.pem: Removed.
701
                            command, self.name)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
702
                # We don't need to redirect stdout and stderr, since
703
                # in normal mode, that is already done by daemon(),
704
                # and in debug mode we don't want to.  (Stdin is
705
                # always replaced by /dev/null.)
28 by Teddy Hogeborn
* server.conf: New file.
706
                self.checker = subprocess.Popen(command,
707
                                                close_fds=True,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
708
                                                shell=True, cwd="/")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
709
                self.checker_callback_tag = (gobject.child_watch_add
710
                                             (self.checker.pid,
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
711
                                              self.checker_callback,
712
                                              data=command))
310 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Add extra check in case the
713
                # The checker may have completed before the gobject
714
                # watch was added.  Check for this.
715
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
                if pid:
717
                    gobject.source_remove(self.checker_callback_tag)
718
                    self.checker_callback(pid, status, command)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
719
            except OSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
720
                logger.error("Failed to start subprocess: %s",
13 by Björn Påhlsson
Added following support:
721
                             error)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
722
        # Re-run this periodically if run by gobject.timeout_add
723
        return True
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
724
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
725
    def stop_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
726
        """Force the checker process, if any, to stop."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
727
        if self.checker_callback_tag:
728
            gobject.source_remove(self.checker_callback_tag)
729
            self.checker_callback_tag = None
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
730
        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.
731
            return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
732
        logger.debug("Stopping checker for %(name)s", vars(self))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
733
        try:
734
            os.kill(self.checker.pid, signal.SIGTERM)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
735
            #time.sleep(0.5)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
736
            #if self.checker.poll() is None:
737
            #    os.kill(self.checker.pid, signal.SIGKILL)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
738
        except OSError as error:
28 by Teddy Hogeborn
* server.conf: New file.
739
            if error.errno != errno.ESRCH: # No such process
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
740
                raise
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
741
        self.checker = None
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
742
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
743
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
744
def dbus_service_property(dbus_interface, signature="v",
745
                          access="readwrite", byte_arrays=False):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
746
    """Decorators for marking methods of a DBusObjectWithProperties to
747
    become properties on the D-Bus.
748
    
749
    The decorated method will be called with no arguments by "Get"
750
    and with one argument by "Set".
751
    
752
    The parameters, where they are supported, are the same as
753
    dbus.service.method, except there is only "signature", since the
754
    type from Get() and the type sent to Set() is the same.
755
    """
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
756
    # Encoding deeply encoded byte arrays is not supported yet by the
757
    # "Set" method, so we fail early here:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
758
    if byte_arrays and signature != "ay":
759
        raise ValueError("Byte arrays not supported for non-'ay'"
760
                         " signature %r" % signature)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
761
    def decorator(func):
762
        func._dbus_is_property = True
763
        func._dbus_interface = dbus_interface
764
        func._dbus_signature = signature
765
        func._dbus_access = access
766
        func._dbus_name = func.__name__
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
767
        if func._dbus_name.endswith("_dbus_property"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
768
            func._dbus_name = func._dbus_name[:-14]
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
769
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
770
        return func
771
    return decorator
772
773
774
class DBusPropertyException(dbus.exceptions.DBusException):
775
    """A base class for D-Bus property-related exceptions
776
    """
777
    def __unicode__(self):
778
        return unicode(str(self))
779
780
781
class DBusPropertyAccessException(DBusPropertyException):
782
    """A property's access permissions disallows an operation.
783
    """
784
    pass
785
786
787
class DBusPropertyNotFound(DBusPropertyException):
788
    """An attempt was made to access a non-existing property.
789
    """
790
    pass
791
792
793
class DBusObjectWithProperties(dbus.service.Object):
794
    """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
795
    
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
796
    Classes inheriting from this can use the dbus_service_property
797
    decorator to expose methods as D-Bus properties.  It exposes the
798
    standard Get(), Set(), and GetAll() methods on the D-Bus.
799
    """
800
    
801
    @staticmethod
802
    def _is_dbus_property(obj):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
803
        return getattr(obj, "_dbus_is_property", False)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
804
    
805
    def _get_all_dbus_properties(self):
806
        """Returns a generator of (name, attribute) pairs
807
        """
24.1.186 by Björn Påhlsson
transitional stuff actually working
808
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
                for cls in self.__class__.__mro__
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
810
                for name, prop in
811
                inspect.getmembers(cls, self._is_dbus_property))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
812
    
813
    def _get_dbus_property(self, interface_name, property_name):
814
        """Returns a bound method if one exists which is a D-Bus
815
        property with the specified name and interface.
816
        """
24.1.186 by Björn Påhlsson
transitional stuff actually working
817
        for cls in  self.__class__.__mro__:
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
818
            for name, value in (inspect.getmembers
819
                                (cls, self._is_dbus_property)):
820
                if (value._dbus_name == property_name
821
                    and value._dbus_interface == interface_name):
24.1.186 by Björn Påhlsson
transitional stuff actually working
822
                    return value.__get__(self)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
823
        
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
824
        # No such property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
825
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
                                   + interface_name + "."
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
827
                                   + property_name)
828
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
829
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
830
                         out_signature="v")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
831
    def Get(self, interface_name, property_name):
832
        """Standard D-Bus property Get() method, see D-Bus standard.
833
        """
834
        prop = self._get_dbus_property(interface_name, property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
835
        if prop._dbus_access == "write":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
836
            raise DBusPropertyAccessException(property_name)
837
        value = prop()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
838
        if not hasattr(value, "variant_level"):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
839
            return value
840
        return type(value)(value, variant_level=value.variant_level+1)
841
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
842
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
843
    def Set(self, interface_name, property_name, value):
844
        """Standard D-Bus property Set() method, see D-Bus standard.
845
        """
846
        prop = self._get_dbus_property(interface_name, property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
847
        if prop._dbus_access == "read":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
848
            raise DBusPropertyAccessException(property_name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
849
        if prop._dbus_get_args_options["byte_arrays"]:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
850
            # The byte_arrays option is not supported yet on
851
            # signatures other than "ay".
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
852
            if prop._dbus_signature != "ay":
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
853
                raise ValueError
546 by Teddy Hogeborn
* debian/rules (binary-common): Exclude network-hooks.d from
854
            value = dbus.ByteArray(b''.join(chr(byte)
855
                                            for byte in value))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
856
        prop(value)
857
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
858
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
859
                         out_signature="a{sv}")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
860
    def GetAll(self, interface_name):
861
        """Standard D-Bus property GetAll() method, see D-Bus
862
        standard.
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
863
        
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
864
        Note: Will not include properties with access="write".
865
        """
518.1.5 by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned
866
        properties = {}
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
867
        for name, prop in self._get_all_dbus_properties():
868
            if (interface_name
869
                and interface_name != prop._dbus_interface):
870
                # Interface non-empty but did not match
871
                continue
872
            # Ignore write-only properties
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
873
            if prop._dbus_access == "write":
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
874
                continue
875
            value = prop()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
876
            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
877
                properties[name] = value
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
878
                continue
518.1.5 by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned
879
            properties[name] = type(value)(value, variant_level=
880
                                           value.variant_level+1)
881
        return dbus.Dictionary(properties, signature="sv")
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
882
    
883
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
884
                         out_signature="s",
885
                         path_keyword='object_path',
886
                         connection_keyword='connection')
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
887
    def Introspect(self, object_path, connection):
888
        """Standard D-Bus method, overloaded to insert property tags.
889
        """
890
        xmlstring = dbus.service.Object.Introspect(self, object_path,
386 by Teddy Hogeborn
* mandos (DBusObjectWithProperties.Introspect): Add the name
891
                                                   connection)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
892
        try:
893
            document = xml.dom.minidom.parseString(xmlstring)
894
            def make_tag(document, name, prop):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
895
                e = document.createElement("property")
896
                e.setAttribute("name", name)
897
                e.setAttribute("type", prop._dbus_signature)
898
                e.setAttribute("access", prop._dbus_access)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
899
                return e
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
900
            for if_tag in document.getElementsByTagName("interface"):
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
901
                for tag in (make_tag(document, name, prop)
902
                            for name, prop
903
                            in self._get_all_dbus_properties()
904
                            if prop._dbus_interface
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
905
                            == if_tag.getAttribute("name")):
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
906
                    if_tag.appendChild(tag)
907
                # Add the names to the return values for the
908
                # "org.freedesktop.DBus.Properties" methods
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
909
                if (if_tag.getAttribute("name")
910
                    == "org.freedesktop.DBus.Properties"):
911
                    for cn in if_tag.getElementsByTagName("method"):
912
                        if cn.getAttribute("name") == "Get":
913
                            for arg in cn.getElementsByTagName("arg"):
914
                                if (arg.getAttribute("direction")
915
                                    == "out"):
916
                                    arg.setAttribute("name", "value")
917
                        elif cn.getAttribute("name") == "GetAll":
918
                            for arg in cn.getElementsByTagName("arg"):
919
                                if (arg.getAttribute("direction")
920
                                    == "out"):
921
                                    arg.setAttribute("name", "props")
922
            xmlstring = document.toxml("utf-8")
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
923
            document.unlink()
924
        except (AttributeError, xml.dom.DOMException,
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
925
                xml.parsers.expat.ExpatError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
926
            logger.error("Failed to override Introspection method",
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
927
                         error)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
928
        return xmlstring
929
930
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
931
def datetime_to_dbus (dt, variant_level=0):
932
    """Convert a UTC datetime.datetime() to a D-Bus type."""
933
    if dt is None:
934
        return dbus.String("", variant_level = variant_level)
935
    return dbus.String(dt.isoformat(),
936
                       variant_level=variant_level)
937
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
938
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
                                  .__metaclass__):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
941
    """Applied to an empty subclass of a D-Bus object, this metaclass
942
    will add additional D-Bus attributes matching a certain pattern.
943
    """
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
944
    def __new__(mcs, name, bases, attr):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
945
        # Go through all the base classes which could have D-Bus
946
        # methods, signals, or properties in them
947
        for base in (b for b in bases
948
                     if issubclass(b, dbus.service.Object)):
949
            # Go though all attributes of the base class
950
            for attrname, attribute in inspect.getmembers(base):
951
                # Ignore non-D-Bus attributes, and D-Bus attributes
952
                # with the wrong interface name
953
                if (not hasattr(attribute, "_dbus_interface")
954
                    or not attribute._dbus_interface
955
                    .startswith("se.recompile.Mandos")):
956
                    continue
957
                # Create an alternate D-Bus interface name based on
958
                # the current name
959
                alt_interface = (attribute._dbus_interface
960
                                 .replace("se.recompile.Mandos",
961
                                          "se.bsnet.fukt.Mandos"))
962
                # Is this a D-Bus signal?
963
                if getattr(attribute, "_dbus_is_signal", False):
964
                    # Extract the original non-method function by
965
                    # black magic
966
                    nonmethod_func = (dict(
967
                            zip(attribute.func_code.co_freevars,
968
                                attribute.__closure__))["func"]
969
                                      .cell_contents)
970
                    # Create a new, but exactly alike, function
971
                    # object, and decorate it to be a new D-Bus signal
972
                    # with the alternate D-Bus interface name
973
                    new_function = (dbus.service.signal
974
                                    (alt_interface,
975
                                     attribute._dbus_signature)
976
                                    (types.FunctionType(
977
                                nonmethod_func.func_code,
978
                                nonmethod_func.func_globals,
979
                                nonmethod_func.func_name,
980
                                nonmethod_func.func_defaults,
981
                                nonmethod_func.func_closure)))
982
                    # Define a creator of a function to call both the
983
                    # old and new functions, so both the old and new
984
                    # signals gets sent when the function is called
985
                    def fixscope(func1, func2):
986
                        """This function is a scope container to pass
987
                        func1 and func2 to the "call_both" function
988
                        outside of its arguments"""
989
                        def call_both(*args, **kwargs):
990
                            """This function will emit two D-Bus
991
                            signals by calling func1 and func2"""
992
                            func1(*args, **kwargs)
993
                            func2(*args, **kwargs)
994
                        return call_both
995
                    # Create the "call_both" function and add it to
996
                    # the class
997
                    attr[attrname] = fixscope(attribute,
998
                                              new_function)
999
                # Is this a D-Bus method?
1000
                elif getattr(attribute, "_dbus_is_method", False):
1001
                    # Create a new, but exactly alike, function
1002
                    # object.  Decorate it to be a new D-Bus method
1003
                    # with the alternate D-Bus interface name.  Add it
1004
                    # to the class.
1005
                    attr[attrname] = (dbus.service.method
1006
                                      (alt_interface,
1007
                                       attribute._dbus_in_signature,
1008
                                       attribute._dbus_out_signature)
1009
                                      (types.FunctionType
1010
                                       (attribute.func_code,
1011
                                        attribute.func_globals,
1012
                                        attribute.func_name,
1013
                                        attribute.func_defaults,
1014
                                        attribute.func_closure)))
1015
                # Is this a D-Bus property?
1016
                elif getattr(attribute, "_dbus_is_property", False):
1017
                    # Create a new, but exactly alike, function
1018
                    # object, and decorate it to be a new D-Bus
1019
                    # property with the alternate D-Bus interface
1020
                    # name.  Add it to the class.
1021
                    attr[attrname] = (dbus_service_property
1022
                                      (alt_interface,
1023
                                       attribute._dbus_signature,
1024
                                       attribute._dbus_access,
1025
                                       attribute
1026
                                       ._dbus_get_args_options
1027
                                       ["byte_arrays"])
1028
                                      (types.FunctionType
1029
                                       (attribute.func_code,
1030
                                        attribute.func_globals,
1031
                                        attribute.func_name,
1032
                                        attribute.func_defaults,
1033
                                        attribute.func_closure)))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1034
        return type.__new__(mcs, name, bases, attr)
1035
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1036
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1037
class ClientDBus(Client, DBusObjectWithProperties):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1038
    """A Client class using D-Bus
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1039
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1040
    Attributes:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1041
    dbus_object_path: dbus.ObjectPath
1042
    bus: dbus.SystemBus()
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1043
    """
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
1044
    
1045
    runtime_expansions = (Client.runtime_expansions
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1046
                          + ("dbus_object_path",))
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
1047
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1048
    # dbus.service.Object doesn't use super(), so we can't either.
1049
    
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1050
    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
1051
        self.bus = bus
1052
        Client.__init__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1053
        # Only now, when this client is initialized, can it show up on
1054
        # the D-Bus
441 by Teddy Hogeborn
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
1055
        client_object_name = unicode(self.name).translate(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1056
            {ord("."): ord("_"),
1057
             ord("-"): ord("_")})
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1058
        self.dbus_object_path = (dbus.ObjectPath
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1059
                                 ("/clients/" + client_object_name))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1060
        DBusObjectWithProperties.__init__(self, self.bus,
1061
                                          self.dbus_object_path)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1062
        
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1063
    def notifychangeproperty(transform_func,
1064
                             dbus_name, type_func=lambda x: x,
1065
                             variant_level=1):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1066
        """ Modify a variable so that it's a property which announces
1067
        its changes to DBus.
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1068
        
505.1.15 by Teddy Hogeborn
Bug fix: Make D-Bus properties settable again.
1069
        transform_fun: Function that takes a value and a variant_level
1070
                       and transforms it to a D-Bus type.
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1071
        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
1072
        type_func: Function that transform the value before sending it
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1073
                   to the D-Bus.  Default: no transform
1074
        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
1075
        """
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1076
        attrname = "_{0}".format(dbus_name)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1077
        def setter(self, value):
1078
            if hasattr(self, "dbus_object_path"):
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1079
                if (not hasattr(self, attrname) or
1080
                    type_func(getattr(self, attrname, None))
1081
                    != type_func(value)):
1082
                    dbus_value = transform_func(type_func(value),
505.1.15 by Teddy Hogeborn
Bug fix: Make D-Bus properties settable again.
1083
                                                variant_level
1084
                                                =variant_level)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1085
                    self.PropertyChanged(dbus.String(dbus_name),
1086
                                         dbus_value)
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1087
            setattr(self, attrname, value)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1088
        
505.1.6 by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
1089
        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
1090
    
1091
    
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1092
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
                                             "ApprovalPending",
1095
                                             type_func = bool)
1096
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1097
    last_enabled = notifychangeproperty(datetime_to_dbus,
1098
                                        "LastEnabled")
1099
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1100
                                   type_func = lambda checker:
1101
                                       checker is not None)
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1102
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
                                           "LastCheckedOK")
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1104
    last_checker_status = notifychangeproperty(dbus.Int16,
1105
                                               "LastCheckerStatus")
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
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1230
    ## Methods
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1231
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1232
    # Approve - method
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1233
    @dbus.service.method(_interface, in_signature="b")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1234
    def Approve(self, value):
1235
        self.approve(value)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1236
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1237
    # CheckedOK - method
1238
    @dbus.service.method(_interface)
1239
    def CheckedOK(self):
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1240
        self.checked_ok()
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1241
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1242
    # Enable - method
1243
    @dbus.service.method(_interface)
1244
    def Enable(self):
1245
        "D-Bus method"
1246
        self.enable()
1247
    
1248
    # StartChecker - method
1249
    @dbus.service.method(_interface)
1250
    def StartChecker(self):
1251
        "D-Bus method"
1252
        self.start_checker()
1253
    
1254
    # Disable - method
1255
    @dbus.service.method(_interface)
1256
    def Disable(self):
1257
        "D-Bus method"
1258
        self.disable()
1259
    
1260
    # StopChecker - method
1261
    @dbus.service.method(_interface)
1262
    def StopChecker(self):
1263
        self.stop_checker()
1264
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
1265
    ## Properties
1266
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1267
    # ApprovalPending - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1268
    @dbus_service_property(_interface, signature="b", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1269
    def ApprovalPending_dbus_property(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1270
        return dbus.Boolean(bool(self.approvals_pending))
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1271
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1272
    # ApprovedByDefault - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1273
    @dbus_service_property(_interface, signature="b",
1274
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1275
    def ApprovedByDefault_dbus_property(self, value=None):
1276
        if value is None:       # get
1277
            return dbus.Boolean(self.approved_by_default)
1278
        self.approved_by_default = bool(value)
1279
    
1280
    # ApprovalDelay - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1281
    @dbus_service_property(_interface, signature="t",
1282
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1283
    def ApprovalDelay_dbus_property(self, value=None):
1284
        if value is None:       # get
1285
            return dbus.UInt64(self.approval_delay_milliseconds())
1286
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1287
    
1288
    # ApprovalDuration - 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 ApprovalDuration_dbus_property(self, value=None):
1292
        if value is None:       # get
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1293
            return dbus.UInt64(timedelta_to_milliseconds(
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1294
                    self.approval_duration))
1295
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1296
    
1297
    # Name - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1298
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1299
    def Name_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1300
        return dbus.String(self.name)
1301
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1302
    # Fingerprint - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1303
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1304
    def Fingerprint_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1305
        return dbus.String(self.fingerprint)
1306
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1307
    # Host - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1308
    @dbus_service_property(_interface, signature="s",
1309
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1310
    def Host_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1311
        if value is None:       # get
1312
            return dbus.String(self.host)
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
1313
        self.host = unicode(value)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1314
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1315
    # Created - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1316
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1317
    def Created_dbus_property(self):
518.2.3 by Teddy Hogeborn
Make "enabled" a client config option.
1318
        return datetime_to_dbus(self.created)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1319
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1320
    # LastEnabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1321
    @dbus_service_property(_interface, signature="s", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1322
    def LastEnabled_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1323
        return datetime_to_dbus(self.last_enabled)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1324
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1325
    # Enabled - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1326
    @dbus_service_property(_interface, signature="b",
1327
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1328
    def Enabled_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1329
        if value is None:       # get
1330
            return dbus.Boolean(self.enabled)
1331
        if value:
1332
            self.enable()
1333
        else:
1334
            self.disable()
1335
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1336
    # LastCheckedOK - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1337
    @dbus_service_property(_interface, signature="s",
1338
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1339
    def LastCheckedOK_dbus_property(self, value=None):
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1340
        if value is not None:
1341
            self.checked_ok()
1342
            return
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1343
        return datetime_to_dbus(self.last_checked_ok)
24.1.179 by Björn Påhlsson
New feature:
1344
    
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1345
    # LastCheckerStatus - property
1346
    @dbus_service_property(_interface, signature="n",
1347
                           access="read")
1348
    def LastCheckerStatus_dbus_property(self):
1349
        return dbus.Int16(self.last_checker_status)
1350
    
24.1.179 by Björn Påhlsson
New feature:
1351
    # Expires - property
1352
    @dbus_service_property(_interface, signature="s", access="read")
1353
    def Expires_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1354
        return datetime_to_dbus(self.expires)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1355
    
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1356
    # LastApprovalRequest - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1357
    @dbus_service_property(_interface, signature="s", access="read")
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1358
    def LastApprovalRequest_dbus_property(self):
24.1.182 by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending
1359
        return datetime_to_dbus(self.last_approval_request)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
1360
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1361
    # Timeout - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1362
    @dbus_service_property(_interface, signature="t",
1363
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1364
    def Timeout_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1365
        if value is None:       # get
1366
            return dbus.UInt64(self.timeout_milliseconds())
1367
        self.timeout = datetime.timedelta(0, 0, 0, value)
1368
        # Reschedule timeout
543 by Teddy Hogeborn
* mandos: Break some long lines.
1369
        if self.enabled:
1370
            now = datetime.datetime.utcnow()
1371
            time_to_die = timedelta_to_milliseconds(
1372
                (self.last_checked_ok + self.timeout) - now)
1373
            if time_to_die <= 0:
1374
                # The timeout has passed
1375
                self.disable()
1376
            else:
1377
                self.expires = (now +
1378
                                datetime.timedelta(milliseconds =
1379
                                                   time_to_die))
1380
                if (getattr(self, "disable_initiator_tag", None)
1381
                    is None):
1382
                    return
1383
                gobject.source_remove(self.disable_initiator_tag)
1384
                self.disable_initiator_tag = (gobject.timeout_add
1385
                                              (time_to_die,
1386
                                               self.disable))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1387
    
24.1.179 by Björn Påhlsson
New feature:
1388
    # ExtendedTimeout - property
1389
    @dbus_service_property(_interface, signature="t",
1390
                           access="readwrite")
1391
    def ExtendedTimeout_dbus_property(self, value=None):
1392
        if value is None:       # get
1393
            return dbus.UInt64(self.extended_timeout_milliseconds())
1394
        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
1395
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1396
    # Interval - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1397
    @dbus_service_property(_interface, signature="t",
1398
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1399
    def Interval_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1400
        if value is None:       # get
1401
            return dbus.UInt64(self.interval_milliseconds())
1402
        self.interval = datetime.timedelta(0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1403
        if getattr(self, "checker_initiator_tag", None) is None:
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1404
            return
518.2.3 by Teddy Hogeborn
Make "enabled" a client config option.
1405
        if self.enabled:
1406
            # Reschedule checker run
1407
            gobject.source_remove(self.checker_initiator_tag)
1408
            self.checker_initiator_tag = (gobject.timeout_add
1409
                                          (value, self.start_checker))
1410
            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
1411
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1412
    # Checker - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1413
    @dbus_service_property(_interface, signature="s",
1414
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1415
    def Checker_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1416
        if value is None:       # get
1417
            return dbus.String(self.checker_command)
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
1418
        self.checker_command = unicode(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1419
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1420
    # CheckerRunning - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1421
    @dbus_service_property(_interface, signature="b",
1422
                           access="readwrite")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1423
    def CheckerRunning_dbus_property(self, value=None):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1424
        if value is None:       # get
1425
            return dbus.Boolean(self.checker is not None)
1426
        if value:
1427
            self.start_checker()
1428
        else:
1429
            self.stop_checker()
1430
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1431
    # ObjectPath - property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1432
    @dbus_service_property(_interface, signature="o", access="read")
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1433
    def ObjectPath_dbus_property(self):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1434
        return self.dbus_object_path # is already a dbus.ObjectPath
1435
    
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1436
    # Secret = property
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1437
    @dbus_service_property(_interface, signature="ay",
1438
                           access="write", byte_arrays=True)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1439
    def Secret_dbus_property(self, value):
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1440
        self.secret = str(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1441
    
1442
    del _interface
3 by Björn Påhlsson
Python based server
1443
1444
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1445
class ProxyClient(object):
1446
    def __init__(self, child_pipe, fpr, address):
1447
        self._pipe = child_pipe
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1448
        self._pipe.send(('init', fpr, address))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1449
        if not self._pipe.recv():
1450
            raise KeyError()
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1451
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1452
    def __getattribute__(self, name):
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1453
        if name == '_pipe':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1454
            return super(ProxyClient, self).__getattribute__(name)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1455
        self._pipe.send(('getattr', name))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1456
        data = self._pipe.recv()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1457
        if data[0] == 'data':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1458
            return data[1]
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1459
        if data[0] == 'function':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1460
            def func(*args, **kwargs):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1461
                self._pipe.send(('funcall', name, args, kwargs))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1462
                return self._pipe.recv()[1]
1463
            return func
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1464
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1465
    def __setattr__(self, name, value):
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1466
        if name == '_pipe':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1467
            return super(ProxyClient, self).__setattr__(name, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1468
        self._pipe.send(('setattr', name, value))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1469
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1470
24.1.186 by Björn Påhlsson
transitional stuff actually working
1471
class ClientDBusTransitional(ClientDBus):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
1472
    __metaclass__ = AlternateDBusNamesMetaclass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1473
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
1474
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1475
class ClientHandler(socketserver.BaseRequestHandler, object):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1476
    """A class to handle client connections.
1477
    
1478
    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
1479
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1480
    
3 by Björn Påhlsson
Python based server
1481
    def handle(self):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1482
        with contextlib.closing(self.server.child_pipe) as child_pipe:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1483
            logger.info("TCP connection from: %s",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1484
                        unicode(self.client_address))
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1485
            logger.debug("Pipe FD: %d",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1486
                         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
1487
            
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1488
            session = (gnutls.connection
1489
                       .ClientSession(self.request,
1490
                                      gnutls.connection
1491
                                      .X509Credentials()))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1492
            
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1493
            # Note: gnutls.connection.X509Credentials is really a
1494
            # generic GnuTLS certificate credentials object so long as
1495
            # no X.509 keys are added to it.  Therefore, we can use it
1496
            # 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
1497
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1498
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
            #                      "+AES-256-CBC", "+SHA1",
1500
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1501
            #                      "+DHE-DSS"))
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1502
            # Use a fallback default, since this MUST be set.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1503
            priority = self.server.gnutls_priority
1504
            if priority is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1505
                priority = "NORMAL"
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1506
            (gnutls.library.functions
1507
             .gnutls_priority_set_direct(session._c_object,
1508
                                         priority, None))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1509
            
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1510
            # Start communication using the Mandos protocol
1511
            # Get protocol number
1512
            line = self.request.makefile().readline()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1513
            logger.debug("Protocol version: %r", line)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1514
            try:
1515
                if int(line.strip().split()[0]) > 1:
1516
                    raise RuntimeError
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1517
            except (ValueError, IndexError, RuntimeError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1518
                logger.error("Unknown protocol version: %s", error)
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1519
                return
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1520
            
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1521
            # Start GnuTLS connection
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1522
            try:
1523
                session.handshake()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1524
            except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1525
                logger.warning("Handshake failed: %s", error)
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1526
                # Do not run session.bye() here: the session is not
1527
                # established.  Just abandon the request.
1528
                return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1529
            logger.debug("Handshake succeeded")
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1530
            
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1531
            approval_required = False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1532
            try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1533
                try:
1534
                    fpr = self.fingerprint(self.peer_certificate
1535
                                           (session))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1536
                except (TypeError,
1537
                        gnutls.errors.GNUTLSError) as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1538
                    logger.warning("Bad certificate: %s", error)
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1539
                    return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1540
                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
1541
                
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1542
                try:
1543
                    client = ProxyClient(child_pipe, fpr,
1544
                                         self.client_address)
1545
                except KeyError:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1546
                    return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1547
                
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1548
                if client.approval_delay:
1549
                    delay = client.approval_delay
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1550
                    client.approvals_pending += 1
1551
                    approval_required = True
1552
                
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1553
                while True:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1554
                    if not client.enabled:
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1555
                        logger.info("Client %s is disabled",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1556
                                       client.name)
1557
                        if self.server.use_dbus:
1558
                            # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1559
                            client.Rejected("Disabled")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1560
                        return
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1561
                    
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1562
                    if client.approved or not client.approval_delay:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1563
                        #We are approved or approval is disabled
1564
                        break
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1565
                    elif client.approved is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1566
                        logger.info("Client %s needs approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1567
                                    client.name)
1568
                        if self.server.use_dbus:
1569
                            # Emit D-Bus signal
1570
                            client.NeedApproval(
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
1571
                                client.approval_delay_milliseconds(),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1572
                                client.approved_by_default)
1573
                    else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1574
                        logger.warning("Client %s was not approved",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1575
                                       client.name)
1576
                        if self.server.use_dbus:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1577
                            # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1578
                            client.Rejected("Denied")
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1579
                        return
1580
                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1581
                    #wait until timeout or approved
1582
                    time = datetime.datetime.now()
1583
                    client.changedstate.acquire()
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1584
                    (client.changedstate.wait
518.2.4 by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to
1585
                     (float(client.timedelta_to_milliseconds(delay)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1586
                            / 1000)))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1587
                    client.changedstate.release()
1588
                    time2 = datetime.datetime.now()
1589
                    if (time2 - time) >= delay:
1590
                        if not client.approved_by_default:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1591
                            logger.warning("Client %s timed out while"
1592
                                           " waiting for approval",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1593
                                           client.name)
1594
                            if self.server.use_dbus:
1595
                                # Emit D-Bus signal
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1596
                                client.Rejected("Approval timed out")
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1597
                            return
1598
                        else:
1599
                            break
1600
                    else:
1601
                        delay -= time2 - time
1602
                
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1603
                sent_size = 0
1604
                while sent_size < len(client.secret):
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1605
                    try:
1606
                        sent = session.send(client.secret[sent_size:])
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1607
                    except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1608
                        logger.warning("gnutls send failed")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1609
                        return
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1610
                    logger.debug("Sent: %d, remaining: %d",
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1611
                                 sent, len(client.secret)
1612
                                 - (sent_size + sent))
1613
                    sent_size += sent
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1614
                
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1615
                logger.info("Sending secret to %s", client.name)
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1616
                # bump the timeout using extended_timeout
556 by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
1617
                client.bump_timeout(client.extended_timeout)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1618
                if self.server.use_dbus:
1619
                    # Emit D-Bus signal
1620
                    client.GotSecret()
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1621
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1622
            finally:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1623
                if approval_required:
1624
                    client.approvals_pending -= 1
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1625
                try:
1626
                    session.bye()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1627
                except gnutls.errors.GNUTLSError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1628
                    logger.warning("GnuTLS bye failed")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1629
    
1630
    @staticmethod
1631
    def peer_certificate(session):
1632
        "Return the peer's OpenPGP certificate as a bytestring"
1633
        # If not an OpenPGP certificate...
1634
        if (gnutls.library.functions
1635
            .gnutls_certificate_type_get(session._c_object)
1636
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1637
            # ...do the normal thing
1638
            return session.peer_certificate
1639
        list_size = ctypes.c_uint(1)
1640
        cert_list = (gnutls.library.functions
1641
                     .gnutls_certificate_get_peers
1642
                     (session._c_object, ctypes.byref(list_size)))
1643
        if not bool(cert_list) and list_size.value != 0:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1644
            raise gnutls.errors.GNUTLSError("error getting peer"
1645
                                            " certificate")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1646
        if list_size.value == 0:
1647
            return None
1648
        cert = cert_list[0]
1649
        return ctypes.string_at(cert.data, cert.size)
1650
    
1651
    @staticmethod
1652
    def fingerprint(openpgp):
1653
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1654
        # New GnuTLS "datum" with the OpenPGP public key
1655
        datum = (gnutls.library.types
1656
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1657
                                             ctypes.POINTER
1658
                                             (ctypes.c_ubyte)),
1659
                                 ctypes.c_uint(len(openpgp))))
1660
        # New empty GnuTLS certificate
1661
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1662
        (gnutls.library.functions
1663
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1664
        # Import the OpenPGP public key into the certificate
1665
        (gnutls.library.functions
1666
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1667
                                    gnutls.library.constants
1668
                                    .GNUTLS_OPENPGP_FMT_RAW))
1669
        # Verify the self signature in the key
1670
        crtverify = ctypes.c_uint()
1671
        (gnutls.library.functions
1672
         .gnutls_openpgp_crt_verify_self(crt, 0,
1673
                                         ctypes.byref(crtverify)))
1674
        if crtverify.value != 0:
1675
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1676
            raise (gnutls.errors.CertificateSecurityError
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1677
                   ("Verify failed"))
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1678
        # New buffer for the fingerprint
1679
        buf = ctypes.create_string_buffer(20)
1680
        buf_len = ctypes.c_size_t()
1681
        # Get the fingerprint from the certificate into the buffer
1682
        (gnutls.library.functions
1683
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1684
                                             ctypes.byref(buf_len)))
1685
        # Deinit the certificate
1686
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1687
        # Convert the buffer to a Python bytestring
1688
        fpr = ctypes.string_at(buf, buf_len.value)
1689
        # Convert the bytestring to hexadecimal notation
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
1690
        hex_fpr = binascii.hexlify(fpr).upper()
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1691
        return hex_fpr
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1692
1693
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1694
class MultiprocessingMixIn(object):
1695
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1696
    def sub_process_main(self, request, address):
1697
        try:
1698
            self.finish_request(request, address)
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
1699
        except Exception:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1700
            self.handle_error(request, address)
1701
        self.close_request(request)
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1702
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1703
    def process_request(self, request, address):
1704
        """Start a new process to process the request."""
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1705
        proc = multiprocessing.Process(target = self.sub_process_main,
1706
                                       args = (request,
1707
                                               address))
1708
        proc.start()
1709
        return proc
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1710
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1711
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1712
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
    """ adds a pipe to the MixIn """
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1714
    def process_request(self, request, client_address):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1715
        """Overrides and wraps the original process_request().
1716
        
355 by Teddy Hogeborn
* mandos: White-space fixes only.
1717
        This function creates a new pipe in self.pipe
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1718
        """
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1719
        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
1720
        
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1721
        proc = MultiprocessingMixIn.process_request(self, request,
1722
                                                    client_address)
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1723
        self.child_pipe.close()
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1724
        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
1725
    
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1726
    def add_pipe(self, parent_pipe, proc):
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1727
        """Dummy function; override as necessary"""
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
1728
        raise NotImplementedError
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1729
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1730
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1731
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1732
                     socketserver.TCPServer, object):
237.2.13 by Teddy Hogeborn
Merge from trunk. Notable changes:
1733
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1734
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1735
    Attributes:
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1736
        enabled:        Boolean; whether this server is activated yet
1737
        interface:      None or a network interface name (string)
1738
        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
1739
    """
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1740
    def __init__(self, server_address, RequestHandlerClass,
339 by Teddy Hogeborn
Code cleanup.
1741
                 interface=None, use_ipv6=True):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1742
        self.interface = interface
1743
        if use_ipv6:
1744
            self.address_family = socket.AF_INET6
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1745
        socketserver.TCPServer.__init__(self, server_address,
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1746
                                        RequestHandlerClass)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1747
    def server_bind(self):
1748
        """This overrides the normal server_bind() function
1749
        to bind to an interface if one was specified, and also NOT to
1750
        bind to an address or port if they were not specified."""
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1751
        if self.interface is not None:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1752
            if SO_BINDTODEVICE is None:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1753
                logger.error("SO_BINDTODEVICE does not exist;"
1754
                             " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1755
                             self.interface)
1756
            else:
1757
                try:
1758
                    self.socket.setsockopt(socket.SOL_SOCKET,
1759
                                           SO_BINDTODEVICE,
1760
                                           str(self.interface
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1761
                                               + '\0'))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1762
                except socket.error as error:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1763
                    if error[0] == errno.EPERM:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1764
                        logger.error("No permission to"
1765
                                     " bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1766
                                     self.interface)
1767
                    elif error[0] == errno.ENOPROTOOPT:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1768
                        logger.error("SO_BINDTODEVICE not available;"
1769
                                     " cannot bind to interface %s",
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1770
                                     self.interface)
1771
                    else:
1772
                        raise
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1773
        # Only bind(2) the socket if we really need to.
1774
        if self.server_address[0] or self.server_address[1]:
1775
            if not self.server_address[0]:
314 by Teddy Hogeborn
Support not using IPv6 in server:
1776
                if self.address_family == socket.AF_INET6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1777
                    any_address = "::" # in6addr_any
314 by Teddy Hogeborn
Support not using IPv6 in server:
1778
                else:
1779
                    any_address = socket.INADDR_ANY
1780
                self.server_address = (any_address,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1781
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1782
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1783
                self.server_address = (self.server_address[0],
1784
                                       0)
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1785
#                 if self.interface:
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1786
#                     self.server_address = (self.server_address[0],
1787
#                                            0, # port
1788
#                                            0, # flowinfo
1789
#                                            if_nametoindex
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1790
#                                            (self.interface))
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1791
            return socketserver.TCPServer.server_bind(self)
339 by Teddy Hogeborn
Code cleanup.
1792
1793
1794
class MandosServer(IPv6_TCPServer):
1795
    """Mandos server.
1796
    
1797
    Attributes:
1798
        clients:        set of Client objects
1799
        gnutls_priority GnuTLS priority string
1800
        use_dbus:       Boolean; to emit D-Bus signals or not
340 by Teddy Hogeborn
Code cleanup.
1801
    
1802
    Assumes a gobject.MainLoop event loop.
339 by Teddy Hogeborn
Code cleanup.
1803
    """
1804
    def __init__(self, server_address, RequestHandlerClass,
1805
                 interface=None, use_ipv6=True, clients=None,
1806
                 gnutls_priority=None, use_dbus=True):
1807
        self.enabled = False
1808
        self.clients = clients
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1809
        if self.clients is None:
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
1810
            self.clients = {}
339 by Teddy Hogeborn
Code cleanup.
1811
        self.use_dbus = use_dbus
1812
        self.gnutls_priority = gnutls_priority
1813
        IPv6_TCPServer.__init__(self, server_address,
1814
                                RequestHandlerClass,
1815
                                interface = interface,
1816
                                use_ipv6 = use_ipv6)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1817
    def server_activate(self):
1818
        if self.enabled:
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1819
            return socketserver.TCPServer.server_activate(self)
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1820
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1821
    def enable(self):
1822
        self.enabled = True
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1823
    
1824
    def add_pipe(self, parent_pipe, proc):
340 by Teddy Hogeborn
Code cleanup.
1825
        # Call "handle_ipc" for both data and EOF events
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1826
        gobject.io_add_watch(parent_pipe.fileno(),
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1827
                             gobject.IO_IN | gobject.IO_HUP,
1828
                             functools.partial(self.handle_ipc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1829
                                               parent_pipe =
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1830
                                               parent_pipe,
1831
                                               proc = proc))
505.1.9 by Teddy Hogeborn
Whitespace
1832
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1833
    def handle_ipc(self, source, condition, parent_pipe=None,
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1834
                   proc = None, client_object=None):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1835
        condition_names = {
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1836
            gobject.IO_IN: "IN",   # There is data to read.
1837
            gobject.IO_OUT: "OUT", # Data can be written (without
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1838
                                    # blocking).
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1839
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1840
            gobject.IO_ERR: "ERR", # Error condition.
1841
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1842
                                    # broken, usually for pipes and
1843
                                    # sockets).
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1844
            }
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1845
        conditions_string = ' | '.join(name
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1846
                                       for cond, name in
1847
                                       condition_names.iteritems()
1848
                                       if cond & condition)
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1849
        # 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
1850
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
505.1.13 by Teddy Hogeborn
Miscellaneous fixes prompted by lintian:
1851
            # Wait for other process to exit
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1852
            proc.join()
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
1853
            return False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1854
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1855
        # Read a request from the child
1856
        request = parent_pipe.recv()
1857
        command = request[0]
1858
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1859
        if command == 'init':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1860
            fpr = request[1]
1861
            address = request[2]
1862
            
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
1863
            for c in self.clients.itervalues():
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1864
                if c.fingerprint == fpr:
1865
                    client = c
1866
                    break
1867
            else:
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1868
                logger.info("Client not found for fingerprint: %s, ad"
1869
                            "dress: %s", fpr, address)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1870
                if self.use_dbus:
1871
                    # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1872
                    mandos_dbus_service.ClientNotFound(fpr,
1873
                                                       address[0])
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1874
                parent_pipe.send(False)
1875
                return False
1876
            
1877
            gobject.io_add_watch(parent_pipe.fileno(),
1878
                                 gobject.IO_IN | gobject.IO_HUP,
1879
                                 functools.partial(self.handle_ipc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1880
                                                   parent_pipe =
1881
                                                   parent_pipe,
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
1882
                                                   proc = proc,
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1883
                                                   client_object =
1884
                                                   client))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1885
            parent_pipe.send(True)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1886
            # remove the old hook in favor of the new above hook on
1887
            # same fileno
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1888
            return False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1889
        if command == 'funcall':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1890
            funcname = request[1]
1891
            args = request[2]
1892
            kwargs = request[3]
1893
            
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1894
            parent_pipe.send(('data', getattr(client_object,
1895
                                              funcname)(*args,
1896
                                                         **kwargs)))
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
1897
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1898
        if command == 'getattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1899
            attrname = request[1]
1900
            if callable(client_object.__getattribute__(attrname)):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1901
                parent_pipe.send(('function',))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1902
            else:
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
1903
                parent_pipe.send(('data', client_object
1904
                                  .__getattribute__(attrname)))
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1905
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1906
        if command == 'setattr':
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1907
            attrname = request[1]
1908
            value = request[2]
1909
            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
1910
        
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1911
        return True
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
1912
3 by Björn Påhlsson
Python based server
1913
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1914
def string_to_delta(interval):
1915
    """Parse a string and return a datetime.timedelta
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1916
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1917
    >>> string_to_delta('7d')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1918
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1919
    >>> string_to_delta('60s')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1920
    datetime.timedelta(0, 60)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1921
    >>> string_to_delta('60m')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1922
    datetime.timedelta(0, 3600)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1923
    >>> string_to_delta('24h')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1924
    datetime.timedelta(1)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1925
    >>> string_to_delta('1w')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1926
    datetime.timedelta(7)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1927
    >>> string_to_delta('5m 30s')
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1928
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1929
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1930
    timevalue = datetime.timedelta(0)
1931
    for s in interval.split():
1932
        try:
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1933
            suffix = unicode(s[-1])
1934
            value = int(s[:-1])
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1935
            if suffix == "d":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1936
                delta = datetime.timedelta(value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1937
            elif suffix == "s":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1938
                delta = datetime.timedelta(0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1939
            elif suffix == "m":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1940
                delta = datetime.timedelta(0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1941
            elif suffix == "h":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1943
            elif suffix == "w":
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1944
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1945
            else:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1946
                raise ValueError("Unknown suffix %r" % suffix)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
1947
        except (ValueError, IndexError) as e:
464 by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also
1948
            raise ValueError(*(e.args))
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1949
        timevalue += delta
1950
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1951
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
1952
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1953
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1954
    """See daemon(3).  Standard BSD Unix function.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1955
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1956
    This should really exist as os.daemon, but it doesn't (yet)."""
1957
    if os.fork():
1958
        sys.exit()
1959
    os.setsid()
1960
    if not nochdir:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1961
        os.chdir("/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
1962
    if os.fork():
1963
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1964
    if not noclose:
1965
        # Close all standard open file descriptors
28 by Teddy Hogeborn
* server.conf: New file.
1966
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1967
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1968
            raise OSError(errno.ENODEV,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
1969
                          "%s not a character device"
388 by Teddy Hogeborn
* mandos (daemon): Use "os.path.devnull" in the error message.
1970
                          % os.path.devnull)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1971
        os.dup2(null, sys.stdin.fileno())
1972
        os.dup2(null, sys.stdout.fileno())
1973
        os.dup2(null, sys.stderr.fileno())
1974
        if null > 2:
1975
            os.close(null)
1976
1977
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1978
def main():
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1979
    
379 by Teddy Hogeborn
* mandos: Fix line lengths.
1980
    ##################################################################
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1981
    # Parsing of options, both command line and config file
1982
    
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
1983
    parser = argparse.ArgumentParser()
1984
    parser.add_argument("-v", "--version", action="version",
1985
                        version = "%%(prog)s %s" % version,
1986
                        help="show version number and exit")
1987
    parser.add_argument("-i", "--interface", metavar="IF",
1988
                        help="Bind to interface IF")
1989
    parser.add_argument("-a", "--address",
1990
                        help="Address to listen for requests on")
1991
    parser.add_argument("-p", "--port", type=int,
1992
                        help="Port number to receive requests on")
1993
    parser.add_argument("--check", action="store_true",
1994
                        help="Run self-test")
1995
    parser.add_argument("--debug", action="store_true",
1996
                        help="Debug mode; run in foreground and log"
1997
                        " to terminal")
1998
    parser.add_argument("--debuglevel", metavar="LEVEL",
1999
                        help="Debug level for stdout output")
2000
    parser.add_argument("--priority", help="GnuTLS"
2001
                        " priority string (see GnuTLS documentation)")
2002
    parser.add_argument("--servicename",
2003
                        metavar="NAME", help="Zeroconf service name")
2004
    parser.add_argument("--configdir",
2005
                        default="/etc/mandos", metavar="DIR",
2006
                        help="Directory to search for configuration"
2007
                        " files")
2008
    parser.add_argument("--no-dbus", action="store_false",
2009
                        dest="use_dbus", help="Do not provide D-Bus"
2010
                        " system bus interface")
2011
    parser.add_argument("--no-ipv6", action="store_false",
2012
                        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
2013
    parser.add_argument("--no-restore", action="store_false",
518.1.7 by Teddy Hogeborn
* mandos: Break long lines and fix some more white space.
2014
                        dest="restore", help="Do not restore stored"
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2015
                        " state")
2016
    parser.add_argument("--statedir", metavar="DIR",
2017
                        help="Directory to save/restore state in")
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2018
    
474 by teddy at bsnet
* mandos: Use the new argparse library instead of optparse.
2019
    options = parser.parse_args()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2020
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
2021
    if options.check:
2022
        import doctest
2023
        doctest.testmod()
2024
        sys.exit()
3 by Björn Påhlsson
Python based server
2025
    
28 by Teddy Hogeborn
* server.conf: New file.
2026
    # Default values for config file for server-global settings
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2027
    server_defaults = { "interface": "",
2028
                        "address": "",
2029
                        "port": "",
2030
                        "debug": "False",
2031
                        "priority":
2032
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2033
                        "servicename": "Mandos",
2034
                        "use_dbus": "True",
2035
                        "use_ipv6": "True",
2036
                        "debuglevel": "",
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2037
                        "restore": "True",
2038
                        "statedir": "/var/lib/mandos"
28 by Teddy Hogeborn
* server.conf: New file.
2039
                        }
2040
    
2041
    # Parse config file for server-global settings
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
2042
    server_config = configparser.SafeConfigParser(server_defaults)
28 by Teddy Hogeborn
* server.conf: New file.
2043
    del server_defaults
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2044
    server_config.read(os.path.join(options.configdir,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2045
                                    "mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
2046
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
2047
    server_settings = server_config.defaults()
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
2048
    # Use the appropriate methods on the non-string config options
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2049
    for option in ("debug", "use_dbus", "use_ipv6"):
2050
        server_settings[option] = server_config.getboolean("DEFAULT",
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2051
                                                           option)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2052
    if server_settings["port"]:
2053
        server_settings["port"] = server_config.getint("DEFAULT",
2054
                                                       "port")
28 by Teddy Hogeborn
* server.conf: New file.
2055
    del server_config
2056
    
2057
    # Override the settings from the config file with command line
2058
    # options, if set.
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2059
    for option in ("interface", "address", "port", "debug",
2060
                   "priority", "servicename", "configdir",
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2061
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2062
                   "statedir"):
28 by Teddy Hogeborn
* server.conf: New file.
2063
        value = getattr(options, option)
2064
        if value is not None:
2065
            server_settings[option] = value
2066
    del options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2067
    # Force all strings to be unicode
2068
    for option in server_settings.keys():
2069
        if type(server_settings[option]) is str:
2070
            server_settings[option] = unicode(server_settings[option])
28 by Teddy Hogeborn
* server.conf: New file.
2071
    # Now we have our good server settings in "server_settings"
2072
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2073
    ##################################################################
2074
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2075
    # For convenience
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2076
    debug = server_settings["debug"]
2077
    debuglevel = server_settings["debuglevel"]
2078
    use_dbus = server_settings["use_dbus"]
2079
    use_ipv6 = server_settings["use_ipv6"]
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
2080
    stored_state_path = os.path.join(server_settings["statedir"],
2081
                                     stored_state_file)
24.1.185 by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile
2082
    
518.1.4 by Björn Påhlsson
restructured logger
2083
    if debug:
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2084
        initlogger(debug, logging.DEBUG)
518.1.4 by Björn Påhlsson
restructured logger
2085
    else:
2086
        if not debuglevel:
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2087
            initlogger(debug)
518.1.4 by Björn Påhlsson
restructured logger
2088
        else:
2089
            level = getattr(logging, debuglevel.upper())
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2090
            initlogger(debug, level)
518.1.4 by Björn Påhlsson
restructured logger
2091
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2092
    if server_settings["servicename"] != "Mandos":
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
2093
        syslogger.setFormatter(logging.Formatter
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2094
                               ('Mandos (%s) [%%(process)d]:'
2095
                                ' %%(levelname)s: %%(message)s'
2096
                                % server_settings["servicename"]))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
2097
    
28 by Teddy Hogeborn
* server.conf: New file.
2098
    # Parse config file with clients
543 by Teddy Hogeborn
* mandos: Break some long lines.
2099
    client_config = configparser.SafeConfigParser(Client
2100
                                                  .client_defaults)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2101
    client_config.read(os.path.join(server_settings["configdir"],
2102
                                    "clients.conf"))
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2103
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2104
    global mandos_dbus_service
2105
    mandos_dbus_service = None
28 by Teddy Hogeborn
* server.conf: New file.
2106
    
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2107
    tcp_server = MandosServer((server_settings["address"],
2108
                               server_settings["port"]),
339 by Teddy Hogeborn
Code cleanup.
2109
                              ClientHandler,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2110
                              interface=(server_settings["interface"]
237.2.35 by teddy at bsnet
* mandos (main): Bug fix: Don't try to bind to an empty string
2111
                                         or None),
339 by Teddy Hogeborn
Code cleanup.
2112
                              use_ipv6=use_ipv6,
2113
                              gnutls_priority=
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2114
                              server_settings["priority"],
339 by Teddy Hogeborn
Code cleanup.
2115
                              use_dbus=use_dbus)
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2116
    if not debug:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2117
        pidfilename = "/var/run/mandos.pid"
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2118
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2119
            pidfile = open(pidfilename, "w")
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2120
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2121
            logger.error("Could not open file %r", pidfilename)
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
2122
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2123
    try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2124
        uid = pwd.getpwnam("_mandos").pw_uid
2125
        gid = pwd.getpwnam("_mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2126
    except KeyError:
2127
        try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2128
            uid = pwd.getpwnam("mandos").pw_uid
2129
            gid = pwd.getpwnam("mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2130
        except KeyError:
2131
            try:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2132
                uid = pwd.getpwnam("nobody").pw_uid
2133
                gid = pwd.getpwnam("nobody").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2134
            except KeyError:
2135
                uid = 65534
2136
                gid = 65534
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2137
    try:
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2138
        os.setgid(gid)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2139
        os.setuid(uid)
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2140
    except OSError as error:
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2141
        if error[0] != errno.EPERM:
2142
            raise error
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
2143
    
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2144
    if debug:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2145
        # Enable all possible GnuTLS debugging
2146
        
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2147
        # "Use a log level over 10 to enable all debugging options."
2148
        # - GnuTLS manual
2149
        gnutls.library.functions.gnutls_global_set_log_level(11)
2150
        
2151
        @gnutls.library.types.gnutls_log_func
2152
        def debug_gnutls(level, string):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2153
            logger.debug("GnuTLS: %s", string[:-1])
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2154
        
2155
        (gnutls.library.functions
2156
         .gnutls_global_set_log_function(debug_gnutls))
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2157
        
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
2158
        # Redirect stdin so all checkers get /dev/null
2159
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2160
        os.dup2(null, sys.stdin.fileno())
2161
        if null > 2:
2162
            os.close(null)
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
2163
    
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
2164
    # Need to fork before connecting to D-Bus
2165
    if not debug:
2166
        # Close all input and output, do double fork, etc.
2167
        daemon()
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
2168
    
518.2.11 by Teddy Hogeborn
* mandos (main): Tell gobject we're (or, rather, multiprocessing is)
2169
    gobject.threads_init()
2170
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2171
    global main_loop
2172
    # From the Avahi example code
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2173
    DBusGMainLoop(set_as_default=True )
2174
    main_loop = gobject.MainLoop()
2175
    bus = dbus.SystemBus()
2176
    # End of Avahi example code
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2177
    if use_dbus:
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2178
        try:
505 by Björn Påhlsson
The domain name has changed, so the D-Bus bus and interface names must
2179
            bus_name = dbus.service.BusName("se.recompile.Mandos",
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2180
                                            bus, do_not_queue=True)
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2181
            old_bus_name = (dbus.service.BusName
2182
                            ("se.bsnet.fukt.Mandos", bus,
2183
                             do_not_queue=True))
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2184
        except dbus.exceptions.NameExistsException as e:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2185
            logger.error(unicode(e) + ", disabling D-Bus")
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2186
            use_dbus = False
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2187
            server_settings["use_dbus"] = False
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2188
            tcp_server.use_dbus = False
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
2189
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
505.1.20 by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning.
2190
    service = AvahiServiceToSyslog(name =
2191
                                   server_settings["servicename"],
2192
                                   servicetype = "_mandos._tcp",
2193
                                   protocol = protocol, bus = bus)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2194
    if server_settings["interface"]:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
2195
        service.interface = (if_nametoindex
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2196
                             (str(server_settings["interface"])))
458 by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus.
2197
    
24.1.152 by Björn Påhlsson
bug fixes that prevent problems when runing server as root
2198
    global multiprocessing_manager
2199
    multiprocessing_manager = multiprocessing.Manager()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2200
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
2201
    client_class = Client
2202
    if use_dbus:
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2203
        client_class = functools.partial(ClientDBusTransitional,
505.1.4 by Teddy Hogeborn
Removed superflous white space.
2204
                                         bus = bus)
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2205
    
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2206
    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
2207
    old_client_settings = {}
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2208
    clients_data = {}
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2209
    
518.1.7 by Teddy Hogeborn
* mandos: Break long lines and fix some more white space.
2210
    # 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
2211
    if server_settings["restore"]:
2212
        try:
2213
            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.
2214
                clients_data, old_client_settings = (pickle.load
2215
                                                     (stored_state))
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2216
            os.remove(stored_state_path)
2217
        except IOError as e:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2218
            logger.warning("Could not load persistent state: {0}"
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2219
                           .format(e))
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2220
            if e.errno != errno.ENOENT:
2221
                raise
505.1.23 by Teddy Hogeborn
* mandos (main): Handle EOFError when reading state file.
2222
        except EOFError as e:
2223
            logger.warning("Could not load persistent state: "
2224
                           "EOFError: {0}".format(e))
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2225
    
518.1.9 by Björn Påhlsson
renamed variables
2226
    with PGPEngine() as pgp:
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2227
        for client_name, client in clients_data.iteritems():
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2228
            # Decide which value to use after restoring saved state.
2229
            # We have three different values: Old config file,
2230
            # new config file, and saved state.
2231
            # New config value takes precedence if it differs from old
2232
            # config value, otherwise use saved state.
2233
            for name, value in client_settings[client_name].items():
2234
                try:
2235
                    # For each value in new config, check if it
2236
                    # differs from the old config value (Except for
2237
                    # the "secret" attribute)
2238
                    if (name != "secret" and
2239
                        value != old_client_settings[client_name]
2240
                        [name]):
518.2.10 by Teddy Hogeborn
* mandos (main): Bug fix: Syntax fix when restoring settings.
2241
                        client[name] = value
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2242
                except KeyError:
2243
                    pass
2244
            
2245
            # 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.
2246
            # enabled if its last checker was successful.  Clients
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2247
            # whose checker succeeded before we stored its state is
2248
            # assumed to have successfully run all checkers during
2249
            # downtime.
518.2.8 by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property,
2250
            if client["enabled"]:
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2251
                if datetime.datetime.utcnow() >= client["expires"]:
2252
                    if not client["last_checked_ok"]:
2253
                        logger.warning(
2254
                            "disabling client {0} - Client never "
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2255
                            "performed a successful checker"
2256
                            .format(client_name))
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2257
                        client["enabled"] = False
2258
                    elif client["last_checker_status"] != 0:
2259
                        logger.warning(
2260
                            "disabling client {0} - Client "
2261
                            "last checker failed with error code {1}"
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2262
                            .format(client_name,
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2263
                                    client["last_checker_status"]))
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2264
                        client["enabled"] = False
2265
                    else:
2266
                        client["expires"] = (datetime.datetime
2267
                                             .utcnow()
2268
                                             + client["timeout"])
542 by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok.
2269
                        logger.debug("Last checker succeeded,"
2270
                                     " keeping {0} enabled"
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2271
                                     .format(client_name))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2272
            try:
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2273
                client["secret"] = (
2274
                    pgp.decrypt(client["encrypted_secret"],
518.1.9 by Björn Påhlsson
renamed variables
2275
                                client_settings[client_name]
2276
                                ["secret"]))
2277
            except PGPError:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2278
                # 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
2279
                logger.debug("Failed to decrypt {0} old secret"
2280
                             .format(client_name))
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2281
                client["secret"] = (
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2282
                    client_settings[client_name]["secret"])
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2283
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2284
    
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2285
    # Add/remove clients based on new changes made to config
543 by Teddy Hogeborn
* mandos: Break some long lines.
2286
    for client_name in (set(old_client_settings)
2287
                        - set(client_settings)):
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2288
        del clients_data[client_name]
543 by Teddy Hogeborn
* mandos: Break some long lines.
2289
    for client_name in (set(client_settings)
2290
                        - set(old_client_settings)):
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2291
        clients_data[client_name] = client_settings[client_name]
2292
552 by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the
2293
    # Create all client objects
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2294
    for client_name, client in clients_data.iteritems():
2295
        tcp_server.clients[client_name] = client_class(
2296
            name = client_name, settings = client)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
2297
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
2298
    if not tcp_server.clients:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2299
        logger.warning("No clients defined")
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
2300
        
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2301
    if not debug:
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2302
        try:
2303
            with pidfile:
2304
                pid = os.getpid()
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2305
                pidfile.write(str(pid) + "\n".encode("utf-8"))
439 by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed.
2306
            del pidfile
2307
        except IOError:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2308
            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.
2309
                         pidfilename, pid)
2310
        except NameError:
2311
            # "pidfile" was never created
2312
            pass
2313
        del pidfilename
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2314
        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
2315
    
28 by Teddy Hogeborn
* server.conf: New file.
2316
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2318
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2319
    if use_dbus:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2320
        class MandosDBusService(dbus.service.Object):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2321
            """A D-Bus proxy object"""
2322
            def __init__(self):
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2323
                dbus.service.Object.__init__(self, bus, "/")
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
2324
            _interface = "se.recompile.Mandos"
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2325
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2326
            @dbus.service.signal(_interface, signature="o")
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
2327
            def ClientAdded(self, objpath):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2328
                "D-Bus signal"
2329
                pass
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="ss")
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
2332
            def ClientNotFound(self, fingerprint, address):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
2333
                "D-Bus signal"
2334
                pass
2335
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2336
            @dbus.service.signal(_interface, signature="os")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2337
            def ClientRemoved(self, objpath, name):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2338
                "D-Bus signal"
2339
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2340
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2341
            @dbus.service.method(_interface, out_signature="ao")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2342
            def GetAllClients(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2343
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
2344
                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
2345
                                  for c in
2346
                                  tcp_server.clients.itervalues())
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2347
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
2348
            @dbus.service.method(_interface,
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2349
                                 out_signature="a{oa{sv}}")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2350
            def GetAllClientsWithProperties(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2351
                "D-Bus method"
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2352
                return dbus.Dictionary(
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2353
                    ((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
2354
                     for c in tcp_server.clients.itervalues()),
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2355
                    signature="oa{sv}")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2356
            
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2357
            @dbus.service.method(_interface, in_signature="o")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2358
            def RemoveClient(self, object_path):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
2359
                "D-Bus method"
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2360
                for c in tcp_server.clients.itervalues():
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2361
                    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
2362
                        del tcp_server.clients[c.name]
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
2363
                        c.remove_from_connection()
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2364
                        # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2365
                        c.disable(quiet=True)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2366
                        # Emit D-Bus signal
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2367
                        self.ClientRemoved(object_path, c.name)
2368
                        return
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2369
                raise KeyError(object_path)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2370
            
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2371
            del _interface
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
2372
        
24.1.186 by Björn Påhlsson
transitional stuff actually working
2373
        class MandosDBusServiceTransitional(MandosDBusService):
505.1.1 by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to
2374
            __metaclass__ = AlternateDBusNamesMetaclass
24.1.186 by Björn Påhlsson
transitional stuff actually working
2375
        mandos_dbus_service = MandosDBusServiceTransitional()
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
2376
    
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2377
    def cleanup():
2378
        "Cleanup function; run on exit"
2379
        service.cleanup()
2380
        
505.1.11 by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout.
2381
        multiprocessing.active_children()
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2382
        if not (tcp_server.clients or client_settings):
2383
            return
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2384
        
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2385
        # Store client before exiting. Secrets are encrypted with key
2386
        # based on what config file has. If config file is
2387
        # 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
2388
        clients = {}
518.1.9 by Björn Påhlsson
renamed variables
2389
        with PGPEngine() as pgp:
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2390
            for client in tcp_server.clients.itervalues():
2391
                key = client_settings[client.name]["secret"]
518.1.9 by Björn Påhlsson
renamed variables
2392
                client.encrypted_secret = pgp.encrypt(client.secret,
2393
                                                      key)
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2394
                client_dict = {}
2395
                
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2396
                # A list of attributes that can not be pickled
2397
                # + secret.
518.1.14 by Björn Påhlsson
Mandos: refactoring the code handling settings from config files.
2398
                exclude = set(("bus", "changedstate", "secret",
2399
                               "checker"))
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2400
                for name, typ in (inspect.getmembers
2401
                                  (dbus.service.Object)):
2402
                    exclude.add(name)
2403
                
2404
                client_dict["encrypted_secret"] = (client
2405
                                                   .encrypted_secret)
2406
                for attr in client.client_structure:
2407
                    if attr not in exclude:
2408
                        client_dict[attr] = getattr(client, attr)
2409
                
518.1.15 by Björn Påhlsson
more refactoring in regards to how clients get created
2410
                clients[client.name] = client_dict
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2411
                del client_settings[client.name]["secret"]
2412
        
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2413
        try:
505.1.26 by teddy at bsnet
* mandos (main/cleanup): Write new file, then rename. Use
2414
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
                                                prefix="clients-",
2416
                                                dir=os.path.dirname
2417
                                                (stored_state_path))
2418
            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
2419
                pickle.dump((clients, client_settings), stored_state)
505.1.26 by teddy at bsnet
* mandos (main/cleanup): Write new file, then rename. Use
2420
            os.rename(tempname, stored_state_path)
518.2.1 by Teddy Hogeborn
Use GPG to encrypt instead of AES.
2421
        except (IOError, OSError) as e:
2422
            logger.warning("Could not save persistent state: {0}"
521 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto".
2423
                           .format(e))
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2424
            if not debug:
2425
                try:
2426
                    os.remove(tempname)
2427
                except NameError:
2428
                    pass
505.1.25 by Teddy Hogeborn
* mandos (main/cleanup): Use O_EXCL when creating saved state file;
2429
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
                                   errno.EEXIST)):
530 by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed.
2431
                raise e
518.1.6 by Teddy Hogeborn
* mandos: Fix whitespace.
2432
        
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2433
        # Delete all clients, and settings from config
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2434
        while tcp_server.clients:
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2435
            name, client = tcp_server.clients.popitem()
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2436
            if use_dbus:
2437
                client.remove_from_connection()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2438
            # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
2439
            client.disable(quiet=True)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2440
            if use_dbus:
2441
                # Emit D-Bus signal
505.1.3 by Teddy Hogeborn
* mandos: Break long lines.
2442
                mandos_dbus_service.ClientRemoved(client
2443
                                                  .dbus_object_path,
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2444
                                                  client.name)
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2445
        client_settings.clear()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
2446
    
2447
    atexit.register(cleanup)
2448
    
518.1.1 by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos
2449
    for client in tcp_server.clients.itervalues():
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
2450
        if use_dbus:
2451
            # Emit D-Bus signal
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
2452
            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
2453
        # Need to initiate checking of clients
2454
        if client.enabled:
2455
            client.init_checker()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2456
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
2457
    tcp_server.enable()
2458
    tcp_server.server_activate()
2459
    
28 by Teddy Hogeborn
* server.conf: New file.
2460
    # Find out what port we got
2461
    service.port = tcp_server.socket.getsockname()[1]
314 by Teddy Hogeborn
Support not using IPv6 in server:
2462
    if use_ipv6:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2463
        logger.info("Now listening on address %r, port %d,"
2464
                    " flowinfo %d, scope_id %d"
314 by Teddy Hogeborn
Support not using IPv6 in server:
2465
                    % tcp_server.socket.getsockname())
2466
    else:                       # IPv4
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2467
        logger.info("Now listening on address %r, port %d"
314 by Teddy Hogeborn
Support not using IPv6 in server:
2468
                    % tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
2469
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
2470
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
2471
    
2472
    try:
2473
        # From the Avahi example code
2474
        try:
336 by Teddy Hogeborn
Code cleanup.
2475
            service.activate()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2476
        except dbus.exceptions.DBusException as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2477
            logger.critical("DBusException: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2478
            cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2479
            sys.exit(1)
2480
        # End of Avahi example code
2481
        
2482
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2483
                             lambda *args, **kwargs:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
2484
                             (tcp_server.handle_request
2485
                              (*args[2:], **kwargs) or True))
28 by Teddy Hogeborn
* server.conf: New file.
2486
        
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2487
        logger.debug("Starting main loop")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2488
        main_loop.run()
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
2489
    except AvahiError as error:
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2490
        logger.critical("AvahiError: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2491
        cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
2492
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
2493
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2494
        if debug:
463.1.5 by teddy at bsnet
* mandos: Use unicode string literals.
2495
            print("", file=sys.stderr)
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2496
        logger.debug("Server received KeyboardInterrupt")
2497
    logger.debug("Server exiting")
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
2498
    # Must run before the D-Bus bus name gets deregistered
2499
    cleanup()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2500
463.1.4 by teddy at bsnet
* mandos: Use unicode string literals.
2501
if __name__ == '__main__':
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
2502
    main()