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