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