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