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