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