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