/mandos/trunk

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