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