/mandos/trunk

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