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