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