/mandos/trunk

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