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