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