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