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