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