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