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