/mandos/trunk

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