/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
246 by Teddy Hogeborn
* README: Update copyright year; add "2009".
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 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
# 
28 by Teddy Hogeborn
* server.conf: New file.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
32
# 
3 by Björn Påhlsson
Python based server
33
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
34
from __future__ import division, with_statement, absolute_import
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
35
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
36
import SocketServer as socketserver
3 by Björn Påhlsson
Python based server
37
import socket
237.2.1 by Teddy Hogeborn
Merge from trunk, but disable the unfinished D-Bus feature:
38
import optparse
3 by Björn Påhlsson
Python based server
39
import datetime
40
import errno
41
import gnutls.crypto
42
import gnutls.connection
43
import gnutls.errors
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
44
import gnutls.library.functions
45
import gnutls.library.constants
46
import gnutls.library.types
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
47
import ConfigParser as configparser
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
48
import sys
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
49
import re
50
import os
51
import signal
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
52
import subprocess
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
53
import atexit
54
import stat
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
55
import logging
56
import logging.handlers
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
57
import pwd
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
58
import contextlib
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
59
import struct
60
import fcntl
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
61
import functools
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
62
import cPickle as pickle
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
63
import multiprocessing
5 by Teddy Hogeborn
* server.py (server_metaclass): New.
64
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
65
import dbus
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
66
import dbus.service
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
67
import gobject
68
import avahi
69
from dbus.mainloop.glib import DBusGMainLoop
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
70
import ctypes
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
71
import ctypes.util
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
72
import xml.dom.minidom
73
import inspect
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
74
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
75
try:
76
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
except AttributeError:
78
    try:
79
        from IN import SO_BINDTODEVICE
80
    except ImportError:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
81
        SO_BINDTODEVICE = None
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
82
83
395 by Teddy Hogeborn
Merge from release branch.
84
version = "1.0.14"
13 by Björn Påhlsson
Added following support:
85
24.2.2 by teddy at bsnet
* mandos: Use logging.getLogger() as in the documentation.
86
logger = logging.getLogger(u'mandos')
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
87
syslogger = (logging.handlers.SysLogHandler
88
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
              address = "/dev/log"))
90
syslogger.setFormatter(logging.Formatter
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
91
                       (u'Mandos [%(process)d]: %(levelname)s:'
92
                        u' %(message)s'))
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
93
logger.addHandler(syslogger)
13 by Björn Påhlsson
Added following support:
94
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
95
console = logging.StreamHandler()
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
97
                                       u' %(levelname)s:'
98
                                       u' %(message)s'))
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
99
logger.addHandler(console)
28 by Teddy Hogeborn
* server.conf: New file.
100
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
101
multiprocessing_manager = multiprocessing.Manager()
102
28 by Teddy Hogeborn
* server.conf: New file.
103
class AvahiError(Exception):
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
104
    def __init__(self, value, *args, **kwargs):
28 by Teddy Hogeborn
* server.conf: New file.
105
        self.value = value
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
107
    def __unicode__(self):
108
        return unicode(repr(self.value))
28 by Teddy Hogeborn
* server.conf: New file.
109
110
class AvahiServiceError(AvahiError):
111
    pass
112
113
class AvahiGroupError(AvahiError):
114
    pass
115
116
117
class AvahiService(object):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
118
    """An Avahi (Zeroconf) service.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
119
    
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
120
    Attributes:
28 by Teddy Hogeborn
* server.conf: New file.
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
               Used to optionally bind to the specified interface.
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
123
    name: string; Example: u'Mandos'
124
    type: string; Example: u'_mandos._tcp'.
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
    port: integer; what port to announce
127
    TXT: list of strings; TXT record for the service
128
    domain: string; Domain to publish on, default to .local if empty.
129
    host: string; Host to publish records for, default is localhost
130
    max_renames: integer; maximum number of renames
131
    rename_count: integer; counter so we only rename after collisions
132
                  a sensible number of times
336 by Teddy Hogeborn
Code cleanup.
133
    group: D-Bus Entry Group
134
    server: D-Bus Server
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
135
    bus: dbus.SystemBus()
28 by Teddy Hogeborn
* server.conf: New file.
136
    """
137
    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
138
                 servicetype = None, port = None, TXT = None,
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
139
                 domain = u"", host = u"", max_renames = 32768,
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
28 by Teddy Hogeborn
* server.conf: New file.
141
        self.interface = interface
142
        self.name = name
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
143
        self.type = servicetype
28 by Teddy Hogeborn
* server.conf: New file.
144
        self.port = port
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
145
        self.TXT = TXT if TXT is not None else []
28 by Teddy Hogeborn
* server.conf: New file.
146
        self.domain = domain
147
        self.host = host
148
        self.rename_count = 0
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
149
        self.max_renames = max_renames
314 by Teddy Hogeborn
Support not using IPv6 in server:
150
        self.protocol = protocol
336 by Teddy Hogeborn
Code cleanup.
151
        self.group = None       # our entry group
152
        self.server = None
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
153
        self.bus = bus
28 by Teddy Hogeborn
* server.conf: New file.
154
    def rename(self):
155
        """Derived from the Avahi example code"""
156
        if self.rename_count >= self.max_renames:
109 by Teddy Hogeborn
* .bzrignore: New.
157
            logger.critical(u"No suitable Zeroconf service name found"
158
                            u" after %i retries, exiting.",
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
159
                            self.rename_count)
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
160
            raise AvahiServiceError(u"Too many renames")
336 by Teddy Hogeborn
Code cleanup.
161
        self.name = self.server.GetAlternativeServiceName(self.name)
109 by Teddy Hogeborn
* .bzrignore: New.
162
        logger.info(u"Changing Zeroconf service name to %r ...",
336 by Teddy Hogeborn
Code cleanup.
163
                    unicode(self.name))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
164
        syslogger.setFormatter(logging.Formatter
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
165
                               (u'Mandos (%s) [%%(process)d]:'
166
                                u' %%(levelname)s: %%(message)s'
327 by Teddy Hogeborn
Merge from pipe IPC branch.
167
                                % self.name))
28 by Teddy Hogeborn
* server.conf: New file.
168
        self.remove()
169
        self.add()
170
        self.rename_count += 1
171
    def remove(self):
172
        """Derived from the Avahi example code"""
336 by Teddy Hogeborn
Code cleanup.
173
        if self.group is not None:
174
            self.group.Reset()
28 by Teddy Hogeborn
* server.conf: New file.
175
    def add(self):
176
        """Derived from the Avahi example code"""
336 by Teddy Hogeborn
Code cleanup.
177
        if self.group is None:
178
            self.group = dbus.Interface(
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
179
                self.bus.get_object(avahi.DBUS_NAME,
180
                                    self.server.EntryGroupNew()),
336 by Teddy Hogeborn
Code cleanup.
181
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
182
            self.group.connect_to_signal('StateChanged',
379 by Teddy Hogeborn
* mandos: Fix line lengths.
183
                                         self
184
                                         .entry_group_state_changed)
109 by Teddy Hogeborn
* .bzrignore: New.
185
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
336 by Teddy Hogeborn
Code cleanup.
186
                     self.name, self.type)
187
        self.group.AddService(
188
            self.interface,
189
            self.protocol,
190
            dbus.UInt32(0),     # flags
191
            self.name, self.type,
192
            self.domain, self.host,
193
            dbus.UInt16(self.port),
194
            avahi.string_array_to_txt_array(self.TXT))
195
        self.group.Commit()
196
    def entry_group_state_changed(self, state, error):
197
        """Derived from the Avahi example code"""
198
        logger.debug(u"Avahi state change: %i", state)
199
        
200
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
201
            logger.debug(u"Zeroconf service established.")
202
        elif state == avahi.ENTRY_GROUP_COLLISION:
203
            logger.warning(u"Zeroconf service name collision.")
204
            self.rename()
205
        elif state == avahi.ENTRY_GROUP_FAILURE:
206
            logger.critical(u"Avahi: Error in group state changed %s",
207
                            unicode(error))
208
            raise AvahiGroupError(u"State changed: %s"
209
                                  % unicode(error))
210
    def cleanup(self):
211
        """Derived from the Avahi example code"""
212
        if self.group is not None:
213
            self.group.Free()
214
            self.group = None
215
    def server_state_changed(self, state):
216
        """Derived from the Avahi example code"""
217
        if state == avahi.SERVER_COLLISION:
218
            logger.error(u"Zeroconf server name collision")
219
            self.remove()
220
        elif state == avahi.SERVER_RUNNING:
221
            self.add()
222
    def activate(self):
223
        """Derived from the Avahi example code"""
224
        if self.server is None:
225
            self.server = dbus.Interface(
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
226
                self.bus.get_object(avahi.DBUS_NAME,
227
                                    avahi.DBUS_PATH_SERVER),
336 by Teddy Hogeborn
Code cleanup.
228
                avahi.DBUS_INTERFACE_SERVER)
229
        self.server.connect_to_signal(u"StateChanged",
230
                                 self.server_state_changed)
231
        self.server_state_changed(self.server.GetState())
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
232
233
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
234
class Client(object):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
235
    """A representation of a client host served by this server.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
236
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
237
    Attributes:
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
238
    name:       string; from the config file, used in log messages and
239
                        D-Bus identifiers
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
240
    fingerprint: string (40 or 32 hexadecimal digits); used to
241
                 uniquely identify the client
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
242
    secret:     bytestring; sent verbatim (over TLS) to client
243
    host:       string; available for use by the checker command
244
    created:    datetime.datetime(); (UTC) object creation
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
245
    last_enabled: datetime.datetime(); (UTC)
246
    enabled:    bool()
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
247
    last_checked_ok: datetime.datetime(); (UTC) or None
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
248
    timeout:    datetime.timedelta(); How long from last_checked_ok
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
249
                                      until this client is disabled
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
250
    interval:   datetime.timedelta(); How often to start a new checker
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
251
    disable_hook:  If set, called by disable() as disable_hook(self)
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
252
    checker:    subprocess.Popen(); a running checker process used
253
                                    to see if the client lives.
254
                                    'None' if no process is running.
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
255
    checker_initiator_tag: a gobject event source tag, or None
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
256
    disable_initiator_tag: - '' -
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
257
    checker_callback_tag:  - '' -
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
258
    checker_command: string; External command which is run to check if
28 by Teddy Hogeborn
* server.conf: New file.
259
                     client lives.  %() expansions are done at
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
260
                     runtime with vars(self) as dict, so that for
261
                     instance %(name)s can be used in the command.
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
262
    current_checker_command: string; current running checker_command
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
263
    approved_delay: datetime.timedelta(); Time to wait for approval
264
    _approved:   bool(); 'None' if not yet approved/disapproved
265
    approved_duration: datetime.timedelta(); Duration of one approval
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
266
    """
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
267
    
268
    @staticmethod
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
269
    def _timedelta_to_milliseconds(td):
270
        "Convert a datetime.timedelta() to milliseconds"
271
        return ((td.days * 24 * 60 * 60 * 1000)
272
                + (td.seconds * 1000)
273
                + (td.microseconds // 1000))
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
274
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
275
    def timeout_milliseconds(self):
276
        "Return the 'timeout' attribute in milliseconds"
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
277
        return self._timedelta_to_milliseconds(self.timeout)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
278
    
279
    def interval_milliseconds(self):
280
        "Return the 'interval' attribute in milliseconds"
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
281
        return self._timedelta_to_milliseconds(self.interval)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
282
283
    def approved_delay_milliseconds(self):
284
        return self._timedelta_to_milliseconds(self.approved_delay)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
285
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
286
    def __init__(self, name = None, disable_hook=None, config=None):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
287
        """Note: the 'checker' key in 'config' sets the
288
        'checker_command' attribute and *not* the 'checker'
289
        attribute."""
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
290
        self.name = name
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
291
        if config is None:
292
            config = {}
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
293
        logger.debug(u"Creating client %r", self.name)
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
294
        # Uppercase and remove spaces from fingerprint for later
295
        # comparison purposes with return value from the fingerprint()
296
        # function
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
297
        self.fingerprint = (config[u"fingerprint"].upper()
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
298
                            .replace(u" ", u""))
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
299
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
300
        if u"secret" in config:
301
            self.secret = config[u"secret"].decode(u"base64")
302
        elif u"secfile" in config:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
303
            with open(os.path.expanduser(os.path.expandvars
304
                                         (config[u"secfile"])),
305
                      "rb") as secfile:
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
306
                self.secret = secfile.read()
3 by Björn Påhlsson
Python based server
307
        else:
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
308
            #XXX Need to allow secret on demand!
28 by Teddy Hogeborn
* server.conf: New file.
309
            raise TypeError(u"No secret or secfile for client %s"
310
                            % self.name)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
311
        self.host = config.get(u"host", u"")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
312
        self.created = datetime.datetime.utcnow()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
313
        self.enabled = False
314
        self.last_enabled = None
28 by Teddy Hogeborn
* server.conf: New file.
315
        self.last_checked_ok = None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
316
        self.timeout = string_to_delta(config[u"timeout"])
317
        self.interval = string_to_delta(config[u"interval"])
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
318
        self.disable_hook = disable_hook
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
319
        self.checker = None
320
        self.checker_initiator_tag = None
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
321
        self.disable_initiator_tag = None
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
322
        self.checker_callback_tag = None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
323
        self.checker_command = config[u"checker"]
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
324
        self.current_checker_command = None
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
325
        self.last_connect = None
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
326
        self.approvals_pending = 0
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
327
        self._approved = None
328
        self.approved_by_default = config.get(u"approved_by_default",
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
329
                                              True)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
330
        self.approved_delay = string_to_delta(
331
            config[u"approved_delay"])
332
        self.approved_duration = string_to_delta(
333
            config[u"approved_duration"])
334
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
335
    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
336
    def send_changedstate(self):
337
        self.changedstate.acquire()
338
        self.changedstate.notify_all()
339
        self.changedstate.release()
340
        
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
341
    def enable(self):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
342
        """Start this client's checker and timeout hooks"""
341 by Teddy Hogeborn
Code cleanup and one bug fix.
343
        if getattr(self, u"enabled", False):
344
            # Already enabled
345
            return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
346
        self.send_changedstate()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
347
        self.last_enabled = datetime.datetime.utcnow()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
348
        # Schedule a new checker to be started an 'interval' from now,
349
        # and every interval from then on.
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
350
        self.checker_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
351
                                      (self.interval_milliseconds(),
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
352
                                       self.start_checker))
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
353
        # Schedule a disable() when 'timeout' has passed
354
        self.disable_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
355
                                   (self.timeout_milliseconds(),
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
356
                                    self.disable))
357
        self.enabled = True
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
358
        # Also start a new checker *right now*.
359
        self.start_checker()
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
360
    
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
361
    def disable(self, quiet=True):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
362
        """Disable this client."""
363
        if not getattr(self, "enabled", False):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
364
            return False
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
365
        if not quiet:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
366
            self.send_changedstate()
367
        if not quiet:
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
368
            logger.info(u"Disabling client %s", self.name)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
369
        if getattr(self, u"disable_initiator_tag", False):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
370
            gobject.source_remove(self.disable_initiator_tag)
371
            self.disable_initiator_tag = None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
372
        if getattr(self, u"checker_initiator_tag", False):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
373
            gobject.source_remove(self.checker_initiator_tag)
374
            self.checker_initiator_tag = None
375
        self.stop_checker()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
376
        if self.disable_hook:
377
            self.disable_hook(self)
378
        self.enabled = False
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
379
        # Do not run this again if called by a gobject.timeout_add
380
        return False
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
381
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
382
    def __del__(self):
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
383
        self.disable_hook = None
384
        self.disable()
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
385
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
386
    def checker_callback(self, pid, condition, command):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
387
        """The checker has completed, so take appropriate actions."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
388
        self.checker_callback_tag = None
389
        self.checker = None
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
390
        if os.WIFEXITED(condition):
391
            exitstatus = os.WEXITSTATUS(condition)
392
            if exitstatus == 0:
393
                logger.info(u"Checker for %(name)s succeeded",
394
                            vars(self))
281 by Teddy Hogeborn
* mandos (Client.bump_timeout): Renamed to "checked_ok". All callers
395
                self.checked_ok()
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
396
            else:
397
                logger.info(u"Checker for %(name)s failed",
398
                            vars(self))
399
        else:
13 by Björn Påhlsson
Added following support:
400
            logger.warning(u"Checker for %(name)s crashed?",
401
                           vars(self))
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
402
    
281 by Teddy Hogeborn
* mandos (Client.bump_timeout): Renamed to "checked_ok". All callers
403
    def checked_ok(self):
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
404
        """Bump up the timeout for this client.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
405
        
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
406
        This should only be called when the client has been seen,
407
        alive and well.
408
        """
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
409
        self.last_checked_ok = datetime.datetime.utcnow()
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
410
        gobject.source_remove(self.disable_initiator_tag)
411
        self.disable_initiator_tag = (gobject.timeout_add
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
412
                                      (self.timeout_milliseconds(),
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
413
                                       self.disable))
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
414
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
415
    def start_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
416
        """Start a new checker subprocess if one is not running.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
417
        
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
418
        If a checker already exists, leave it running and do
419
        nothing."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
420
        # The reason for not killing a running checker is that if we
421
        # did that, then if a checker (for some reason) started
422
        # running slowly and taking more than 'interval' time, the
423
        # client would inevitably timeout, since no checker would get
424
        # a chance to run to completion.  If we instead leave running
425
        # checkers alone, the checker would have to take more time
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
426
        # than 'timeout' for the client to be disabled, which is as it
427
        # should be.
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
428
        
429
        # 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
430
        try:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
431
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
383 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Fix race condition with
432
        except (AttributeError, OSError), error:
433
            if (isinstance(error, OSError)
434
                and error.errno != errno.ECHILD):
435
                raise error
436
        else:
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
437
            if pid:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
438
                logger.warning(u"Checker was a zombie")
315 by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute.
439
                gobject.source_remove(self.checker_callback_tag)
440
                self.checker_callback(pid, status,
441
                                      self.current_checker_command)
442
        # Start a new checker if needed
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
443
        if self.checker is None:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
444
            try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
445
                # In case checker_command has exactly one % operator
446
                command = self.checker_command % self.host
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
447
            except TypeError:
28 by Teddy Hogeborn
* server.conf: New file.
448
                # Escape attributes for the shell
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
449
                escaped_attrs = dict((key,
450
                                      re.escape(unicode(str(val),
451
                                                        errors=
452
                                                        u'replace')))
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
453
                                     for key, val in
454
                                     vars(self).iteritems())
13 by Björn Påhlsson
Added following support:
455
                try:
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
456
                    command = self.checker_command % escaped_attrs
13 by Björn Påhlsson
Added following support:
457
                except TypeError, error:
28 by Teddy Hogeborn
* server.conf: New file.
458
                    logger.error(u'Could not format string "%s":'
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
459
                                 u' %s', self.checker_command, error)
13 by Björn Påhlsson
Added following support:
460
                    return True # Try again later
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
461
            self.current_checker_command = command
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
462
            try:
44 by Teddy Hogeborn
* ca.pem: Removed.
463
                logger.info(u"Starting checker %r for %s",
464
                            command, self.name)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
465
                # We don't need to redirect stdout and stderr, since
466
                # in normal mode, that is already done by daemon(),
467
                # and in debug mode we don't want to.  (Stdin is
468
                # always replaced by /dev/null.)
28 by Teddy Hogeborn
* server.conf: New file.
469
                self.checker = subprocess.Popen(command,
470
                                                close_fds=True,
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
471
                                                shell=True, cwd=u"/")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
472
                self.checker_callback_tag = (gobject.child_watch_add
473
                                             (self.checker.pid,
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
474
                                              self.checker_callback,
475
                                              data=command))
310 by Teddy Hogeborn
* mandos (Client.start_checker): Bug fix: Add extra check in case the
476
                # The checker may have completed before the gobject
477
                # watch was added.  Check for this.
478
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
479
                if pid:
480
                    gobject.source_remove(self.checker_callback_tag)
481
                    self.checker_callback(pid, status, command)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
482
            except OSError, error:
13 by Björn Påhlsson
Added following support:
483
                logger.error(u"Failed to start subprocess: %s",
484
                             error)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
485
        # Re-run this periodically if run by gobject.timeout_add
486
        return True
237.1.1 by Teddy Hogeborn
First steps of a D-Bus interface to the server.
487
    
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
488
    def stop_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
489
        """Force the checker process, if any, to stop."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
490
        if self.checker_callback_tag:
491
            gobject.source_remove(self.checker_callback_tag)
492
            self.checker_callback_tag = None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
493
        if getattr(self, u"checker", None) is None:
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
494
            return
51 by Teddy Hogeborn
* clients.conf: Better comments.
495
        logger.debug(u"Stopping checker for %(name)s", vars(self))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
496
        try:
497
            os.kill(self.checker.pid, signal.SIGTERM)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
498
            #time.sleep(0.5)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
499
            #if self.checker.poll() is None:
500
            #    os.kill(self.checker.pid, signal.SIGKILL)
501
        except OSError, error:
28 by Teddy Hogeborn
* server.conf: New file.
502
            if error.errno != errno.ESRCH: # No such process
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
503
                raise
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
504
        self.checker = None
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
505
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
506
def dbus_service_property(dbus_interface, signature=u"v",
507
                          access=u"readwrite", byte_arrays=False):
508
    """Decorators for marking methods of a DBusObjectWithProperties to
509
    become properties on the D-Bus.
510
    
511
    The decorated method will be called with no arguments by "Get"
512
    and with one argument by "Set".
513
    
514
    The parameters, where they are supported, are the same as
515
    dbus.service.method, except there is only "signature", since the
516
    type from Get() and the type sent to Set() is the same.
517
    """
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
518
    # Encoding deeply encoded byte arrays is not supported yet by the
519
    # "Set" method, so we fail early here:
520
    if byte_arrays and signature != u"ay":
521
        raise ValueError(u"Byte arrays not supported for non-'ay'"
522
                         u" signature %r" % signature)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
523
    def decorator(func):
524
        func._dbus_is_property = True
525
        func._dbus_interface = dbus_interface
526
        func._dbus_signature = signature
527
        func._dbus_access = access
528
        func._dbus_name = func.__name__
529
        if func._dbus_name.endswith(u"_dbus_property"):
530
            func._dbus_name = func._dbus_name[:-14]
531
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
532
        return func
533
    return decorator
534
535
536
class DBusPropertyException(dbus.exceptions.DBusException):
537
    """A base class for D-Bus property-related exceptions
538
    """
539
    def __unicode__(self):
540
        return unicode(str(self))
541
542
543
class DBusPropertyAccessException(DBusPropertyException):
544
    """A property's access permissions disallows an operation.
545
    """
546
    pass
547
548
549
class DBusPropertyNotFound(DBusPropertyException):
550
    """An attempt was made to access a non-existing property.
551
    """
552
    pass
553
554
555
class DBusObjectWithProperties(dbus.service.Object):
556
    """A D-Bus object with properties.
557
558
    Classes inheriting from this can use the dbus_service_property
559
    decorator to expose methods as D-Bus properties.  It exposes the
560
    standard Get(), Set(), and GetAll() methods on the D-Bus.
561
    """
562
    
563
    @staticmethod
564
    def _is_dbus_property(obj):
565
        return getattr(obj, u"_dbus_is_property", False)
566
    
567
    def _get_all_dbus_properties(self):
568
        """Returns a generator of (name, attribute) pairs
569
        """
570
        return ((prop._dbus_name, prop)
571
                for name, prop in
572
                inspect.getmembers(self, self._is_dbus_property))
573
    
574
    def _get_dbus_property(self, interface_name, property_name):
575
        """Returns a bound method if one exists which is a D-Bus
576
        property with the specified name and interface.
577
        """
578
        for name in (property_name,
579
                     property_name + u"_dbus_property"):
580
            prop = getattr(self, name, None)
581
            if (prop is None
582
                or not self._is_dbus_property(prop)
583
                or prop._dbus_name != property_name
584
                or (interface_name and prop._dbus_interface
585
                    and interface_name != prop._dbus_interface)):
586
                continue
587
            return prop
588
        # No such property
589
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
590
                                   + interface_name + u"."
591
                                   + property_name)
592
    
593
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
594
                         out_signature=u"v")
595
    def Get(self, interface_name, property_name):
596
        """Standard D-Bus property Get() method, see D-Bus standard.
597
        """
598
        prop = self._get_dbus_property(interface_name, property_name)
599
        if prop._dbus_access == u"write":
600
            raise DBusPropertyAccessException(property_name)
601
        value = prop()
602
        if not hasattr(value, u"variant_level"):
603
            return value
604
        return type(value)(value, variant_level=value.variant_level+1)
605
    
606
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
607
    def Set(self, interface_name, property_name, value):
608
        """Standard D-Bus property Set() method, see D-Bus standard.
609
        """
610
        prop = self._get_dbus_property(interface_name, property_name)
611
        if prop._dbus_access == u"read":
612
            raise DBusPropertyAccessException(property_name)
613
        if prop._dbus_get_args_options[u"byte_arrays"]:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
614
            # The byte_arrays option is not supported yet on
615
            # signatures other than "ay".
616
            if prop._dbus_signature != u"ay":
617
                raise ValueError
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
618
            value = dbus.ByteArray(''.join(unichr(byte)
619
                                           for byte in value))
620
        prop(value)
621
    
622
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
623
                         out_signature=u"a{sv}")
624
    def GetAll(self, interface_name):
625
        """Standard D-Bus property GetAll() method, see D-Bus
626
        standard.
627
628
        Note: Will not include properties with access="write".
629
        """
630
        all = {}
631
        for name, prop in self._get_all_dbus_properties():
632
            if (interface_name
633
                and interface_name != prop._dbus_interface):
634
                # Interface non-empty but did not match
635
                continue
636
            # Ignore write-only properties
637
            if prop._dbus_access == u"write":
638
                continue
639
            value = prop()
640
            if not hasattr(value, u"variant_level"):
641
                all[name] = value
642
                continue
643
            all[name] = type(value)(value, variant_level=
644
                                    value.variant_level+1)
645
        return dbus.Dictionary(all, signature=u"sv")
646
    
647
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
648
                         out_signature=u"s",
649
                         path_keyword='object_path',
650
                         connection_keyword='connection')
651
    def Introspect(self, object_path, connection):
652
        """Standard D-Bus method, overloaded to insert property tags.
653
        """
654
        xmlstring = dbus.service.Object.Introspect(self, object_path,
386 by Teddy Hogeborn
* mandos (DBusObjectWithProperties.Introspect): Add the name
655
                                                   connection)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
656
        try:
657
            document = xml.dom.minidom.parseString(xmlstring)
658
            def make_tag(document, name, prop):
659
                e = document.createElement(u"property")
660
                e.setAttribute(u"name", name)
661
                e.setAttribute(u"type", prop._dbus_signature)
662
                e.setAttribute(u"access", prop._dbus_access)
663
                return e
664
            for if_tag in document.getElementsByTagName(u"interface"):
665
                for tag in (make_tag(document, name, prop)
666
                            for name, prop
667
                            in self._get_all_dbus_properties()
668
                            if prop._dbus_interface
669
                            == if_tag.getAttribute(u"name")):
670
                    if_tag.appendChild(tag)
671
                # Add the names to the return values for the
672
                # "org.freedesktop.DBus.Properties" methods
673
                if (if_tag.getAttribute(u"name")
674
                    == u"org.freedesktop.DBus.Properties"):
675
                    for cn in if_tag.getElementsByTagName(u"method"):
676
                        if cn.getAttribute(u"name") == u"Get":
677
                            for arg in cn.getElementsByTagName(u"arg"):
678
                                if (arg.getAttribute(u"direction")
679
                                    == u"out"):
680
                                    arg.setAttribute(u"name", u"value")
681
                        elif cn.getAttribute(u"name") == u"GetAll":
682
                            for arg in cn.getElementsByTagName(u"arg"):
683
                                if (arg.getAttribute(u"direction")
684
                                    == u"out"):
685
                                    arg.setAttribute(u"name", u"props")
686
            xmlstring = document.toxml(u"utf-8")
687
            document.unlink()
688
        except (AttributeError, xml.dom.DOMException,
689
                xml.parsers.expat.ExpatError), error:
690
            logger.error(u"Failed to override Introspection method",
691
                         error)
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
692
        return xmlstring
693
694
695
class ClientDBus(Client, DBusObjectWithProperties):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
696
    """A Client class using D-Bus
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
697
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
698
    Attributes:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
699
    dbus_object_path: dbus.ObjectPath
700
    bus: dbus.SystemBus()
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
701
    """
702
    # dbus.service.Object doesn't use super(), so we can't either.
703
    
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
704
    def __init__(self, bus = None, *args, **kwargs):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
705
        self._approvals_pending = 0
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
706
        self.bus = bus
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
707
        Client.__init__(self, *args, **kwargs)
708
        # Only now, when this client is initialized, can it show up on
709
        # the D-Bus
710
        self.dbus_object_path = (dbus.ObjectPath
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
711
                                 (u"/clients/"
712
                                  + self.name.replace(u".", u"_")))
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
713
        DBusObjectWithProperties.__init__(self, self.bus,
714
                                          self.dbus_object_path)
336 by Teddy Hogeborn
Code cleanup.
715
    
24.2.5 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Bug fix: Only send D-Bus
716
    def _get_approvals_pending(self, value):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
717
        return self._approvals_pending
24.2.5 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Bug fix: Only send D-Bus
718
    def _set_approvals_pending(self, value):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
719
        old_value = self._approvals_pending
720
        self._approvals_pending = value
721
        bval = bool(value)
24.2.5 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Bug fix: Only send D-Bus
722
        if (hasattr(self, "dbus_object_path")
723
            and bval is bool(old_value)):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
724
            dbus_bool = dbus.Boolean(bval, variant_level=1)
725
            self.PropertyChanged(dbus.String(u"approved_pending"),
726
                                 dbus_bool)
727
        return value
728
    approvals_pending = property(_get_approvals_pending,
729
                                 _set_approvals_pending)
730
    del _get_approvals_pending, _set_approvals_pending
731
    
336 by Teddy Hogeborn
Code cleanup.
732
    @staticmethod
733
    def _datetime_to_dbus(dt, variant_level=0):
734
        """Convert a UTC datetime.datetime() to a D-Bus type."""
735
        return dbus.String(dt.isoformat(),
736
                           variant_level=variant_level)
737
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
738
    def enable(self):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
739
        oldstate = getattr(self, u"enabled", False)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
740
        r = Client.enable(self)
741
        if oldstate != self.enabled:
742
            # Emit D-Bus signals
743
            self.PropertyChanged(dbus.String(u"enabled"),
744
                                 dbus.Boolean(True, variant_level=1))
336 by Teddy Hogeborn
Code cleanup.
745
            self.PropertyChanged(
746
                dbus.String(u"last_enabled"),
747
                self._datetime_to_dbus(self.last_enabled,
748
                                       variant_level=1))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
749
        return r
750
    
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
751
    def disable(self, quiet = False):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
752
        oldstate = getattr(self, u"enabled", False)
403 by Teddy Hogeborn
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
753
        r = Client.disable(self, quiet=quiet)
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
754
        if not quiet and oldstate != self.enabled:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
755
            # Emit D-Bus signal
756
            self.PropertyChanged(dbus.String(u"enabled"),
757
                                 dbus.Boolean(False, variant_level=1))
758
        return r
759
    
760
    def __del__(self, *args, **kwargs):
761
        try:
762
            self.remove_from_connection()
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
763
        except LookupError:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
764
            pass
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
765
        if hasattr(DBusObjectWithProperties, u"__del__"):
766
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
767
        Client.__del__(self, *args, **kwargs)
768
    
769
    def checker_callback(self, pid, condition, command,
770
                         *args, **kwargs):
771
        self.checker_callback_tag = None
772
        self.checker = None
773
        # Emit D-Bus signal
774
        self.PropertyChanged(dbus.String(u"checker_running"),
775
                             dbus.Boolean(False, variant_level=1))
776
        if os.WIFEXITED(condition):
777
            exitstatus = os.WEXITSTATUS(condition)
778
            # Emit D-Bus signal
779
            self.CheckerCompleted(dbus.Int16(exitstatus),
780
                                  dbus.Int64(condition),
781
                                  dbus.String(command))
782
        else:
783
            # Emit D-Bus signal
784
            self.CheckerCompleted(dbus.Int16(-1),
785
                                  dbus.Int64(condition),
786
                                  dbus.String(command))
787
        
788
        return Client.checker_callback(self, pid, condition, command,
789
                                       *args, **kwargs)
790
    
791
    def checked_ok(self, *args, **kwargs):
792
        r = Client.checked_ok(self, *args, **kwargs)
793
        # Emit D-Bus signal
794
        self.PropertyChanged(
795
            dbus.String(u"last_checked_ok"),
336 by Teddy Hogeborn
Code cleanup.
796
            (self._datetime_to_dbus(self.last_checked_ok,
797
                                    variant_level=1)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
798
        return r
799
    
800
    def start_checker(self, *args, **kwargs):
801
        old_checker = self.checker
802
        if self.checker is not None:
803
            old_checker_pid = self.checker.pid
804
        else:
805
            old_checker_pid = None
806
        r = Client.start_checker(self, *args, **kwargs)
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
807
        # Only if new checker process was started
808
        if (self.checker is not None
809
            and old_checker_pid != self.checker.pid):
810
            # Emit D-Bus signal
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
811
            self.CheckerStarted(self.current_checker_command)
812
            self.PropertyChanged(
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
813
                dbus.String(u"checker_running"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
814
                dbus.Boolean(True, variant_level=1))
815
        return r
816
    
817
    def stop_checker(self, *args, **kwargs):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
818
        old_checker = getattr(self, u"checker", None)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
819
        r = Client.stop_checker(self, *args, **kwargs)
820
        if (old_checker is not None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
821
            and getattr(self, u"checker", None) is None):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
822
            self.PropertyChanged(dbus.String(u"checker_running"),
823
                                 dbus.Boolean(False, variant_level=1))
824
        return r
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
825
826
    def _reset_approved(self):
827
        self._approved = None
828
        return False
829
    
830
    def approve(self, value=True):
831
        self._approved = value
832
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
833
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
834
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
835
    ## D-Bus methods, signals & properties
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
836
    _interface = u"se.bsnet.fukt.Mandos.Client"
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
837
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
838
    ## Signals
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
839
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
840
    # CheckerCompleted - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
841
    @dbus.service.signal(_interface, signature=u"nxs")
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
842
    def CheckerCompleted(self, exitcode, waitstatus, command):
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
843
        "D-Bus signal"
844
        pass
845
    
846
    # CheckerStarted - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
847
    @dbus.service.signal(_interface, signature=u"s")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
848
    def CheckerStarted(self, command):
849
        "D-Bus signal"
850
        pass
851
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
852
    # PropertyChanged - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
853
    @dbus.service.signal(_interface, signature=u"sv")
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
854
    def PropertyChanged(self, property, value):
855
        "D-Bus signal"
856
        pass
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
857
    
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
858
    # GotSecret - signal
327 by Teddy Hogeborn
Merge from pipe IPC branch.
859
    @dbus.service.signal(_interface)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
860
    def GotSecret(self):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
861
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
862
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
863
    
864
    # Rejected - signal
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
865
    @dbus.service.signal(_interface, signature=u"s")
866
    def Rejected(self, reason):
867
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
868
        pass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
869
    
870
    # NeedApproval - signal
871
    @dbus.service.signal(_interface, signature=u"db")
872
    def NeedApproval(self, timeout, default):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
873
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
874
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
875
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
876
    ## Methods
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
877
878
    # Approve - method
879
    @dbus.service.method(_interface, in_signature=u"b")
880
    def Approve(self, value):
881
        self.approve(value)
882
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
883
    # CheckedOK - method
884
    @dbus.service.method(_interface)
885
    def CheckedOK(self):
886
        return self.checked_ok()
887
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
888
    # Enable - method
889
    @dbus.service.method(_interface)
890
    def Enable(self):
891
        "D-Bus method"
892
        self.enable()
893
    
894
    # StartChecker - method
895
    @dbus.service.method(_interface)
896
    def StartChecker(self):
897
        "D-Bus method"
898
        self.start_checker()
899
    
900
    # Disable - method
901
    @dbus.service.method(_interface)
902
    def Disable(self):
903
        "D-Bus method"
904
        self.disable()
905
    
906
    # StopChecker - method
907
    @dbus.service.method(_interface)
908
    def StopChecker(self):
909
        self.stop_checker()
910
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
911
    ## Properties
912
    
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
913
    # approved_pending - property
914
    @dbus_service_property(_interface, signature=u"b", access=u"read")
915
    def approved_pending_dbus_property(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
916
        return dbus.Boolean(bool(self.approvals_pending))
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
917
    
918
    # approved_by_default - property
919
    @dbus_service_property(_interface, signature=u"b",
920
                           access=u"readwrite")
921
    def approved_by_default_dbus_property(self):
922
        return dbus.Boolean(self.approved_by_default)
923
    
924
    # approved_delay - property
925
    @dbus_service_property(_interface, signature=u"t",
926
                           access=u"readwrite")
927
    def approved_delay_dbus_property(self):
928
        return dbus.UInt64(self.approved_delay_milliseconds())
929
    
930
    # approved_duration - property
931
    @dbus_service_property(_interface, signature=u"t",
932
                           access=u"readwrite")
933
    def approved_duration_dbus_property(self):
934
        return dbus.UInt64(self._timedelta_to_milliseconds(
935
                self.approved_duration))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
936
    
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
937
    # name - property
938
    @dbus_service_property(_interface, signature=u"s", access=u"read")
939
    def name_dbus_property(self):
940
        return dbus.String(self.name)
941
    
942
    # fingerprint - property
943
    @dbus_service_property(_interface, signature=u"s", access=u"read")
944
    def fingerprint_dbus_property(self):
945
        return dbus.String(self.fingerprint)
946
    
947
    # host - property
948
    @dbus_service_property(_interface, signature=u"s",
949
                           access=u"readwrite")
950
    def host_dbus_property(self, value=None):
951
        if value is None:       # get
952
            return dbus.String(self.host)
953
        self.host = value
954
        # Emit D-Bus signal
955
        self.PropertyChanged(dbus.String(u"host"),
956
                             dbus.String(value, variant_level=1))
957
    
958
    # created - property
959
    @dbus_service_property(_interface, signature=u"s", access=u"read")
960
    def created_dbus_property(self):
961
        return dbus.String(self._datetime_to_dbus(self.created))
962
    
963
    # last_enabled - property
964
    @dbus_service_property(_interface, signature=u"s", access=u"read")
965
    def last_enabled_dbus_property(self):
966
        if self.last_enabled is None:
967
            return dbus.String(u"")
968
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
969
    
970
    # enabled - property
971
    @dbus_service_property(_interface, signature=u"b",
972
                           access=u"readwrite")
973
    def enabled_dbus_property(self, value=None):
974
        if value is None:       # get
975
            return dbus.Boolean(self.enabled)
976
        if value:
977
            self.enable()
978
        else:
979
            self.disable()
980
    
981
    # last_checked_ok - property
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
982
    @dbus_service_property(_interface, signature=u"s",
983
                           access=u"readwrite")
984
    def last_checked_ok_dbus_property(self, value=None):
985
        if value is not None:
986
            self.checked_ok()
987
            return
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
988
        if self.last_checked_ok is None:
989
            return dbus.String(u"")
990
        return dbus.String(self._datetime_to_dbus(self
991
                                                  .last_checked_ok))
992
    
993
    # timeout - property
994
    @dbus_service_property(_interface, signature=u"t",
995
                           access=u"readwrite")
996
    def timeout_dbus_property(self, value=None):
997
        if value is None:       # get
998
            return dbus.UInt64(self.timeout_milliseconds())
999
        self.timeout = datetime.timedelta(0, 0, 0, value)
1000
        # Emit D-Bus signal
1001
        self.PropertyChanged(dbus.String(u"timeout"),
1002
                             dbus.UInt64(value, variant_level=1))
1003
        if getattr(self, u"disable_initiator_tag", None) is None:
1004
            return
1005
        # Reschedule timeout
1006
        gobject.source_remove(self.disable_initiator_tag)
1007
        self.disable_initiator_tag = None
1008
        time_to_die = (self.
1009
                       _timedelta_to_milliseconds((self
1010
                                                   .last_checked_ok
1011
                                                   + self.timeout)
1012
                                                  - datetime.datetime
1013
                                                  .utcnow()))
1014
        if time_to_die <= 0:
1015
            # The timeout has passed
1016
            self.disable()
1017
        else:
1018
            self.disable_initiator_tag = (gobject.timeout_add
1019
                                          (time_to_die, self.disable))
1020
    
1021
    # interval - property
1022
    @dbus_service_property(_interface, signature=u"t",
1023
                           access=u"readwrite")
1024
    def interval_dbus_property(self, value=None):
1025
        if value is None:       # get
1026
            return dbus.UInt64(self.interval_milliseconds())
1027
        self.interval = datetime.timedelta(0, 0, 0, value)
1028
        # Emit D-Bus signal
1029
        self.PropertyChanged(dbus.String(u"interval"),
1030
                             dbus.UInt64(value, variant_level=1))
1031
        if getattr(self, u"checker_initiator_tag", None) is None:
1032
            return
1033
        # Reschedule checker run
1034
        gobject.source_remove(self.checker_initiator_tag)
1035
        self.checker_initiator_tag = (gobject.timeout_add
1036
                                      (value, self.start_checker))
1037
        self.start_checker()    # Start one now, too
1038
1039
    # checker - property
1040
    @dbus_service_property(_interface, signature=u"s",
1041
                           access=u"readwrite")
1042
    def checker_dbus_property(self, value=None):
1043
        if value is None:       # get
1044
            return dbus.String(self.checker_command)
1045
        self.checker_command = value
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1046
        # Emit D-Bus signal
1047
        self.PropertyChanged(dbus.String(u"checker"),
1048
                             dbus.String(self.checker_command,
1049
                                         variant_level=1))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1050
    
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1051
    # checker_running - property
1052
    @dbus_service_property(_interface, signature=u"b",
1053
                           access=u"readwrite")
1054
    def checker_running_dbus_property(self, value=None):
1055
        if value is None:       # get
1056
            return dbus.Boolean(self.checker is not None)
1057
        if value:
1058
            self.start_checker()
1059
        else:
1060
            self.stop_checker()
1061
    
1062
    # object_path - property
1063
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1064
    def object_path_dbus_property(self):
1065
        return self.dbus_object_path # is already a dbus.ObjectPath
1066
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1067
    # secret = property
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1068
    @dbus_service_property(_interface, signature=u"ay",
1069
                           access=u"write", byte_arrays=True)
1070
    def secret_dbus_property(self, value):
1071
        self.secret = str(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1072
    
1073
    del _interface
3 by Björn Påhlsson
Python based server
1074
1075
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1076
class ProxyClient(object):
1077
    def __init__(self, child_pipe, fpr, address):
1078
        self._pipe = child_pipe
1079
        self._pipe.send(('init', fpr, address))
1080
        if not self._pipe.recv():
1081
            raise KeyError()
1082
1083
    def __getattribute__(self, name):
1084
        if(name == '_pipe'):
1085
            return super(ProxyClient, self).__getattribute__(name)
1086
        self._pipe.send(('getattr', name))
1087
        data = self._pipe.recv()
1088
        if data[0] == 'data':
1089
            return data[1]
1090
        if data[0] == 'function':
1091
            def func(*args, **kwargs):
1092
                self._pipe.send(('funcall', name, args, kwargs))
1093
                return self._pipe.recv()[1]
1094
            return func
1095
1096
    def __setattr__(self, name, value):
1097
        if(name == '_pipe'):
1098
            return super(ProxyClient, self).__setattr__(name, value)
1099
        self._pipe.send(('setattr', name, value))
1100
1101
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1102
class ClientHandler(socketserver.BaseRequestHandler, object):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1103
    """A class to handle client connections.
1104
    
1105
    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
1106
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1107
    
3 by Björn Påhlsson
Python based server
1108
    def handle(self):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1109
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1110
            logger.info(u"TCP connection from: %s",
1111
                        unicode(self.client_address))
1112
            logger.debug(u"Pipe FD: %d",
1113
                         self.server.child_pipe.fileno())
1114
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1115
            session = (gnutls.connection
1116
                       .ClientSession(self.request,
1117
                                      gnutls.connection
1118
                                      .X509Credentials()))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1119
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1120
            # Note: gnutls.connection.X509Credentials is really a
1121
            # generic GnuTLS certificate credentials object so long as
1122
            # no X.509 keys are added to it.  Therefore, we can use it
1123
            # here despite using OpenPGP certificates.
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1124
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1125
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1126
            #                      u"+AES-256-CBC", u"+SHA1",
1127
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1128
            #                      u"+DHE-DSS"))
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1129
            # Use a fallback default, since this MUST be set.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1130
            priority = self.server.gnutls_priority
1131
            if priority is None:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1132
                priority = u"NORMAL"
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1133
            (gnutls.library.functions
1134
             .gnutls_priority_set_direct(session._c_object,
1135
                                         priority, None))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1136
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1137
            # Start communication using the Mandos protocol
1138
            # Get protocol number
1139
            line = self.request.makefile().readline()
1140
            logger.debug(u"Protocol version: %r", line)
1141
            try:
1142
                if int(line.strip().split()[0]) > 1:
1143
                    raise RuntimeError
1144
            except (ValueError, IndexError, RuntimeError), error:
1145
                logger.error(u"Unknown protocol version: %s", error)
1146
                return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1147
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1148
            # Start GnuTLS connection
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1149
            try:
1150
                session.handshake()
1151
            except gnutls.errors.GNUTLSError, error:
1152
                logger.warning(u"Handshake failed: %s", error)
1153
                # Do not run session.bye() here: the session is not
1154
                # established.  Just abandon the request.
1155
                return
1156
            logger.debug(u"Handshake succeeded")
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1157
1158
            approval_required = False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1159
            try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1160
                try:
1161
                    fpr = self.fingerprint(self.peer_certificate
1162
                                           (session))
1163
                except (TypeError, gnutls.errors.GNUTLSError), error:
1164
                    logger.warning(u"Bad certificate: %s", error)
1165
                    return
1166
                logger.debug(u"Fingerprint: %s", fpr)
1167
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1168
                try:
1169
                    client = ProxyClient(child_pipe, fpr,
1170
                                         self.client_address)
1171
                except KeyError:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1172
                    return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1173
                
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1174
                if client.approved_delay:
1175
                    delay = client.approved_delay
1176
                    client.approvals_pending += 1
1177
                    approval_required = True
1178
                
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1179
                while True:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1180
                    if not client.enabled:
1181
                        logger.warning(u"Client %s is disabled",
1182
                                       client.name)
1183
                        if self.server.use_dbus:
1184
                            # Emit D-Bus signal
1185
                            client.Rejected("Disabled")                    
1186
                        return
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1187
                    
1188
                    if client._approved or not client.approved_delay:
1189
                        #We are approved or approval is disabled
1190
                        break
1191
                    elif client._approved is None:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1192
                        logger.info(u"Client %s need approval",
1193
                                    client.name)
1194
                        if self.server.use_dbus:
1195
                            # Emit D-Bus signal
1196
                            client.NeedApproval(
1197
                                client.approved_delay_milliseconds(),
1198
                                client.approved_by_default)
1199
                    else:
1200
                        logger.warning(u"Client %s was not approved",
1201
                                       client.name)
1202
                        if self.server.use_dbus:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1203
                            # Emit D-Bus signal
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1204
                            client.Rejected("Disapproved")
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1205
                        return
1206
                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1207
                    #wait until timeout or approved
1208
                    #x = float(client._timedelta_to_milliseconds(delay))
1209
                    time = datetime.datetime.now()
1210
                    client.changedstate.acquire()
1211
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1212
                    client.changedstate.release()
1213
                    time2 = datetime.datetime.now()
1214
                    if (time2 - time) >= delay:
1215
                        if not client.approved_by_default:
1216
                            logger.warning("Client %s timed out while"
1217
                                           " waiting for approval",
1218
                                           client.name)
1219
                            if self.server.use_dbus:
1220
                                # Emit D-Bus signal
1221
                                client.Rejected("Time out")
1222
                            return
1223
                        else:
1224
                            break
1225
                    else:
1226
                        delay -= time2 - time
1227
                
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1228
                sent_size = 0
1229
                while sent_size < len(client.secret):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1230
                    # XXX handle session exception
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1231
                    sent = session.send(client.secret[sent_size:])
1232
                    logger.debug(u"Sent: %d, remaining: %d",
1233
                                 sent, len(client.secret)
1234
                                 - (sent_size + sent))
1235
                    sent_size += sent
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1236
1237
                logger.info(u"Sending secret to %s", client.name)
1238
                # bump the timeout as if seen
1239
                client.checked_ok()
1240
                if self.server.use_dbus:
1241
                    # Emit D-Bus signal
1242
                    client.GotSecret()
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1243
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1244
            finally:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1245
                if approval_required:
1246
                    client.approvals_pending -= 1
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1247
                session.bye()
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1248
    
1249
    @staticmethod
1250
    def peer_certificate(session):
1251
        "Return the peer's OpenPGP certificate as a bytestring"
1252
        # If not an OpenPGP certificate...
1253
        if (gnutls.library.functions
1254
            .gnutls_certificate_type_get(session._c_object)
1255
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1256
            # ...do the normal thing
1257
            return session.peer_certificate
1258
        list_size = ctypes.c_uint(1)
1259
        cert_list = (gnutls.library.functions
1260
                     .gnutls_certificate_get_peers
1261
                     (session._c_object, ctypes.byref(list_size)))
1262
        if not bool(cert_list) and list_size.value != 0:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1263
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1264
                                            u" certificate")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1265
        if list_size.value == 0:
1266
            return None
1267
        cert = cert_list[0]
1268
        return ctypes.string_at(cert.data, cert.size)
1269
    
1270
    @staticmethod
1271
    def fingerprint(openpgp):
1272
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1273
        # New GnuTLS "datum" with the OpenPGP public key
1274
        datum = (gnutls.library.types
1275
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1276
                                             ctypes.POINTER
1277
                                             (ctypes.c_ubyte)),
1278
                                 ctypes.c_uint(len(openpgp))))
1279
        # New empty GnuTLS certificate
1280
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1281
        (gnutls.library.functions
1282
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1283
        # Import the OpenPGP public key into the certificate
1284
        (gnutls.library.functions
1285
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1286
                                    gnutls.library.constants
1287
                                    .GNUTLS_OPENPGP_FMT_RAW))
1288
        # Verify the self signature in the key
1289
        crtverify = ctypes.c_uint()
1290
        (gnutls.library.functions
1291
         .gnutls_openpgp_crt_verify_self(crt, 0,
1292
                                         ctypes.byref(crtverify)))
1293
        if crtverify.value != 0:
1294
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1295
            raise (gnutls.errors.CertificateSecurityError
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1296
                   (u"Verify failed"))
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1297
        # New buffer for the fingerprint
1298
        buf = ctypes.create_string_buffer(20)
1299
        buf_len = ctypes.c_size_t()
1300
        # Get the fingerprint from the certificate into the buffer
1301
        (gnutls.library.functions
1302
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1303
                                             ctypes.byref(buf_len)))
1304
        # Deinit the certificate
1305
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1306
        # Convert the buffer to a Python bytestring
1307
        fpr = ctypes.string_at(buf, buf_len.value)
1308
        # Convert the bytestring to hexadecimal notation
1309
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1310
        return hex_fpr
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1311
1312
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1313
class MultiprocessingMixIn(object):
1314
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1315
    def sub_process_main(self, request, address):
1316
        try:
1317
            self.finish_request(request, address)
1318
        except:
1319
            self.handle_error(request, address)
1320
        self.close_request(request)
1321
            
1322
    def process_request(self, request, address):
1323
        """Start a new process to process the request."""
1324
        multiprocessing.Process(target = self.sub_process_main,
1325
                                args = (request, address)).start()
1326
1327
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1328
    """ adds a pipe to the MixIn """
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1329
    def process_request(self, request, client_address):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1330
        """Overrides and wraps the original process_request().
1331
        
355 by Teddy Hogeborn
* mandos: White-space fixes only.
1332
        This function creates a new pipe in self.pipe
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1333
        """
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1334
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1335
1336
        super(MultiprocessingMixInWithPipe,
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1337
              self).process_request(request, client_address)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1338
        self.add_pipe(parent_pipe)
1339
    def add_pipe(self, parent_pipe):
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1340
        """Dummy function; override as necessary"""
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1341
        pass
1342
1343
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1344
                     socketserver.TCPServer, object):
237.2.13 by Teddy Hogeborn
Merge from trunk. Notable changes:
1345
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1346
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1347
    Attributes:
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1348
        enabled:        Boolean; whether this server is activated yet
1349
        interface:      None or a network interface name (string)
1350
        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
1351
    """
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1352
    def __init__(self, server_address, RequestHandlerClass,
339 by Teddy Hogeborn
Code cleanup.
1353
                 interface=None, use_ipv6=True):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1354
        self.interface = interface
1355
        if use_ipv6:
1356
            self.address_family = socket.AF_INET6
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1357
        socketserver.TCPServer.__init__(self, server_address,
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1358
                                        RequestHandlerClass)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1359
    def server_bind(self):
1360
        """This overrides the normal server_bind() function
1361
        to bind to an interface if one was specified, and also NOT to
1362
        bind to an address or port if they were not specified."""
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1363
        if self.interface is not None:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1364
            if SO_BINDTODEVICE is None:
1365
                logger.error(u"SO_BINDTODEVICE does not exist;"
1366
                             u" cannot bind to interface %s",
1367
                             self.interface)
1368
            else:
1369
                try:
1370
                    self.socket.setsockopt(socket.SOL_SOCKET,
1371
                                           SO_BINDTODEVICE,
1372
                                           str(self.interface
1373
                                               + u'\0'))
1374
                except socket.error, error:
1375
                    if error[0] == errno.EPERM:
1376
                        logger.error(u"No permission to"
1377
                                     u" bind to interface %s",
1378
                                     self.interface)
1379
                    elif error[0] == errno.ENOPROTOOPT:
1380
                        logger.error(u"SO_BINDTODEVICE not available;"
1381
                                     u" cannot bind to interface %s",
1382
                                     self.interface)
1383
                    else:
1384
                        raise
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1385
        # Only bind(2) the socket if we really need to.
1386
        if self.server_address[0] or self.server_address[1]:
1387
            if not self.server_address[0]:
314 by Teddy Hogeborn
Support not using IPv6 in server:
1388
                if self.address_family == socket.AF_INET6:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1389
                    any_address = u"::" # in6addr_any
314 by Teddy Hogeborn
Support not using IPv6 in server:
1390
                else:
1391
                    any_address = socket.INADDR_ANY
1392
                self.server_address = (any_address,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1393
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1394
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1395
                self.server_address = (self.server_address[0],
1396
                                       0)
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1397
#                 if self.interface:
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1398
#                     self.server_address = (self.server_address[0],
1399
#                                            0, # port
1400
#                                            0, # flowinfo
1401
#                                            if_nametoindex
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1402
#                                            (self.interface))
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1403
            return socketserver.TCPServer.server_bind(self)
339 by Teddy Hogeborn
Code cleanup.
1404
1405
1406
class MandosServer(IPv6_TCPServer):
1407
    """Mandos server.
1408
    
1409
    Attributes:
1410
        clients:        set of Client objects
1411
        gnutls_priority GnuTLS priority string
1412
        use_dbus:       Boolean; to emit D-Bus signals or not
340 by Teddy Hogeborn
Code cleanup.
1413
    
1414
    Assumes a gobject.MainLoop event loop.
339 by Teddy Hogeborn
Code cleanup.
1415
    """
1416
    def __init__(self, server_address, RequestHandlerClass,
1417
                 interface=None, use_ipv6=True, clients=None,
1418
                 gnutls_priority=None, use_dbus=True):
1419
        self.enabled = False
1420
        self.clients = clients
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1421
        if self.clients is None:
1422
            self.clients = set()
339 by Teddy Hogeborn
Code cleanup.
1423
        self.use_dbus = use_dbus
1424
        self.gnutls_priority = gnutls_priority
1425
        IPv6_TCPServer.__init__(self, server_address,
1426
                                RequestHandlerClass,
1427
                                interface = interface,
1428
                                use_ipv6 = use_ipv6)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1429
    def server_activate(self):
1430
        if self.enabled:
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1431
            return socketserver.TCPServer.server_activate(self)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1432
    def enable(self):
1433
        self.enabled = True
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1434
    def add_pipe(self, parent_pipe):
340 by Teddy Hogeborn
Code cleanup.
1435
        # Call "handle_ipc" for both data and EOF events
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1436
        gobject.io_add_watch(parent_pipe.fileno(),
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1437
                             gobject.IO_IN | gobject.IO_HUP,
1438
                             functools.partial(self.handle_ipc,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1439
                                               parent_pipe = parent_pipe))
1440
        
1441
    def handle_ipc(self, source, condition, parent_pipe=None,
1442
                   client_object=None):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1443
        condition_names = {
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1444
            gobject.IO_IN: u"IN",   # There is data to read.
1445
            gobject.IO_OUT: u"OUT", # Data can be written (without
1446
                                    # blocking).
1447
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1448
            gobject.IO_ERR: u"ERR", # Error condition.
1449
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1450
                                    # broken, usually for pipes and
1451
                                    # sockets).
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1452
            }
1453
        conditions_string = ' | '.join(name
1454
                                       for cond, name in
1455
                                       condition_names.iteritems()
1456
                                       if cond & condition)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1457
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1458
                     conditions_string)
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1459
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1460
        # Read a request from the child
1461
        request = parent_pipe.recv()
1462
        command = request[0]
1463
        
1464
        if command == 'init':
1465
            fpr = request[1]
1466
            address = request[2]
1467
            
1468
            for c in self.clients:
1469
                if c.fingerprint == fpr:
1470
                    client = c
1471
                    break
1472
            else:
1473
                logger.warning(u"Client not found for fingerprint: %s, ad"
1474
                               u"dress: %s", fpr, address)
1475
                if self.use_dbus:
1476
                    # Emit D-Bus signal
1477
                    mandos_dbus_service.ClientNotFound(fpr, address)
1478
                parent_pipe.send(False)
1479
                return False
1480
            
1481
            gobject.io_add_watch(parent_pipe.fileno(),
1482
                                 gobject.IO_IN | gobject.IO_HUP,
1483
                                 functools.partial(self.handle_ipc,
1484
                                                   parent_pipe = parent_pipe,
1485
                                                   client_object = client))
1486
            parent_pipe.send(True)
1487
            # remove the old hook in favor of the new above hook on same fileno
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1488
            return False
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1489
        if command == 'funcall':
1490
            funcname = request[1]
1491
            args = request[2]
1492
            kwargs = request[3]
1493
            
1494
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1495
1496
        if command == 'getattr':
1497
            attrname = request[1]
1498
            if callable(client_object.__getattribute__(attrname)):
1499
                parent_pipe.send(('function',))
1500
            else:
1501
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1502
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1503
        if command == 'setattr':
1504
            attrname = request[1]
1505
            value = request[2]
1506
            setattr(client_object, attrname, value)
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1507
        
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1508
        return True
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
1509
3 by Björn Påhlsson
Python based server
1510
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1511
def string_to_delta(interval):
1512
    """Parse a string and return a datetime.timedelta
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1513
    
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1514
    >>> string_to_delta(u'7d')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1515
    datetime.timedelta(7)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1516
    >>> string_to_delta(u'60s')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1517
    datetime.timedelta(0, 60)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1518
    >>> string_to_delta(u'60m')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1519
    datetime.timedelta(0, 3600)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1520
    >>> string_to_delta(u'24h')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1521
    datetime.timedelta(1)
1522
    >>> string_to_delta(u'1w')
1523
    datetime.timedelta(7)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1524
    >>> string_to_delta(u'5m 30s')
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1525
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1526
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1527
    timevalue = datetime.timedelta(0)
1528
    for s in interval.split():
1529
        try:
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1530
            suffix = unicode(s[-1])
1531
            value = int(s[:-1])
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1532
            if suffix == u"d":
1533
                delta = datetime.timedelta(value)
1534
            elif suffix == u"s":
1535
                delta = datetime.timedelta(0, value)
1536
            elif suffix == u"m":
1537
                delta = datetime.timedelta(0, 0, 0, 0, value)
1538
            elif suffix == u"h":
1539
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1540
            elif suffix == u"w":
1541
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1542
            else:
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1543
                raise ValueError(u"Unknown suffix %r" % suffix)
1544
        except (ValueError, IndexError), e:
1545
            raise ValueError(e.message)
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1546
        timevalue += delta
1547
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1548
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
1549
24.1.13 by Björn Påhlsson
mandosclient
1550
def if_nametoindex(interface):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1551
    """Call the C function if_nametoindex(), or equivalent
1552
    
1553
    Note: This function cannot accept a unicode string."""
24.1.13 by Björn Påhlsson
mandosclient
1554
    global if_nametoindex
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1555
    try:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1556
        if_nametoindex = (ctypes.cdll.LoadLibrary
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1557
                          (ctypes.util.find_library(u"c"))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1558
                          .if_nametoindex)
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1559
    except (OSError, AttributeError):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1560
        logger.warning(u"Doing if_nametoindex the hard way")
24.1.13 by Björn Påhlsson
mandosclient
1561
        def if_nametoindex(interface):
28 by Teddy Hogeborn
* server.conf: New file.
1562
            "Get an interface index the hard way, i.e. using fcntl()"
1563
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1564
            with contextlib.closing(socket.socket()) as s:
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
1565
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1566
                                    struct.pack(str(u"16s16x"),
1567
                                                interface))
1568
            interface_index = struct.unpack(str(u"I"),
1569
                                            ifreq[16:20])[0]
28 by Teddy Hogeborn
* server.conf: New file.
1570
            return interface_index
24.1.13 by Björn Påhlsson
mandosclient
1571
    return if_nametoindex(interface)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1572
1573
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1574
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1575
    """See daemon(3).  Standard BSD Unix function.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1576
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1577
    This should really exist as os.daemon, but it doesn't (yet)."""
1578
    if os.fork():
1579
        sys.exit()
1580
    os.setsid()
1581
    if not nochdir:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1582
        os.chdir(u"/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
1583
    if os.fork():
1584
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1585
    if not noclose:
1586
        # Close all standard open file descriptors
28 by Teddy Hogeborn
* server.conf: New file.
1587
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1588
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1589
            raise OSError(errno.ENODEV,
388 by Teddy Hogeborn
* mandos (daemon): Use "os.path.devnull" in the error message.
1590
                          u"%s not a character device"
1591
                          % os.path.devnull)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1592
        os.dup2(null, sys.stdin.fileno())
1593
        os.dup2(null, sys.stdout.fileno())
1594
        os.dup2(null, sys.stderr.fileno())
1595
        if null > 2:
1596
            os.close(null)
1597
1598
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1599
def main():
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1600
    
379 by Teddy Hogeborn
* mandos: Fix line lengths.
1601
    ##################################################################
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1602
    # Parsing of options, both command line and config file
1603
    
237.2.1 by Teddy Hogeborn
Merge from trunk, but disable the unfinished D-Bus feature:
1604
    parser = optparse.OptionParser(version = "%%prog %s" % version)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1605
    parser.add_option("-i", u"--interface", type=u"string",
1606
                      metavar="IF", help=u"Bind to interface IF")
1607
    parser.add_option("-a", u"--address", type=u"string",
1608
                      help=u"Address to listen for requests on")
1609
    parser.add_option("-p", u"--port", type=u"int",
1610
                      help=u"Port number to receive requests on")
1611
    parser.add_option("--check", action=u"store_true",
1612
                      help=u"Run self-test")
1613
    parser.add_option("--debug", action=u"store_true",
1614
                      help=u"Debug mode; run in foreground and log to"
1615
                      u" terminal")
1616
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1617
                      u" priority string (see GnuTLS documentation)")
1618
    parser.add_option("--servicename", type=u"string",
1619
                      metavar=u"NAME", help=u"Zeroconf service name")
1620
    parser.add_option("--configdir", type=u"string",
1621
                      default=u"/etc/mandos", metavar=u"DIR",
1622
                      help=u"Directory to search for configuration"
1623
                      u" files")
1624
    parser.add_option("--no-dbus", action=u"store_false",
1625
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1626
                      u" system bus interface")
1627
    parser.add_option("--no-ipv6", action=u"store_false",
1628
                      dest=u"use_ipv6", help=u"Do not use IPv6")
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1629
    options = parser.parse_args()[0]
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1630
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1631
    if options.check:
1632
        import doctest
1633
        doctest.testmod()
1634
        sys.exit()
3 by Björn Påhlsson
Python based server
1635
    
28 by Teddy Hogeborn
* server.conf: New file.
1636
    # Default values for config file for server-global settings
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1637
    server_defaults = { u"interface": u"",
1638
                        u"address": u"",
1639
                        u"port": u"",
1640
                        u"debug": u"False",
1641
                        u"priority":
1642
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1643
                        u"servicename": u"Mandos",
1644
                        u"use_dbus": u"True",
1645
                        u"use_ipv6": u"True",
28 by Teddy Hogeborn
* server.conf: New file.
1646
                        }
1647
    
1648
    # Parse config file for server-global settings
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1649
    server_config = configparser.SafeConfigParser(server_defaults)
28 by Teddy Hogeborn
* server.conf: New file.
1650
    del server_defaults
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1651
    server_config.read(os.path.join(options.configdir,
1652
                                    u"mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
1653
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
1654
    server_settings = server_config.defaults()
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
1655
    # Use the appropriate methods on the non-string config options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1656
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1657
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1658
                                                           option)
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
1659
    if server_settings["port"]:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1660
        server_settings["port"] = server_config.getint(u"DEFAULT",
1661
                                                       u"port")
28 by Teddy Hogeborn
* server.conf: New file.
1662
    del server_config
1663
    
1664
    # Override the settings from the config file with command line
1665
    # options, if set.
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1666
    for option in (u"interface", u"address", u"port", u"debug",
1667
                   u"priority", u"servicename", u"configdir",
1668
                   u"use_dbus", u"use_ipv6"):
28 by Teddy Hogeborn
* server.conf: New file.
1669
        value = getattr(options, option)
1670
        if value is not None:
1671
            server_settings[option] = value
1672
    del options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1673
    # Force all strings to be unicode
1674
    for option in server_settings.keys():
1675
        if type(server_settings[option]) is str:
1676
            server_settings[option] = unicode(server_settings[option])
28 by Teddy Hogeborn
* server.conf: New file.
1677
    # Now we have our good server settings in "server_settings"
1678
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1679
    ##################################################################
1680
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1681
    # For convenience
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1682
    debug = server_settings[u"debug"]
1683
    use_dbus = server_settings[u"use_dbus"]
1684
    use_ipv6 = server_settings[u"use_ipv6"]
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1685
    
1686
    if not debug:
1687
        syslogger.setLevel(logging.WARNING)
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
1688
        console.setLevel(logging.WARNING)
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1689
    
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1690
    if server_settings[u"servicename"] != u"Mandos":
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1691
        syslogger.setFormatter(logging.Formatter
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1692
                               (u'Mandos (%s) [%%(process)d]:'
1693
                                u' %%(levelname)s: %%(message)s'
1694
                                % server_settings[u"servicename"]))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1695
    
28 by Teddy Hogeborn
* server.conf: New file.
1696
    # Parse config file with clients
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1697
    client_defaults = { u"timeout": u"1h",
1698
                        u"interval": u"5m",
1699
                        u"checker": u"fping -q -- %%(host)s",
1700
                        u"host": u"",
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
1701
                        u"approved_delay": u"0s",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1702
                        u"approved_duration": u"1s",
28 by Teddy Hogeborn
* server.conf: New file.
1703
                        }
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1704
    client_config = configparser.SafeConfigParser(client_defaults)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1705
    client_config.read(os.path.join(server_settings[u"configdir"],
1706
                                    u"clients.conf"))
1707
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1708
    global mandos_dbus_service
1709
    mandos_dbus_service = None
28 by Teddy Hogeborn
* server.conf: New file.
1710
    
339 by Teddy Hogeborn
Code cleanup.
1711
    tcp_server = MandosServer((server_settings[u"address"],
1712
                               server_settings[u"port"]),
1713
                              ClientHandler,
1714
                              interface=server_settings[u"interface"],
1715
                              use_ipv6=use_ipv6,
1716
                              gnutls_priority=
1717
                              server_settings[u"priority"],
1718
                              use_dbus=use_dbus)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1719
    pidfilename = u"/var/run/mandos.pid"
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1720
    try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1721
        pidfile = open(pidfilename, u"w")
292 by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally.
1722
    except IOError:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1723
        logger.error(u"Could not open file %r", pidfilename)
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1724
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1725
    try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1726
        uid = pwd.getpwnam(u"_mandos").pw_uid
1727
        gid = pwd.getpwnam(u"_mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1728
    except KeyError:
1729
        try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1730
            uid = pwd.getpwnam(u"mandos").pw_uid
1731
            gid = pwd.getpwnam(u"mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1732
        except KeyError:
1733
            try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1734
                uid = pwd.getpwnam(u"nobody").pw_uid
1735
                gid = pwd.getpwnam(u"nobody").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1736
            except KeyError:
1737
                uid = 65534
1738
                gid = 65534
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1739
    try:
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1740
        os.setgid(gid)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1741
        os.setuid(uid)
1742
    except OSError, error:
1743
        if error[0] != errno.EPERM:
1744
            raise error
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1745
    
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1746
    # Enable all possible GnuTLS debugging
1747
    if debug:
1748
        # "Use a log level over 10 to enable all debugging options."
1749
        # - GnuTLS manual
1750
        gnutls.library.functions.gnutls_global_set_log_level(11)
1751
        
1752
        @gnutls.library.types.gnutls_log_func
1753
        def debug_gnutls(level, string):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1754
            logger.debug(u"GnuTLS: %s", string[:-1])
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1755
        
1756
        (gnutls.library.functions
1757
         .gnutls_global_set_log_function(debug_gnutls))
1758
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1759
    global main_loop
1760
    # From the Avahi example code
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1761
    DBusGMainLoop(set_as_default=True )
1762
    main_loop = gobject.MainLoop()
1763
    bus = dbus.SystemBus()
1764
    # End of Avahi example code
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1765
    if use_dbus:
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1766
        try:
1767
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1768
                                            bus, do_not_queue=True)
1769
        except dbus.exceptions.NameExistsException, e:
1770
            logger.error(unicode(e) + u", disabling D-Bus")
1771
            use_dbus = False
1772
            server_settings[u"use_dbus"] = False
1773
            tcp_server.use_dbus = False
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1774
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1775
    service = AvahiService(name = server_settings[u"servicename"],
1776
                           servicetype = u"_mandos._tcp",
1777
                           protocol = protocol, bus = bus)
1778
    if server_settings["interface"]:
1779
        service.interface = (if_nametoindex
1780
                             (str(server_settings[u"interface"])))
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1781
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1782
    client_class = Client
1783
    if use_dbus:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1784
        client_class = functools.partial(ClientDBus, bus = bus)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1785
    def client_config_items(config, section):
1786
        special_settings = {
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1787
            "approved_by_default":
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1788
                lambda: config.getboolean(section,
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1789
                                          "approved_by_default"),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1790
            }
1791
        for name, value in config.items(section):
1792
            try:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1793
                yield (name, special_settings[name]())
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1794
            except KeyError:
1795
                yield (name, value)
1796
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1797
    tcp_server.clients.update(set(
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1798
            client_class(name = section,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1799
                         config= dict(client_config_items(
1800
                        client_config, section)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1801
            for section in client_config.sections()))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1802
    if not tcp_server.clients:
244 by Teddy Hogeborn
* debian/control (Build-Depends): Bug fix: Added "docbook-xml".
1803
        logger.warning(u"No clients defined")
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1804
    
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
1805
    if debug:
1806
        # Redirect stdin so all checkers get /dev/null
1807
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1808
        os.dup2(null, sys.stdin.fileno())
1809
        if null > 2:
1810
            os.close(null)
1811
    else:
1812
        # No console logging
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
1813
        logger.removeHandler(console)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
1814
        # Close all input and output, do double fork, etc.
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1815
        daemon()
51 by Teddy Hogeborn
* clients.conf: Better comments.
1816
    
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1817
    try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1818
        with pidfile:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1819
            pid = os.getpid()
1820
            pidfile.write(str(pid) + "\n")
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1821
        del pidfile
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1822
    except IOError:
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1823
        logger.error(u"Could not write to file %r with PID %d",
1824
                     pidfilename, pid)
1825
    except NameError:
1826
        # "pidfile" was never created
1827
        pass
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1828
    del pidfilename
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1829
    
1830
    if not debug:
1831
        signal.signal(signal.SIGINT, signal.SIG_IGN)
28 by Teddy Hogeborn
* server.conf: New file.
1832
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1833
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1834
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1835
    if use_dbus:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1836
        class MandosDBusService(dbus.service.Object):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1837
            """A D-Bus proxy object"""
1838
            def __init__(self):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1839
                dbus.service.Object.__init__(self, bus, u"/")
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
1840
            _interface = u"se.bsnet.fukt.Mandos"
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1841
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1842
            @dbus.service.signal(_interface, signature=u"o")
1843
            def ClientAdded(self, objpath):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1844
                "D-Bus signal"
1845
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1846
            
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
1847
            @dbus.service.signal(_interface, signature=u"ss")
1848
            def ClientNotFound(self, fingerprint, address):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1849
                "D-Bus signal"
1850
                pass
1851
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1852
            @dbus.service.signal(_interface, signature=u"os")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1853
            def ClientRemoved(self, objpath, name):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1854
                "D-Bus signal"
1855
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1856
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1857
            @dbus.service.method(_interface, out_signature=u"ao")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1858
            def GetAllClients(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1859
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1860
                return dbus.Array(c.dbus_object_path
1861
                                  for c in tcp_server.clients)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1862
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1863
            @dbus.service.method(_interface,
1864
                                 out_signature=u"a{oa{sv}}")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1865
            def GetAllClientsWithProperties(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1866
                "D-Bus method"
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1867
                return dbus.Dictionary(
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1868
                    ((c.dbus_object_path, c.GetAll(u""))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1869
                     for c in tcp_server.clients),
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1870
                    signature=u"oa{sv}")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1871
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1872
            @dbus.service.method(_interface, in_signature=u"o")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1873
            def RemoveClient(self, object_path):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1874
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1875
                for c in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1876
                    if c.dbus_object_path == object_path:
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1877
                        tcp_server.clients.remove(c)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1878
                        c.remove_from_connection()
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1879
                        # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1880
                        c.disable(quiet=True)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1881
                        # Emit D-Bus signal
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1882
                        self.ClientRemoved(object_path, c.name)
1883
                        return
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1884
                raise KeyError(object_path)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1885
            
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1886
            del _interface
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1887
        
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1888
        mandos_dbus_service = MandosDBusService()
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1889
    
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1890
    def cleanup():
1891
        "Cleanup function; run on exit"
1892
        service.cleanup()
1893
        
1894
        while tcp_server.clients:
1895
            client = tcp_server.clients.pop()
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1896
            if use_dbus:
1897
                client.remove_from_connection()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1898
            client.disable_hook = None
1899
            # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1900
            client.disable(quiet=True)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1901
            if use_dbus:
1902
                # Emit D-Bus signal
1903
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1904
                                                  client.name)
1905
    
1906
    atexit.register(cleanup)
1907
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1908
    for client in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1909
        if use_dbus:
1910
            # Emit D-Bus signal
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1911
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
1912
        client.enable()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1913
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1914
    tcp_server.enable()
1915
    tcp_server.server_activate()
1916
    
28 by Teddy Hogeborn
* server.conf: New file.
1917
    # Find out what port we got
1918
    service.port = tcp_server.socket.getsockname()[1]
314 by Teddy Hogeborn
Support not using IPv6 in server:
1919
    if use_ipv6:
1920
        logger.info(u"Now listening on address %r, port %d,"
1921
                    " flowinfo %d, scope_id %d"
1922
                    % tcp_server.socket.getsockname())
1923
    else:                       # IPv4
1924
        logger.info(u"Now listening on address %r, port %d"
1925
                    % tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
1926
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
1927
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
1928
    
1929
    try:
1930
        # From the Avahi example code
1931
        try:
336 by Teddy Hogeborn
Code cleanup.
1932
            service.activate()
28 by Teddy Hogeborn
* server.conf: New file.
1933
        except dbus.exceptions.DBusException, error:
1934
            logger.critical(u"DBusException: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1935
            cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
1936
            sys.exit(1)
1937
        # End of Avahi example code
1938
        
1939
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1940
                             lambda *args, **kwargs:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1941
                             (tcp_server.handle_request
1942
                              (*args[2:], **kwargs) or True))
28 by Teddy Hogeborn
* server.conf: New file.
1943
        
51 by Teddy Hogeborn
* clients.conf: Better comments.
1944
        logger.debug(u"Starting main loop")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1945
        main_loop.run()
28 by Teddy Hogeborn
* server.conf: New file.
1946
    except AvahiError, error:
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
1947
        logger.critical(u"AvahiError: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1948
        cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
1949
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1950
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1951
        if debug:
292 by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally.
1952
            print >> sys.stderr
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1953
        logger.debug(u"Server received KeyboardInterrupt")
1954
    logger.debug(u"Server exiting")
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1955
    # Must run before the D-Bus bus name gets deregistered
1956
    cleanup()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1957
1958
if __name__ == '__main__':
1959
    main()