/mandos/release

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