/mandos/trunk

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