/mandos/trunk

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