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