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