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