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