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