/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.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
716
    def _get_approvals_pending(value):
717
        return self._approvals_pending
718
    def _set_approvals_pending(value):
719
        old_value = self._approvals_pending
720
        self._approvals_pending = value
721
        bval = bool(value)
722
        if bval is bool(old_value):
723
            dbus_bool = dbus.Boolean(bval, variant_level=1)
724
            self.PropertyChanged(dbus.String(u"approved_pending"),
725
                                 dbus_bool)
726
        return value
727
    approvals_pending = property(_get_approvals_pending,
728
                                 _set_approvals_pending)
729
    del _get_approvals_pending, _set_approvals_pending
730
    
336 by Teddy Hogeborn
Code cleanup.
731
    @staticmethod
732
    def _datetime_to_dbus(dt, variant_level=0):
733
        """Convert a UTC datetime.datetime() to a D-Bus type."""
734
        return dbus.String(dt.isoformat(),
735
                           variant_level=variant_level)
736
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
737
    def enable(self):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
738
        oldstate = getattr(self, u"enabled", False)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
739
        r = Client.enable(self)
740
        if oldstate != self.enabled:
741
            # Emit D-Bus signals
742
            self.PropertyChanged(dbus.String(u"enabled"),
743
                                 dbus.Boolean(True, variant_level=1))
336 by Teddy Hogeborn
Code cleanup.
744
            self.PropertyChanged(
745
                dbus.String(u"last_enabled"),
746
                self._datetime_to_dbus(self.last_enabled,
747
                                       variant_level=1))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
748
        return r
749
    
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
750
    def disable(self, quiet = False):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
751
        oldstate = getattr(self, u"enabled", False)
403 by Teddy Hogeborn
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
752
        r = Client.disable(self, quiet=quiet)
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
753
        if not quiet and oldstate != self.enabled:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
754
            # Emit D-Bus signal
755
            self.PropertyChanged(dbus.String(u"enabled"),
756
                                 dbus.Boolean(False, variant_level=1))
757
        return r
758
    
759
    def __del__(self, *args, **kwargs):
760
        try:
761
            self.remove_from_connection()
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
762
        except LookupError:
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
763
            pass
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
764
        if hasattr(DBusObjectWithProperties, u"__del__"):
765
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
766
        Client.__del__(self, *args, **kwargs)
767
    
768
    def checker_callback(self, pid, condition, command,
769
                         *args, **kwargs):
770
        self.checker_callback_tag = None
771
        self.checker = None
772
        # Emit D-Bus signal
773
        self.PropertyChanged(dbus.String(u"checker_running"),
774
                             dbus.Boolean(False, variant_level=1))
775
        if os.WIFEXITED(condition):
776
            exitstatus = os.WEXITSTATUS(condition)
777
            # Emit D-Bus signal
778
            self.CheckerCompleted(dbus.Int16(exitstatus),
779
                                  dbus.Int64(condition),
780
                                  dbus.String(command))
781
        else:
782
            # Emit D-Bus signal
783
            self.CheckerCompleted(dbus.Int16(-1),
784
                                  dbus.Int64(condition),
785
                                  dbus.String(command))
786
        
787
        return Client.checker_callback(self, pid, condition, command,
788
                                       *args, **kwargs)
789
    
790
    def checked_ok(self, *args, **kwargs):
791
        r = Client.checked_ok(self, *args, **kwargs)
792
        # Emit D-Bus signal
793
        self.PropertyChanged(
794
            dbus.String(u"last_checked_ok"),
336 by Teddy Hogeborn
Code cleanup.
795
            (self._datetime_to_dbus(self.last_checked_ok,
796
                                    variant_level=1)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
797
        return r
798
    
799
    def start_checker(self, *args, **kwargs):
800
        old_checker = self.checker
801
        if self.checker is not None:
802
            old_checker_pid = self.checker.pid
803
        else:
804
            old_checker_pid = None
805
        r = Client.start_checker(self, *args, **kwargs)
329 by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do
806
        # Only if new checker process was started
807
        if (self.checker is not None
808
            and old_checker_pid != self.checker.pid):
809
            # Emit D-Bus signal
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
810
            self.CheckerStarted(self.current_checker_command)
811
            self.PropertyChanged(
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
812
                dbus.String(u"checker_running"),
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
813
                dbus.Boolean(True, variant_level=1))
814
        return r
815
    
816
    def stop_checker(self, *args, **kwargs):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
817
        old_checker = getattr(self, u"checker", None)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
818
        r = Client.stop_checker(self, *args, **kwargs)
819
        if (old_checker is not None
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
820
            and getattr(self, u"checker", None) is None):
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
821
            self.PropertyChanged(dbus.String(u"checker_running"),
822
                                 dbus.Boolean(False, variant_level=1))
823
        return r
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
824
825
    def _reset_approved(self):
826
        self._approved = None
827
        return False
828
    
829
    def approve(self, value=True):
830
        self._approved = value
831
        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".
832
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
833
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
834
    ## D-Bus methods, signals & properties
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
835
    _interface = u"se.bsnet.fukt.Mandos.Client"
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
836
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
837
    ## Signals
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
838
    
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
839
    # CheckerCompleted - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
840
    @dbus.service.signal(_interface, signature=u"nxs")
280 by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return
841
    def CheckerCompleted(self, exitcode, waitstatus, command):
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
842
        "D-Bus signal"
843
        pass
844
    
845
    # CheckerStarted - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
846
    @dbus.service.signal(_interface, signature=u"s")
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
847
    def CheckerStarted(self, command):
848
        "D-Bus signal"
849
        pass
850
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
851
    # PropertyChanged - signal
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
852
    @dbus.service.signal(_interface, signature=u"sv")
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
853
    def PropertyChanged(self, property, value):
854
        "D-Bus signal"
855
        pass
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
856
    
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
857
    # GotSecret - signal
327 by Teddy Hogeborn
Merge from pipe IPC branch.
858
    @dbus.service.signal(_interface)
387 by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All
859
    def GotSecret(self):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
860
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
861
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
862
    
863
    # Rejected - signal
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
864
    @dbus.service.signal(_interface, signature=u"s")
865
    def Rejected(self, reason):
866
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
867
        pass
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
868
    
869
    # NeedApproval - signal
870
    @dbus.service.signal(_interface, signature=u"db")
871
    def NeedApproval(self, timeout, default):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
872
        "D-Bus signal"
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
873
        pass
327 by Teddy Hogeborn
Merge from pipe IPC branch.
874
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
875
    ## Methods
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
876
877
    # Approve - method
878
    @dbus.service.method(_interface, in_signature=u"b")
879
    def Approve(self, value):
880
        self.approve(value)
881
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
882
    # CheckedOK - method
883
    @dbus.service.method(_interface)
884
    def CheckedOK(self):
885
        return self.checked_ok()
886
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
887
    # Enable - method
888
    @dbus.service.method(_interface)
889
    def Enable(self):
890
        "D-Bus method"
891
        self.enable()
892
    
893
    # StartChecker - method
894
    @dbus.service.method(_interface)
895
    def StartChecker(self):
896
        "D-Bus method"
897
        self.start_checker()
898
    
899
    # Disable - method
900
    @dbus.service.method(_interface)
901
    def Disable(self):
902
        "D-Bus method"
903
        self.disable()
904
    
905
    # StopChecker - method
906
    @dbus.service.method(_interface)
907
    def StopChecker(self):
908
        self.stop_checker()
909
    
24.1.147 by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors:
910
    ## Properties
911
    
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
912
    # approved_pending - property
913
    @dbus_service_property(_interface, signature=u"b", access=u"read")
914
    def approved_pending_dbus_property(self):
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
915
        return dbus.Boolean(bool(self.approvals_pending))
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
916
    
917
    # approved_by_default - property
918
    @dbus_service_property(_interface, signature=u"b",
919
                           access=u"readwrite")
920
    def approved_by_default_dbus_property(self):
921
        return dbus.Boolean(self.approved_by_default)
922
    
923
    # approved_delay - property
924
    @dbus_service_property(_interface, signature=u"t",
925
                           access=u"readwrite")
926
    def approved_delay_dbus_property(self):
927
        return dbus.UInt64(self.approved_delay_milliseconds())
928
    
929
    # approved_duration - property
930
    @dbus_service_property(_interface, signature=u"t",
931
                           access=u"readwrite")
932
    def approved_duration_dbus_property(self):
933
        return dbus.UInt64(self._timedelta_to_milliseconds(
934
                self.approved_duration))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
935
    
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
936
    # name - property
937
    @dbus_service_property(_interface, signature=u"s", access=u"read")
938
    def name_dbus_property(self):
939
        return dbus.String(self.name)
940
    
941
    # fingerprint - property
942
    @dbus_service_property(_interface, signature=u"s", access=u"read")
943
    def fingerprint_dbus_property(self):
944
        return dbus.String(self.fingerprint)
945
    
946
    # host - property
947
    @dbus_service_property(_interface, signature=u"s",
948
                           access=u"readwrite")
949
    def host_dbus_property(self, value=None):
950
        if value is None:       # get
951
            return dbus.String(self.host)
952
        self.host = value
953
        # Emit D-Bus signal
954
        self.PropertyChanged(dbus.String(u"host"),
955
                             dbus.String(value, variant_level=1))
956
    
957
    # created - property
958
    @dbus_service_property(_interface, signature=u"s", access=u"read")
959
    def created_dbus_property(self):
960
        return dbus.String(self._datetime_to_dbus(self.created))
961
    
962
    # last_enabled - property
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
964
    def last_enabled_dbus_property(self):
965
        if self.last_enabled is None:
966
            return dbus.String(u"")
967
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
968
    
969
    # enabled - property
970
    @dbus_service_property(_interface, signature=u"b",
971
                           access=u"readwrite")
972
    def enabled_dbus_property(self, value=None):
973
        if value is None:       # get
974
            return dbus.Boolean(self.enabled)
975
        if value:
976
            self.enable()
977
        else:
978
            self.disable()
979
    
980
    # last_checked_ok - property
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
981
    @dbus_service_property(_interface, signature=u"s",
982
                           access=u"readwrite")
983
    def last_checked_ok_dbus_property(self, value=None):
984
        if value is not None:
985
            self.checked_ok()
986
            return
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
987
        if self.last_checked_ok is None:
988
            return dbus.String(u"")
989
        return dbus.String(self._datetime_to_dbus(self
990
                                                  .last_checked_ok))
991
    
992
    # timeout - property
993
    @dbus_service_property(_interface, signature=u"t",
994
                           access=u"readwrite")
995
    def timeout_dbus_property(self, value=None):
996
        if value is None:       # get
997
            return dbus.UInt64(self.timeout_milliseconds())
998
        self.timeout = datetime.timedelta(0, 0, 0, value)
999
        # Emit D-Bus signal
1000
        self.PropertyChanged(dbus.String(u"timeout"),
1001
                             dbus.UInt64(value, variant_level=1))
1002
        if getattr(self, u"disable_initiator_tag", None) is None:
1003
            return
1004
        # Reschedule timeout
1005
        gobject.source_remove(self.disable_initiator_tag)
1006
        self.disable_initiator_tag = None
1007
        time_to_die = (self.
1008
                       _timedelta_to_milliseconds((self
1009
                                                   .last_checked_ok
1010
                                                   + self.timeout)
1011
                                                  - datetime.datetime
1012
                                                  .utcnow()))
1013
        if time_to_die <= 0:
1014
            # The timeout has passed
1015
            self.disable()
1016
        else:
1017
            self.disable_initiator_tag = (gobject.timeout_add
1018
                                          (time_to_die, self.disable))
1019
    
1020
    # interval - property
1021
    @dbus_service_property(_interface, signature=u"t",
1022
                           access=u"readwrite")
1023
    def interval_dbus_property(self, value=None):
1024
        if value is None:       # get
1025
            return dbus.UInt64(self.interval_milliseconds())
1026
        self.interval = datetime.timedelta(0, 0, 0, value)
1027
        # Emit D-Bus signal
1028
        self.PropertyChanged(dbus.String(u"interval"),
1029
                             dbus.UInt64(value, variant_level=1))
1030
        if getattr(self, u"checker_initiator_tag", None) is None:
1031
            return
1032
        # Reschedule checker run
1033
        gobject.source_remove(self.checker_initiator_tag)
1034
        self.checker_initiator_tag = (gobject.timeout_add
1035
                                      (value, self.start_checker))
1036
        self.start_checker()    # Start one now, too
1037
1038
    # checker - property
1039
    @dbus_service_property(_interface, signature=u"s",
1040
                           access=u"readwrite")
1041
    def checker_dbus_property(self, value=None):
1042
        if value is None:       # get
1043
            return dbus.String(self.checker_command)
1044
        self.checker_command = value
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1045
        # Emit D-Bus signal
1046
        self.PropertyChanged(dbus.String(u"checker"),
1047
                             dbus.String(self.checker_command,
1048
                                         variant_level=1))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1049
    
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1050
    # checker_running - property
1051
    @dbus_service_property(_interface, signature=u"b",
1052
                           access=u"readwrite")
1053
    def checker_running_dbus_property(self, value=None):
1054
        if value is None:       # get
1055
            return dbus.Boolean(self.checker is not None)
1056
        if value:
1057
            self.start_checker()
1058
        else:
1059
            self.stop_checker()
1060
    
1061
    # object_path - property
1062
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1063
    def object_path_dbus_property(self):
1064
        return self.dbus_object_path # is already a dbus.ObjectPath
1065
    
381 by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable
1066
    # secret = property
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1067
    @dbus_service_property(_interface, signature=u"ay",
1068
                           access=u"write", byte_arrays=True)
1069
    def secret_dbus_property(self, value):
1070
        self.secret = str(value)
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1071
    
1072
    del _interface
3 by Björn Påhlsson
Python based server
1073
1074
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1075
class ProxyClient(object):
1076
    def __init__(self, child_pipe, fpr, address):
1077
        self._pipe = child_pipe
1078
        self._pipe.send(('init', fpr, address))
1079
        if not self._pipe.recv():
1080
            raise KeyError()
1081
1082
    def __getattribute__(self, name):
1083
        if(name == '_pipe'):
1084
            return super(ProxyClient, self).__getattribute__(name)
1085
        self._pipe.send(('getattr', name))
1086
        data = self._pipe.recv()
1087
        if data[0] == 'data':
1088
            return data[1]
1089
        if data[0] == 'function':
1090
            def func(*args, **kwargs):
1091
                self._pipe.send(('funcall', name, args, kwargs))
1092
                return self._pipe.recv()[1]
1093
            return func
1094
1095
    def __setattr__(self, name, value):
1096
        if(name == '_pipe'):
1097
            return super(ProxyClient, self).__setattr__(name, value)
1098
        self._pipe.send(('setattr', name, value))
1099
1100
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1101
class ClientHandler(socketserver.BaseRequestHandler, object):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1102
    """A class to handle client connections.
1103
    
1104
    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
1105
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1106
    
3 by Björn Påhlsson
Python based server
1107
    def handle(self):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1108
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1109
            logger.info(u"TCP connection from: %s",
1110
                        unicode(self.client_address))
1111
            logger.debug(u"Pipe FD: %d",
1112
                         self.server.child_pipe.fileno())
1113
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1114
            session = (gnutls.connection
1115
                       .ClientSession(self.request,
1116
                                      gnutls.connection
1117
                                      .X509Credentials()))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1118
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1119
            # Note: gnutls.connection.X509Credentials is really a
1120
            # generic GnuTLS certificate credentials object so long as
1121
            # no X.509 keys are added to it.  Therefore, we can use it
1122
            # here despite using OpenPGP certificates.
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1123
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1124
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1125
            #                      u"+AES-256-CBC", u"+SHA1",
1126
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1127
            #                      u"+DHE-DSS"))
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1128
            # Use a fallback default, since this MUST be set.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1129
            priority = self.server.gnutls_priority
1130
            if priority is None:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1131
                priority = u"NORMAL"
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1132
            (gnutls.library.functions
1133
             .gnutls_priority_set_direct(session._c_object,
1134
                                         priority, None))
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1135
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1136
            # Start communication using the Mandos protocol
1137
            # Get protocol number
1138
            line = self.request.makefile().readline()
1139
            logger.debug(u"Protocol version: %r", line)
1140
            try:
1141
                if int(line.strip().split()[0]) > 1:
1142
                    raise RuntimeError
1143
            except (ValueError, IndexError, RuntimeError), error:
1144
                logger.error(u"Unknown protocol version: %s", error)
1145
                return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1146
416.1.2 by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object
1147
            # Start GnuTLS connection
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1148
            try:
1149
                session.handshake()
1150
            except gnutls.errors.GNUTLSError, error:
1151
                logger.warning(u"Handshake failed: %s", error)
1152
                # Do not run session.bye() here: the session is not
1153
                # established.  Just abandon the request.
1154
                return
1155
            logger.debug(u"Handshake succeeded")
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1156
1157
            approval_required = False
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1158
            try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1159
                try:
1160
                    fpr = self.fingerprint(self.peer_certificate
1161
                                           (session))
1162
                except (TypeError, gnutls.errors.GNUTLSError), error:
1163
                    logger.warning(u"Bad certificate: %s", error)
1164
                    return
1165
                logger.debug(u"Fingerprint: %s", fpr)
1166
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1167
                try:
1168
                    client = ProxyClient(child_pipe, fpr,
1169
                                         self.client_address)
1170
                except KeyError:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1171
                    return
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1172
                
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1173
                if client.approved_delay:
1174
                    delay = client.approved_delay
1175
                    client.approvals_pending += 1
1176
                    approval_required = True
1177
                
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1178
                while True:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1179
                    if not client.enabled:
1180
                        logger.warning(u"Client %s is disabled",
1181
                                       client.name)
1182
                        if self.server.use_dbus:
1183
                            # Emit D-Bus signal
1184
                            client.Rejected("Disabled")                    
1185
                        return
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1186
                    
1187
                    if client._approved or not client.approved_delay:
1188
                        #We are approved or approval is disabled
1189
                        break
1190
                    elif client._approved is None:
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1191
                        logger.info(u"Client %s need approval",
1192
                                    client.name)
1193
                        if self.server.use_dbus:
1194
                            # Emit D-Bus signal
1195
                            client.NeedApproval(
1196
                                client.approved_delay_milliseconds(),
1197
                                client.approved_by_default)
1198
                    else:
1199
                        logger.warning(u"Client %s was not approved",
1200
                                       client.name)
1201
                        if self.server.use_dbus:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1202
                            # Emit D-Bus signal
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1203
                            client.Rejected("Disapproved")
24.1.148 by Björn Påhlsson
half working on-demand password and approved code
1204
                        return
1205
                    
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1206
                    #wait until timeout or approved
1207
                    #x = float(client._timedelta_to_milliseconds(delay))
1208
                    time = datetime.datetime.now()
1209
                    client.changedstate.acquire()
1210
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1211
                    client.changedstate.release()
1212
                    time2 = datetime.datetime.now()
1213
                    if (time2 - time) >= delay:
1214
                        if not client.approved_by_default:
1215
                            logger.warning("Client %s timed out while"
1216
                                           " waiting for approval",
1217
                                           client.name)
1218
                            if self.server.use_dbus:
1219
                                # Emit D-Bus signal
1220
                                client.Rejected("Time out")
1221
                            return
1222
                        else:
1223
                            break
1224
                    else:
1225
                        delay -= time2 - time
1226
                
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1227
                sent_size = 0
1228
                while sent_size < len(client.secret):
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1229
                    # XXX handle session exception
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1230
                    sent = session.send(client.secret[sent_size:])
1231
                    logger.debug(u"Sent: %d, remaining: %d",
1232
                                 sent, len(client.secret)
1233
                                 - (sent_size + sent))
1234
                    sent_size += sent
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1235
1236
                logger.info(u"Sending secret to %s", client.name)
1237
                # bump the timeout as if seen
1238
                client.checked_ok()
1239
                if self.server.use_dbus:
1240
                    # Emit D-Bus signal
1241
                    client.GotSecret()
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1242
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1243
            finally:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1244
                if approval_required:
1245
                    client.approvals_pending -= 1
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1246
                session.bye()
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1247
    
1248
    @staticmethod
1249
    def peer_certificate(session):
1250
        "Return the peer's OpenPGP certificate as a bytestring"
1251
        # If not an OpenPGP certificate...
1252
        if (gnutls.library.functions
1253
            .gnutls_certificate_type_get(session._c_object)
1254
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1255
            # ...do the normal thing
1256
            return session.peer_certificate
1257
        list_size = ctypes.c_uint(1)
1258
        cert_list = (gnutls.library.functions
1259
                     .gnutls_certificate_get_peers
1260
                     (session._c_object, ctypes.byref(list_size)))
1261
        if not bool(cert_list) and list_size.value != 0:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1262
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1263
                                            u" certificate")
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1264
        if list_size.value == 0:
1265
            return None
1266
        cert = cert_list[0]
1267
        return ctypes.string_at(cert.data, cert.size)
1268
    
1269
    @staticmethod
1270
    def fingerprint(openpgp):
1271
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1272
        # New GnuTLS "datum" with the OpenPGP public key
1273
        datum = (gnutls.library.types
1274
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1275
                                             ctypes.POINTER
1276
                                             (ctypes.c_ubyte)),
1277
                                 ctypes.c_uint(len(openpgp))))
1278
        # New empty GnuTLS certificate
1279
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1280
        (gnutls.library.functions
1281
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1282
        # Import the OpenPGP public key into the certificate
1283
        (gnutls.library.functions
1284
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1285
                                    gnutls.library.constants
1286
                                    .GNUTLS_OPENPGP_FMT_RAW))
1287
        # Verify the self signature in the key
1288
        crtverify = ctypes.c_uint()
1289
        (gnutls.library.functions
1290
         .gnutls_openpgp_crt_verify_self(crt, 0,
1291
                                         ctypes.byref(crtverify)))
1292
        if crtverify.value != 0:
1293
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1294
            raise (gnutls.errors.CertificateSecurityError
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1295
                   (u"Verify failed"))
330 by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
1296
        # New buffer for the fingerprint
1297
        buf = ctypes.create_string_buffer(20)
1298
        buf_len = ctypes.c_size_t()
1299
        # Get the fingerprint from the certificate into the buffer
1300
        (gnutls.library.functions
1301
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1302
                                             ctypes.byref(buf_len)))
1303
        # Deinit the certificate
1304
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1305
        # Convert the buffer to a Python bytestring
1306
        fpr = ctypes.string_at(buf, buf_len.value)
1307
        # Convert the bytestring to hexadecimal notation
1308
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1309
        return hex_fpr
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1310
1311
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1312
class MultiprocessingMixIn(object):
1313
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1314
    def sub_process_main(self, request, address):
1315
        try:
1316
            self.finish_request(request, address)
1317
        except:
1318
            self.handle_error(request, address)
1319
        self.close_request(request)
1320
            
1321
    def process_request(self, request, address):
1322
        """Start a new process to process the request."""
1323
        multiprocessing.Process(target = self.sub_process_main,
1324
                                args = (request, address)).start()
1325
1326
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1327
    """ adds a pipe to the MixIn """
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1328
    def process_request(self, request, client_address):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1329
        """Overrides and wraps the original process_request().
1330
        
355 by Teddy Hogeborn
* mandos: White-space fixes only.
1331
        This function creates a new pipe in self.pipe
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1332
        """
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1333
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1334
1335
        super(MultiprocessingMixInWithPipe,
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1336
              self).process_request(request, client_address)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1337
        self.add_pipe(parent_pipe)
1338
    def add_pipe(self, parent_pipe):
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1339
        """Dummy function; override as necessary"""
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1340
        pass
1341
1342
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1343
                     socketserver.TCPServer, object):
237.2.13 by Teddy Hogeborn
Merge from trunk. Notable changes:
1344
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1345
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1346
    Attributes:
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1347
        enabled:        Boolean; whether this server is activated yet
1348
        interface:      None or a network interface name (string)
1349
        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
1350
    """
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1351
    def __init__(self, server_address, RequestHandlerClass,
339 by Teddy Hogeborn
Code cleanup.
1352
                 interface=None, use_ipv6=True):
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1353
        self.interface = interface
1354
        if use_ipv6:
1355
            self.address_family = socket.AF_INET6
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1356
        socketserver.TCPServer.__init__(self, server_address,
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1357
                                        RequestHandlerClass)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1358
    def server_bind(self):
1359
        """This overrides the normal server_bind() function
1360
        to bind to an interface if one was specified, and also NOT to
1361
        bind to an address or port if they were not specified."""
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1362
        if self.interface is not None:
338 by Teddy Hogeborn
* mandos: Minor doc string fixes.
1363
            if SO_BINDTODEVICE is None:
1364
                logger.error(u"SO_BINDTODEVICE does not exist;"
1365
                             u" cannot bind to interface %s",
1366
                             self.interface)
1367
            else:
1368
                try:
1369
                    self.socket.setsockopt(socket.SOL_SOCKET,
1370
                                           SO_BINDTODEVICE,
1371
                                           str(self.interface
1372
                                               + u'\0'))
1373
                except socket.error, error:
1374
                    if error[0] == errno.EPERM:
1375
                        logger.error(u"No permission to"
1376
                                     u" bind to interface %s",
1377
                                     self.interface)
1378
                    elif error[0] == errno.ENOPROTOOPT:
1379
                        logger.error(u"SO_BINDTODEVICE not available;"
1380
                                     u" cannot bind to interface %s",
1381
                                     self.interface)
1382
                    else:
1383
                        raise
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1384
        # Only bind(2) the socket if we really need to.
1385
        if self.server_address[0] or self.server_address[1]:
1386
            if not self.server_address[0]:
314 by Teddy Hogeborn
Support not using IPv6 in server:
1387
                if self.address_family == socket.AF_INET6:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1388
                    any_address = u"::" # in6addr_any
314 by Teddy Hogeborn
Support not using IPv6 in server:
1389
                else:
1390
                    any_address = socket.INADDR_ANY
1391
                self.server_address = (any_address,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1392
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1393
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1394
                self.server_address = (self.server_address[0],
1395
                                       0)
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1396
#                 if self.interface:
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
1397
#                     self.server_address = (self.server_address[0],
1398
#                                            0, # port
1399
#                                            0, # flowinfo
1400
#                                            if_nametoindex
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1401
#                                            (self.interface))
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1402
            return socketserver.TCPServer.server_bind(self)
339 by Teddy Hogeborn
Code cleanup.
1403
1404
1405
class MandosServer(IPv6_TCPServer):
1406
    """Mandos server.
1407
    
1408
    Attributes:
1409
        clients:        set of Client objects
1410
        gnutls_priority GnuTLS priority string
1411
        use_dbus:       Boolean; to emit D-Bus signals or not
340 by Teddy Hogeborn
Code cleanup.
1412
    
1413
    Assumes a gobject.MainLoop event loop.
339 by Teddy Hogeborn
Code cleanup.
1414
    """
1415
    def __init__(self, server_address, RequestHandlerClass,
1416
                 interface=None, use_ipv6=True, clients=None,
1417
                 gnutls_priority=None, use_dbus=True):
1418
        self.enabled = False
1419
        self.clients = clients
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1420
        if self.clients is None:
1421
            self.clients = set()
339 by Teddy Hogeborn
Code cleanup.
1422
        self.use_dbus = use_dbus
1423
        self.gnutls_priority = gnutls_priority
1424
        IPv6_TCPServer.__init__(self, server_address,
1425
                                RequestHandlerClass,
1426
                                interface = interface,
1427
                                use_ipv6 = use_ipv6)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1428
    def server_activate(self):
1429
        if self.enabled:
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1430
            return socketserver.TCPServer.server_activate(self)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1431
    def enable(self):
1432
        self.enabled = True
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1433
    def add_pipe(self, parent_pipe):
340 by Teddy Hogeborn
Code cleanup.
1434
        # Call "handle_ipc" for both data and EOF events
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1435
        gobject.io_add_watch(parent_pipe.fileno(),
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1436
                             gobject.IO_IN | gobject.IO_HUP,
1437
                             functools.partial(self.handle_ipc,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1438
                                               parent_pipe = parent_pipe))
1439
        
1440
    def handle_ipc(self, source, condition, parent_pipe=None,
1441
                   client_object=None):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1442
        condition_names = {
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1443
            gobject.IO_IN: u"IN",   # There is data to read.
1444
            gobject.IO_OUT: u"OUT", # Data can be written (without
1445
                                    # blocking).
1446
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1447
            gobject.IO_ERR: u"ERR", # Error condition.
1448
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1449
                                    # broken, usually for pipes and
1450
                                    # sockets).
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1451
            }
1452
        conditions_string = ' | '.join(name
1453
                                       for cond, name in
1454
                                       condition_names.iteritems()
1455
                                       if cond & condition)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1456
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1457
                     conditions_string)
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1458
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1459
        # Read a request from the child
1460
        request = parent_pipe.recv()
1461
        command = request[0]
1462
        
1463
        if command == 'init':
1464
            fpr = request[1]
1465
            address = request[2]
1466
            
1467
            for c in self.clients:
1468
                if c.fingerprint == fpr:
1469
                    client = c
1470
                    break
1471
            else:
1472
                logger.warning(u"Client not found for fingerprint: %s, ad"
1473
                               u"dress: %s", fpr, address)
1474
                if self.use_dbus:
1475
                    # Emit D-Bus signal
1476
                    mandos_dbus_service.ClientNotFound(fpr, address)
1477
                parent_pipe.send(False)
1478
                return False
1479
            
1480
            gobject.io_add_watch(parent_pipe.fileno(),
1481
                                 gobject.IO_IN | gobject.IO_HUP,
1482
                                 functools.partial(self.handle_ipc,
1483
                                                   parent_pipe = parent_pipe,
1484
                                                   client_object = client))
1485
            parent_pipe.send(True)
1486
            # 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.
1487
            return False
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1488
        if command == 'funcall':
1489
            funcname = request[1]
1490
            args = request[2]
1491
            kwargs = request[3]
1492
            
1493
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1494
1495
        if command == 'getattr':
1496
            attrname = request[1]
1497
            if callable(client_object.__getattribute__(attrname)):
1498
                parent_pipe.send(('function',))
1499
            else:
1500
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1501
        
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1502
        if command == 'setattr':
1503
            attrname = request[1]
1504
            value = request[2]
1505
            setattr(client_object, attrname, value)
24.2.4 by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property
1506
        
288.1.1 by Teddy Hogeborn
Start of new pipe-based IPC mechanism.
1507
        return True
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
1508
3 by Björn Påhlsson
Python based server
1509
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1510
def string_to_delta(interval):
1511
    """Parse a string and return a datetime.timedelta
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1512
    
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1513
    >>> string_to_delta(u'7d')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1514
    datetime.timedelta(7)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1515
    >>> string_to_delta(u'60s')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1516
    datetime.timedelta(0, 60)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1517
    >>> string_to_delta(u'60m')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1518
    datetime.timedelta(0, 3600)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1519
    >>> string_to_delta(u'24h')
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1520
    datetime.timedelta(1)
1521
    >>> string_to_delta(u'1w')
1522
    datetime.timedelta(7)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1523
    >>> string_to_delta(u'5m 30s')
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1524
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1525
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1526
    timevalue = datetime.timedelta(0)
1527
    for s in interval.split():
1528
        try:
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1529
            suffix = unicode(s[-1])
1530
            value = int(s[:-1])
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1531
            if suffix == u"d":
1532
                delta = datetime.timedelta(value)
1533
            elif suffix == u"s":
1534
                delta = datetime.timedelta(0, value)
1535
            elif suffix == u"m":
1536
                delta = datetime.timedelta(0, 0, 0, 0, value)
1537
            elif suffix == u"h":
1538
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1539
            elif suffix == u"w":
1540
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1541
            else:
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1542
                raise ValueError(u"Unknown suffix %r" % suffix)
1543
        except (ValueError, IndexError), e:
1544
            raise ValueError(e.message)
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
1545
        timevalue += delta
1546
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1547
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
1548
24.1.13 by Björn Påhlsson
mandosclient
1549
def if_nametoindex(interface):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1550
    """Call the C function if_nametoindex(), or equivalent
1551
    
1552
    Note: This function cannot accept a unicode string."""
24.1.13 by Björn Påhlsson
mandosclient
1553
    global if_nametoindex
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1554
    try:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1555
        if_nametoindex = (ctypes.cdll.LoadLibrary
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1556
                          (ctypes.util.find_library(u"c"))
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1557
                          .if_nametoindex)
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
1558
    except (OSError, AttributeError):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1559
        logger.warning(u"Doing if_nametoindex the hard way")
24.1.13 by Björn Påhlsson
mandosclient
1560
        def if_nametoindex(interface):
28 by Teddy Hogeborn
* server.conf: New file.
1561
            "Get an interface index the hard way, i.e. using fcntl()"
1562
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1563
            with contextlib.closing(socket.socket()) as s:
237 by Teddy Hogeborn
* mandos: Also import "with_statement" and "absolute_import" from
1564
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1565
                                    struct.pack(str(u"16s16x"),
1566
                                                interface))
1567
            interface_index = struct.unpack(str(u"I"),
1568
                                            ifreq[16:20])[0]
28 by Teddy Hogeborn
* server.conf: New file.
1569
            return interface_index
24.1.13 by Björn Påhlsson
mandosclient
1570
    return if_nametoindex(interface)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1571
1572
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1573
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1574
    """See daemon(3).  Standard BSD Unix function.
331 by Teddy Hogeborn
Minor code cleanup, and a bug fix.
1575
    
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1576
    This should really exist as os.daemon, but it doesn't (yet)."""
1577
    if os.fork():
1578
        sys.exit()
1579
    os.setsid()
1580
    if not nochdir:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1581
        os.chdir(u"/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
1582
    if os.fork():
1583
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1584
    if not noclose:
1585
        # Close all standard open file descriptors
28 by Teddy Hogeborn
* server.conf: New file.
1586
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1587
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1588
            raise OSError(errno.ENODEV,
388 by Teddy Hogeborn
* mandos (daemon): Use "os.path.devnull" in the error message.
1589
                          u"%s not a character device"
1590
                          % os.path.devnull)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1591
        os.dup2(null, sys.stdin.fileno())
1592
        os.dup2(null, sys.stdout.fileno())
1593
        os.dup2(null, sys.stderr.fileno())
1594
        if null > 2:
1595
            os.close(null)
1596
1597
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1598
def main():
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1599
    
379 by Teddy Hogeborn
* mandos: Fix line lengths.
1600
    ##################################################################
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1601
    # Parsing of options, both command line and config file
1602
    
237.2.1 by Teddy Hogeborn
Merge from trunk, but disable the unfinished D-Bus feature:
1603
    parser = optparse.OptionParser(version = "%%prog %s" % version)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1604
    parser.add_option("-i", u"--interface", type=u"string",
1605
                      metavar="IF", help=u"Bind to interface IF")
1606
    parser.add_option("-a", u"--address", type=u"string",
1607
                      help=u"Address to listen for requests on")
1608
    parser.add_option("-p", u"--port", type=u"int",
1609
                      help=u"Port number to receive requests on")
1610
    parser.add_option("--check", action=u"store_true",
1611
                      help=u"Run self-test")
1612
    parser.add_option("--debug", action=u"store_true",
1613
                      help=u"Debug mode; run in foreground and log to"
1614
                      u" terminal")
1615
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1616
                      u" priority string (see GnuTLS documentation)")
1617
    parser.add_option("--servicename", type=u"string",
1618
                      metavar=u"NAME", help=u"Zeroconf service name")
1619
    parser.add_option("--configdir", type=u"string",
1620
                      default=u"/etc/mandos", metavar=u"DIR",
1621
                      help=u"Directory to search for configuration"
1622
                      u" files")
1623
    parser.add_option("--no-dbus", action=u"store_false",
1624
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1625
                      u" system bus interface")
1626
    parser.add_option("--no-ipv6", action=u"store_false",
1627
                      dest=u"use_ipv6", help=u"Do not use IPv6")
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1628
    options = parser.parse_args()[0]
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1629
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
1630
    if options.check:
1631
        import doctest
1632
        doctest.testmod()
1633
        sys.exit()
3 by Björn Påhlsson
Python based server
1634
    
28 by Teddy Hogeborn
* server.conf: New file.
1635
    # Default values for config file for server-global settings
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1636
    server_defaults = { u"interface": u"",
1637
                        u"address": u"",
1638
                        u"port": u"",
1639
                        u"debug": u"False",
1640
                        u"priority":
1641
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1642
                        u"servicename": u"Mandos",
1643
                        u"use_dbus": u"True",
1644
                        u"use_ipv6": u"True",
28 by Teddy Hogeborn
* server.conf: New file.
1645
                        }
1646
    
1647
    # Parse config file for server-global settings
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1648
    server_config = configparser.SafeConfigParser(server_defaults)
28 by Teddy Hogeborn
* server.conf: New file.
1649
    del server_defaults
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1650
    server_config.read(os.path.join(options.configdir,
1651
                                    u"mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
1652
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
1653
    server_settings = server_config.defaults()
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
1654
    # Use the appropriate methods on the non-string config options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1655
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1656
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1657
                                                           option)
282 by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file
1658
    if server_settings["port"]:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1659
        server_settings["port"] = server_config.getint(u"DEFAULT",
1660
                                                       u"port")
28 by Teddy Hogeborn
* server.conf: New file.
1661
    del server_config
1662
    
1663
    # Override the settings from the config file with command line
1664
    # options, if set.
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1665
    for option in (u"interface", u"address", u"port", u"debug",
1666
                   u"priority", u"servicename", u"configdir",
1667
                   u"use_dbus", u"use_ipv6"):
28 by Teddy Hogeborn
* server.conf: New file.
1668
        value = getattr(options, option)
1669
        if value is not None:
1670
            server_settings[option] = value
1671
    del options
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1672
    # Force all strings to be unicode
1673
    for option in server_settings.keys():
1674
        if type(server_settings[option]) is str:
1675
            server_settings[option] = unicode(server_settings[option])
28 by Teddy Hogeborn
* server.conf: New file.
1676
    # Now we have our good server settings in "server_settings"
1677
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1678
    ##################################################################
1679
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1680
    # For convenience
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1681
    debug = server_settings[u"debug"]
1682
    use_dbus = server_settings[u"use_dbus"]
1683
    use_ipv6 = server_settings[u"use_ipv6"]
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1684
    
1685
    if not debug:
1686
        syslogger.setLevel(logging.WARNING)
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
1687
        console.setLevel(logging.WARNING)
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1688
    
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1689
    if server_settings[u"servicename"] != u"Mandos":
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1690
        syslogger.setFormatter(logging.Formatter
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1691
                               (u'Mandos (%s) [%%(process)d]:'
1692
                                u' %%(levelname)s: %%(message)s'
1693
                                % server_settings[u"servicename"]))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
1694
    
28 by Teddy Hogeborn
* server.conf: New file.
1695
    # Parse config file with clients
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1696
    client_defaults = { u"timeout": u"1h",
1697
                        u"interval": u"5m",
1698
                        u"checker": u"fping -q -- %%(host)s",
1699
                        u"host": u"",
24.2.1 by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid".
1700
                        u"approved_delay": u"0s",
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1701
                        u"approved_duration": u"1s",
28 by Teddy Hogeborn
* server.conf: New file.
1702
                        }
335 by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser"
1703
    client_config = configparser.SafeConfigParser(client_defaults)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1704
    client_config.read(os.path.join(server_settings[u"configdir"],
1705
                                    u"clients.conf"))
1706
    
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1707
    global mandos_dbus_service
1708
    mandos_dbus_service = None
28 by Teddy Hogeborn
* server.conf: New file.
1709
    
339 by Teddy Hogeborn
Code cleanup.
1710
    tcp_server = MandosServer((server_settings[u"address"],
1711
                               server_settings[u"port"]),
1712
                              ClientHandler,
1713
                              interface=server_settings[u"interface"],
1714
                              use_ipv6=use_ipv6,
1715
                              gnutls_priority=
1716
                              server_settings[u"priority"],
1717
                              use_dbus=use_dbus)
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1718
    pidfilename = u"/var/run/mandos.pid"
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1719
    try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1720
        pidfile = open(pidfilename, u"w")
292 by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally.
1721
    except IOError:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1722
        logger.error(u"Could not open file %r", pidfilename)
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1723
    
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1724
    try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1725
        uid = pwd.getpwnam(u"_mandos").pw_uid
1726
        gid = pwd.getpwnam(u"_mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1727
    except KeyError:
1728
        try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1729
            uid = pwd.getpwnam(u"mandos").pw_uid
1730
            gid = pwd.getpwnam(u"mandos").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1731
        except KeyError:
1732
            try:
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1733
                uid = pwd.getpwnam(u"nobody").pw_uid
1734
                gid = pwd.getpwnam(u"nobody").pw_gid
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1735
            except KeyError:
1736
                uid = 65534
1737
                gid = 65534
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1738
    try:
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1739
        os.setgid(gid)
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1740
        os.setuid(uid)
1741
    except OSError, error:
1742
        if error[0] != errno.EPERM:
1743
            raise error
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1744
    
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1745
    # Enable all possible GnuTLS debugging
1746
    if debug:
1747
        # "Use a log level over 10 to enable all debugging options."
1748
        # - GnuTLS manual
1749
        gnutls.library.functions.gnutls_global_set_log_level(11)
1750
        
1751
        @gnutls.library.types.gnutls_log_func
1752
        def debug_gnutls(level, string):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1753
            logger.debug(u"GnuTLS: %s", string[:-1])
290 by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS
1754
        
1755
        (gnutls.library.functions
1756
         .gnutls_global_set_log_function(debug_gnutls))
1757
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1758
    global main_loop
1759
    # From the Avahi example code
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1760
    DBusGMainLoop(set_as_default=True )
1761
    main_loop = gobject.MainLoop()
1762
    bus = dbus.SystemBus()
1763
    # End of Avahi example code
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1764
    if use_dbus:
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1765
        try:
1766
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1767
                                            bus, do_not_queue=True)
1768
        except dbus.exceptions.NameExistsException, e:
1769
            logger.error(unicode(e) + u", disabling D-Bus")
1770
            use_dbus = False
1771
            server_settings[u"use_dbus"] = False
1772
            tcp_server.use_dbus = False
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1773
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1774
    service = AvahiService(name = server_settings[u"servicename"],
1775
                           servicetype = u"_mandos._tcp",
1776
                           protocol = protocol, bus = bus)
1777
    if server_settings["interface"]:
1778
        service.interface = (if_nametoindex
1779
                             (str(server_settings[u"interface"])))
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1780
    
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1781
    client_class = Client
1782
    if use_dbus:
337 by Teddy Hogeborn
Code cleanup. Move some global stuff into main.
1783
        client_class = functools.partial(ClientDBus, bus = bus)
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1784
    def client_config_items(config, section):
1785
        special_settings = {
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1786
            "approved_by_default":
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1787
                lambda: config.getboolean(section,
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1788
                                          "approved_by_default"),
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1789
            }
1790
        for name, value in config.items(section):
1791
            try:
24.1.150 by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed
1792
                yield (name, special_settings[name]())
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1793
            except KeyError:
1794
                yield (name, value)
1795
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1796
    tcp_server.clients.update(set(
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1797
            client_class(name = section,
24.1.149 by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing
1798
                         config= dict(client_config_items(
1799
                        client_config, section)))
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1800
            for section in client_config.sections()))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1801
    if not tcp_server.clients:
244 by Teddy Hogeborn
* debian/control (Build-Depends): Bug fix: Added "docbook-xml".
1802
        logger.warning(u"No clients defined")
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1803
    
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
1804
    if debug:
1805
        # Redirect stdin so all checkers get /dev/null
1806
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1807
        os.dup2(null, sys.stdin.fileno())
1808
        if null > 2:
1809
            os.close(null)
1810
    else:
1811
        # No console logging
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
1812
        logger.removeHandler(console)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
1813
        # Close all input and output, do double fork, etc.
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
1814
        daemon()
51 by Teddy Hogeborn
* clients.conf: Better comments.
1815
    
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1816
    try:
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1817
        with pidfile:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1818
            pid = os.getpid()
1819
            pidfile.write(str(pid) + "\n")
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1820
        del pidfile
215 by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util".
1821
    except IOError:
165 by Teddy Hogeborn
* mandos (main): Use EAFP with pidfile.
1822
        logger.error(u"Could not write to file %r with PID %d",
1823
                     pidfilename, pid)
1824
    except NameError:
1825
        # "pidfile" was never created
1826
        pass
164 by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it
1827
    del pidfilename
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1828
    
1829
    if not debug:
1830
        signal.signal(signal.SIGINT, signal.SIG_IGN)
28 by Teddy Hogeborn
* server.conf: New file.
1831
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1832
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1833
    
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1834
    if use_dbus:
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1835
        class MandosDBusService(dbus.service.Object):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1836
            """A D-Bus proxy object"""
1837
            def __init__(self):
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1838
                dbus.service.Object.__init__(self, bus, u"/")
279 by Teddy Hogeborn
* mandos (Client.__init__): Disable D-Bus during init to avoid
1839
            _interface = u"se.bsnet.fukt.Mandos"
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1840
            
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1841
            @dbus.service.signal(_interface, signature=u"o")
1842
            def ClientAdded(self, objpath):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1843
                "D-Bus signal"
1844
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1845
            
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
1846
            @dbus.service.signal(_interface, signature=u"ss")
1847
            def ClientNotFound(self, fingerprint, address):
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1848
                "D-Bus signal"
1849
                pass
1850
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1851
            @dbus.service.signal(_interface, signature=u"os")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1852
            def ClientRemoved(self, objpath, name):
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1853
                "D-Bus signal"
1854
                pass
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1855
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1856
            @dbus.service.method(_interface, out_signature=u"ao")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1857
            def GetAllClients(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1858
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1859
                return dbus.Array(c.dbus_object_path
1860
                                  for c in tcp_server.clients)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1861
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1862
            @dbus.service.method(_interface,
1863
                                 out_signature=u"a{oa{sv}}")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1864
            def GetAllClientsWithProperties(self):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1865
                "D-Bus method"
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1866
                return dbus.Dictionary(
380 by Teddy Hogeborn
Use D-Bus properties instead of our own methods.
1867
                    ((c.dbus_object_path, c.GetAll(u""))
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1868
                     for c in tcp_server.clients),
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1869
                    signature=u"oa{sv}")
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1870
            
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1871
            @dbus.service.method(_interface, in_signature=u"o")
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1872
            def RemoveClient(self, object_path):
283 by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from
1873
                "D-Bus method"
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1874
                for c in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1875
                    if c.dbus_object_path == object_path:
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1876
                        tcp_server.clients.remove(c)
328 by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class.
1877
                        c.remove_from_connection()
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1878
                        # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1879
                        c.disable(quiet=True)
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1880
                        # Emit D-Bus signal
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1881
                        self.ClientRemoved(object_path, c.name)
1882
                        return
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1883
                raise KeyError(object_path)
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1884
            
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1885
            del _interface
278 by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path
1886
        
327 by Teddy Hogeborn
Merge from pipe IPC branch.
1887
        mandos_dbus_service = MandosDBusService()
238 by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also
1888
    
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1889
    def cleanup():
1890
        "Cleanup function; run on exit"
1891
        service.cleanup()
1892
        
1893
        while tcp_server.clients:
1894
            client = tcp_server.clients.pop()
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1895
            if use_dbus:
1896
                client.remove_from_connection()
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1897
            client.disable_hook = None
1898
            # Don't signal anything except ClientRemoved
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
1899
            client.disable(quiet=True)
400 by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to
1900
            if use_dbus:
1901
                # Emit D-Bus signal
1902
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1903
                                                  client.name)
1904
    
1905
    atexit.register(cleanup)
1906
    
341 by Teddy Hogeborn
Code cleanup and one bug fix.
1907
    for client in tcp_server.clients:
243 by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a
1908
        if use_dbus:
1909
            # Emit D-Bus signal
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
1910
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
239 by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus";
1911
        client.enable()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1912
    
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
1913
    tcp_server.enable()
1914
    tcp_server.server_activate()
1915
    
28 by Teddy Hogeborn
* server.conf: New file.
1916
    # Find out what port we got
1917
    service.port = tcp_server.socket.getsockname()[1]
314 by Teddy Hogeborn
Support not using IPv6 in server:
1918
    if use_ipv6:
1919
        logger.info(u"Now listening on address %r, port %d,"
1920
                    " flowinfo %d, scope_id %d"
1921
                    % tcp_server.socket.getsockname())
1922
    else:                       # IPv4
1923
        logger.info(u"Now listening on address %r, port %d"
1924
                    % tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
1925
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
1926
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
1927
    
1928
    try:
1929
        # From the Avahi example code
1930
        try:
336 by Teddy Hogeborn
Code cleanup.
1931
            service.activate()
28 by Teddy Hogeborn
* server.conf: New file.
1932
        except dbus.exceptions.DBusException, error:
1933
            logger.critical(u"DBusException: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1934
            cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
1935
            sys.exit(1)
1936
        # End of Avahi example code
1937
        
1938
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1939
                             lambda *args, **kwargs:
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
1940
                             (tcp_server.handle_request
1941
                              (*args[2:], **kwargs) or True))
28 by Teddy Hogeborn
* server.conf: New file.
1942
        
51 by Teddy Hogeborn
* clients.conf: Better comments.
1943
        logger.debug(u"Starting main loop")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1944
        main_loop.run()
28 by Teddy Hogeborn
* server.conf: New file.
1945
    except AvahiError, error:
242 by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed.
1946
        logger.critical(u"AvahiError: %s", error)
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1947
        cleanup()
28 by Teddy Hogeborn
* server.conf: New file.
1948
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
1949
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
1950
        if debug:
292 by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally.
1951
            print >> sys.stderr
333 by Teddy Hogeborn
Minor code cleanup; one minor bug fix.
1952
        logger.debug(u"Server received KeyboardInterrupt")
1953
    logger.debug(u"Server exiting")
401 by Teddy Hogeborn
* README (FAQ): Fix typo.
1954
    # Must run before the D-Bus bus name gets deregistered
1955
    cleanup()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
1956
1957
if __name__ == '__main__':
1958
    main()