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