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