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