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