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