/mandos/trunk

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