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 569
- compare with another revision
- download diff
- download tarball
- view history from revision 569
- Committer: Teddy Hogeborn
- Date: 2012-05-03 20:16:22 UTC
- Revision ID: teddy@recompile.se-20120503201622-d9yezi9t17i00lio
* mandos-ctl: Use new string format method. Bug fix: --version now
shows the program name.
shows the program name.
- files removed:
- debian/mandos-client.examples
- debian/upstream
- files modified:
- .bzrignore
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
37
import SocketServer as socketserver
43
38
import socket
44
39
import argparse
45
40
import datetime
50
45
import gnutls.library.functions
51
46
import gnutls.library.constants
52
47
import gnutls.library.types
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
48
import ConfigParser as configparser
57
49
import sys
58
50
import re
59
51
import os
68
60
import struct
69
61
import fcntl
70
62
import functools
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
63
import cPickle as pickle
75
64
import multiprocessing
76
65
import types
77
66
import binascii
78
67
import tempfile
79
68
import itertools
80
import collections
81
import codecs
82
69
83
70
import dbus
84
71
import dbus.service
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
72
import gobject
89
73
import avahi
90
74
from dbus.mainloop.glib import DBusGMainLoop
91
75
import ctypes
92
76
import ctypes.util
93
77
import xml.dom.minidom
94
78
import inspect
79
import GnuPGInterface
95
80
96
81
try:
97
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
101
86
except ImportError:
102
87
SO_BINDTODEVICE = None
103
88
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.6.9"
89
version = "1.5.3"
108
90
stored_state_file = "clients.pickle"
109
91
110
92
logger = logging.getLogger()
111
syslogger = None
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
112
96
113
97
try:
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
116
101
except (OSError, AttributeError):
117
118
102
def if_nametoindex(interface):
119
103
"Get an interface index the hard way, i.e. using fcntl()"
120
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
105
with contextlib.closing(socket.socket()) as s:
122
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
125
111
return interface_index
126
112
127
113
128
114
def initlogger(debug, level=logging.WARNING):
129
115
"""init logger and add loglevel"""
130
116
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
117
syslogger.setFormatter(logging.Formatter
136
118
('Mandos [%(process)d]: %(levelname)s:'
137
119
' %(message)s'))
154
136
155
137
class PGPEngine(object):
156
138
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
158
139
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
159
141
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
162
'--force-mdc',
163
'--quiet',
164
'--no-use-agent']
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
165
148
166
149
def __enter__(self):
167
150
return self
168
151
169
def __exit__(self, exc_type, exc_value, traceback):
152
def __exit__ (self, exc_type, exc_value, traceback):
170
153
self._cleanup()
171
154
return False
172
155
189
172
def password_encode(self, password):
190
173
# Passphrase can not be empty and can not contain newlines or
191
174
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
198
return encoded
175
return b"mandos" + binascii.hexlify(password)
199
176
200
177
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
205
passfile.flush()
206
proc = subprocess.Popen(['gpg', '--symmetric',
207
'--passphrase-file',
208
passfile.name]
209
+ self.gnupgargs,
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
215
raise PGPError(err)
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
216
192
return ciphertext
217
193
218
194
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
223
passfile.flush()
224
proc = subprocess.Popen(['gpg', '--decrypt',
225
'--passphrase-file',
226
passfile.name]
227
+ self.gnupgargs,
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
233
raise PGPError(err)
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
234
209
return decrypted_plaintext
235
210
236
211
212
237
213
class AvahiError(Exception):
238
214
def __init__(self, value, *args, **kwargs):
239
215
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
243
219
244
220
class AvahiServiceError(AvahiError):
245
221
pass
246
222
247
248
223
class AvahiGroupError(AvahiError):
249
224
pass
250
225
257
232
Used to optionally bind to the specified interface.
258
233
name: string; Example: 'Mandos'
259
234
type: string; Example: '_mandos._tcp'.
260
See <https://www.iana.org/assignments/service-names-port-numbers>
235
See <http://www.dns-sd.org/ServiceTypes.html>
261
236
port: integer; what port to announce
262
237
TXT: list of strings; TXT record for the service
263
238
domain: string; Domain to publish on, default to .local if empty.
269
244
server: D-Bus Server
270
245
bus: dbus.SystemBus()
271
246
"""
272
273
def __init__(self,
274
interface = avahi.IF_UNSPEC,
275
name = None,
276
servicetype = None,
277
port = None,
278
TXT = None,
279
domain = "",
280
host = "",
281
max_renames = 32768,
282
protocol = avahi.PROTO_UNSPEC,
283
bus = None):
247
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
servicetype = None, port = None, TXT = None,
249
domain = "", host = "", max_renames = 32768,
250
protocol = avahi.PROTO_UNSPEC, bus = None):
284
251
self.interface = interface
285
252
self.name = name
286
253
self.type = servicetype
295
262
self.server = None
296
263
self.bus = bus
297
264
self.entry_group_state_changed_match = None
298
299
def rename(self, remove=True):
265
def rename(self):
300
266
"""Derived from the Avahi example code"""
301
267
if self.rename_count >= self.max_renames:
302
268
logger.critical("No suitable Zeroconf service name found"
303
269
" after %i retries, exiting.",
304
270
self.rename_count)
305
271
raise AvahiServiceError("Too many renames")
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
272
self.name = unicode(self.server
273
.GetAlternativeServiceName(self.name))
309
274
logger.info("Changing Zeroconf service name to %r ...",
310
275
self.name)
311
if remove:
312
self.remove()
276
self.remove()
313
277
try:
314
278
self.add()
315
279
except dbus.exceptions.DBusException as error:
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
320
else:
321
logger.critical("D-Bus Exception", exc_info=error)
322
self.cleanup()
323
os._exit(1)
324
280
logger.critical("D-Bus Exception", exc_info=error)
281
self.cleanup()
282
os._exit(1)
283
self.rename_count += 1
325
284
def remove(self):
326
285
"""Derived from the Avahi example code"""
327
286
if self.entry_group_state_changed_match is not None:
329
288
self.entry_group_state_changed_match = None
330
289
if self.group is not None:
331
290
self.group.Reset()
332
333
291
def add(self):
334
292
"""Derived from the Avahi example code"""
335
293
self.remove()
352
310
dbus.UInt16(self.port),
353
311
avahi.string_array_to_txt_array(self.TXT))
354
312
self.group.Commit()
355
356
313
def entry_group_state_changed(self, state, error):
357
314
"""Derived from the Avahi example code"""
358
315
logger.debug("Avahi entry group state change: %i", state)
364
321
self.rename()
365
322
elif state == avahi.ENTRY_GROUP_FAILURE:
366
323
logger.critical("Avahi: Error in group state changed %s",
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
369
324
unicode(error))
325
raise AvahiGroupError("State changed: {0!s}"
326
.format(error))
370
327
def cleanup(self):
371
328
"""Derived from the Avahi example code"""
372
329
if self.group is not None:
377
334
pass
378
335
self.group = None
379
336
self.remove()
380
381
337
def server_state_changed(self, state, error=None):
382
338
"""Derived from the Avahi example code"""
383
339
logger.debug("Avahi server state change: %i", state)
384
bad_states = {
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
389
}
340
bad_states = { avahi.SERVER_INVALID:
341
"Zeroconf server invalid",
342
avahi.SERVER_REGISTERING: None,
343
avahi.SERVER_COLLISION:
344
"Zeroconf server name collision",
345
avahi.SERVER_FAILURE:
346
"Zeroconf server failure" }
390
347
if state in bad_states:
391
348
if bad_states[state] is not None:
392
349
if error is None:
401
358
logger.debug("Unknown state: %r", state)
402
359
else:
403
360
logger.debug("Unknown state: %r: %r", state, error)
404
405
361
def activate(self):
406
362
"""Derived from the Avahi example code"""
407
363
if self.server is None:
411
367
follow_name_owner_changes=True),
412
368
avahi.DBUS_INTERFACE_SERVER)
413
369
self.server.connect_to_signal("StateChanged",
414
self.server_state_changed)
370
self.server_state_changed)
415
371
self.server_state_changed(self.server.GetState())
416
372
417
418
373
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
374
def rename(self):
420
375
"""Add the new name to the syslog messages"""
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
424
.format(self.name)))
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
380
.format(self.name)))
425
381
return ret
426
382
427
def call_pipe(connection, # : multiprocessing.Connection
428
func, *args, **kwargs):
429
"""This function is meant to be called by multiprocessing.Process
430
431
This function runs func(*args, **kwargs), and writes the resulting
432
return value on the provided multiprocessing.Connection.
433
"""
434
connection.send(func(*args, **kwargs))
435
connection.close()
436
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
388
437
389
class Client(object):
438
390
"""A representation of a client host served by this server.
439
391
465
417
last_checker_status: integer between 0 and 255 reflecting exit
466
418
status of last checker. -1 reflects crashed
467
419
checker, -2 means no checker completed yet.
468
last_checker_signal: The signal which killed the last checker, if
469
last_checker_status is -1
470
420
last_enabled: datetime.datetime(); (UTC) or None
471
421
name: string; from the config file, used in log messages and
472
422
D-Bus identifiers
477
427
runtime_expansions: Allowed attributes for runtime expansion.
478
428
expires: datetime.datetime(); time (UTC) when a client will be
479
429
disabled, or None
480
server_settings: The server_settings dict from main()
481
430
"""
482
431
483
432
runtime_expansions = ("approval_delay", "approval_duration",
484
"created", "enabled", "expires",
485
"fingerprint", "host", "interval",
486
"last_approval_request", "last_checked_ok",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
487
435
"last_enabled", "name", "timeout")
488
client_defaults = {
489
"timeout": "PT5M",
490
"extended_timeout": "PT15M",
491
"interval": "PT2M",
492
"checker": "fping -q -- %%(host)s",
493
"host": "",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
497
"enabled": "True",
498
}
499
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
438
"interval": "2m",
439
"checker": "fping -q -- %%(host)s",
440
"host": "",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
444
"enabled": "True",
445
}
446
447
def timeout_milliseconds(self):
448
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
450
451
def extended_timeout_milliseconds(self):
452
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
454
455
def interval_milliseconds(self):
456
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
458
459
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
461
500
462
@staticmethod
501
463
def config_parser(config):
502
464
"""Construct a new dict of client settings of this form:
517
479
client["enabled"] = config.getboolean(client_name,
518
480
"enabled")
519
481
520
# Uppercase and remove spaces from fingerprint for later
521
# comparison purposes with return value from the
522
# fingerprint() function
523
482
client["fingerprint"] = (section["fingerprint"].upper()
524
483
.replace(" ", ""))
525
484
if "secret" in section:
530
489
"rb") as secfile:
531
490
client["secret"] = secfile.read()
532
491
else:
533
raise TypeError("No secret or secfile for section {}"
492
raise TypeError("No secret or secfile for section {0}"
534
493
.format(section))
535
494
client["timeout"] = string_to_delta(section["timeout"])
536
495
client["extended_timeout"] = string_to_delta(
546
505
client["last_checker_status"] = -2
547
506
548
507
return settings
549
550
def __init__(self, settings, name = None, server_settings=None):
508
509
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
513
attribute."""
551
514
self.name = name
552
if server_settings is None:
553
server_settings = {}
554
self.server_settings = server_settings
555
515
# adding all client settings
556
for setting, value in settings.items():
516
for setting, value in settings.iteritems():
557
517
setattr(self, setting, value)
558
518
559
519
if self.enabled:
565
525
else:
566
526
self.last_enabled = None
567
527
self.expires = None
568
528
569
529
logger.debug("Creating client %r", self.name)
530
# Uppercase and remove spaces from fingerprint for later
531
# comparison purposes with return value from the fingerprint()
532
# function
570
533
logger.debug(" Fingerprint: %s", self.fingerprint)
571
534
self.created = settings.get("created",
572
535
datetime.datetime.utcnow())
573
536
574
537
# attributes specific for this server instance
575
538
self.checker = None
576
539
self.checker_initiator_tag = None
579
542
self.current_checker_command = None
580
543
self.approved = None
581
544
self.approvals_pending = 0
582
self.changedstate = multiprocessing_manager.Condition(
583
multiprocessing_manager.Lock())
584
self.client_structure = [attr
585
for attr in self.__dict__.iterkeys()
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
547
.Lock()))
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
586
550
if not attr.startswith("_")]
587
551
self.client_structure.append("client_structure")
588
552
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
553
for name, t in inspect.getmembers(type(self),
554
lambda obj:
555
isinstance(obj,
556
property)):
591
557
if not name.startswith("_"):
592
558
self.client_structure.append(name)
593
559
601
567
if getattr(self, "enabled", False):
602
568
# Already enabled
603
569
return
570
self.send_changedstate()
604
571
self.expires = datetime.datetime.utcnow() + self.timeout
605
572
self.enabled = True
606
573
self.last_enabled = datetime.datetime.utcnow()
607
574
self.init_checker()
608
self.send_changedstate()
609
575
610
576
def disable(self, quiet=True):
611
577
"""Disable this client."""
612
578
if not getattr(self, "enabled", False):
613
579
return False
614
580
if not quiet:
581
self.send_changedstate()
582
if not quiet:
615
583
logger.info("Disabling client %s", self.name)
616
if getattr(self, "disable_initiator_tag", None) is not None:
584
if getattr(self, "disable_initiator_tag", False):
617
585
gobject.source_remove(self.disable_initiator_tag)
618
586
self.disable_initiator_tag = None
619
587
self.expires = None
620
if getattr(self, "checker_initiator_tag", None) is not None:
588
if getattr(self, "checker_initiator_tag", False):
621
589
gobject.source_remove(self.checker_initiator_tag)
622
590
self.checker_initiator_tag = None
623
591
self.stop_checker()
624
592
self.enabled = False
625
if not quiet:
626
self.send_changedstate()
627
593
# Do not run this again if called by a gobject.timeout_add
628
594
return False
629
595
633
599
def init_checker(self):
634
600
# Schedule a new checker to be started an 'interval' from now,
635
601
# and every interval from then on.
636
if self.checker_initiator_tag is not None:
637
gobject.source_remove(self.checker_initiator_tag)
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
640
self.start_checker)
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
604
self.start_checker))
641
605
# Schedule a disable() when 'timeout' has passed
642
if self.disable_initiator_tag is not None:
643
gobject.source_remove(self.disable_initiator_tag)
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
608
self.disable))
646
609
# Also start a new checker *right now*.
647
610
self.start_checker()
648
611
649
def checker_callback(self, source, condition, connection,
650
command):
612
def checker_callback(self, pid, condition, command):
651
613
"""The checker has completed, so take appropriate actions."""
652
614
self.checker_callback_tag = None
653
615
self.checker = None
654
# Read return code from connection (see call_pipe)
655
returncode = connection.recv()
656
connection.close()
657
658
if returncode >= 0:
659
self.last_checker_status = returncode
660
self.last_checker_signal = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
661
618
if self.last_checker_status == 0:
662
619
logger.info("Checker for %(name)s succeeded",
663
620
vars(self))
664
621
self.checked_ok()
665
622
else:
666
logger.info("Checker for %(name)s failed", vars(self))
623
logger.info("Checker for %(name)s failed",
624
vars(self))
667
625
else:
668
626
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
670
627
logger.warning("Checker for %(name)s crashed?",
671
628
vars(self))
672
return False
673
629
674
630
def checked_ok(self):
675
631
"""Assert that the client has been seen, alive and well."""
676
632
self.last_checked_ok = datetime.datetime.utcnow()
677
633
self.last_checker_status = 0
678
self.last_checker_signal = None
679
634
self.bump_timeout()
680
635
681
636
def bump_timeout(self, timeout=None):
684
639
timeout = self.timeout
685
640
if self.disable_initiator_tag is not None:
686
641
gobject.source_remove(self.disable_initiator_tag)
687
self.disable_initiator_tag = None
688
642
if getattr(self, "enabled", False):
689
self.disable_initiator_tag = gobject.timeout_add(
690
int(timeout.total_seconds() * 1000), self.disable)
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
691
646
self.expires = datetime.datetime.utcnow() + timeout
692
647
693
648
def need_approval(self):
699
654
If a checker already exists, leave it running and do
700
655
nothing."""
701
656
# The reason for not killing a running checker is that if we
702
# did that, and if a checker (for some reason) started running
703
# slowly and taking more than 'interval' time, then the client
704
# would inevitably timeout, since no checker would get a
705
# chance to run to completion. If we instead leave running
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
706
661
# checkers alone, the checker would have to take more time
707
662
# than 'timeout' for the client to be disabled, which is as it
708
663
# should be.
709
664
710
if self.checker is not None and not self.checker.is_alive():
711
logger.warning("Checker was not alive; joining")
712
self.checker.join()
713
self.checker = None
665
# If a checker exists, make sure it is not a zombie
666
try:
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
671
raise error
672
else:
673
if pid:
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
714
678
# Start a new checker if needed
715
679
if self.checker is None:
716
# Escape attributes for the shell
717
escaped_attrs = {
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
720
try:
721
command = self.checker_command % escaped_attrs
722
except TypeError as error:
723
logger.error('Could not format string "%s"',
724
self.checker_command,
680
try:
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
683
except TypeError:
684
# Escape attributes for the shell
685
escaped_attrs = dict(
686
(attr,
687
re.escape(unicode(str(getattr(self, attr, "")),
688
errors=
689
'replace')))
690
for attr in
691
self.runtime_expansions)
692
693
try:
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
699
self.current_checker_command = command
700
try:
701
logger.info("Starting checker %r for %s",
702
command, self.name)
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
708
close_fds=True,
709
shell=True, cwd="/")
710
self.checker_callback_tag = (gobject.child_watch_add
711
(self.checker.pid,
712
self.checker_callback,
713
data=command))
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
if pid:
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess",
725
722
exc_info=error)
726
return True # Try again later
727
self.current_checker_command = command
728
logger.info("Starting checker %r for %s", command,
729
self.name)
730
# We don't need to redirect stdout and stderr, since
731
# in normal mode, that is already done by daemon(),
732
# and in debug mode we don't want to. (Stdin is
733
# always replaced by /dev/null.)
734
# The exception is when not debugging but nevertheless
735
# running in the foreground; use the previously
736
# created wnull.
737
popen_args = { "close_fds": True,
738
"shell": True,
739
"cwd": "/" }
740
if (not self.server_settings["debug"]
741
and self.server_settings["foreground"]):
742
popen_args.update({"stdout": wnull,
743
"stderr": wnull })
744
pipe = multiprocessing.Pipe(duplex = False)
745
self.checker = multiprocessing.Process(
746
target = call_pipe,
747
args = (pipe[1], subprocess.call, command),
748
kwargs = popen_args)
749
self.checker.start()
750
self.checker_callback_tag = gobject.io_add_watch(
751
pipe[0].fileno(), gobject.IO_IN,
752
self.checker_callback, pipe[0], command)
753
723
# Re-run this periodically if run by gobject.timeout_add
754
724
return True
755
725
761
731
if getattr(self, "checker", None) is None:
762
732
return
763
733
logger.debug("Stopping checker for %(name)s", vars(self))
764
self.checker.terminate()
734
try:
735
self.checker.terminate()
736
#time.sleep(0.5)
737
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
741
raise
765
742
self.checker = None
766
743
767
744
768
def dbus_service_property(dbus_interface,
769
signature="v",
770
access="readwrite",
771
byte_arrays=False):
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
772
747
"""Decorators for marking methods of a DBusObjectWithProperties to
773
748
become properties on the D-Bus.
774
749
783
758
# "Set" method, so we fail early here:
784
759
if byte_arrays and signature != "ay":
785
760
raise ValueError("Byte arrays not supported for non-'ay'"
786
" signature {!r}".format(signature))
787
761
" signature {0!r}".format(signature))
788
762
def decorator(func):
789
763
func._dbus_is_property = True
790
764
func._dbus_interface = dbus_interface
795
769
func._dbus_name = func._dbus_name[:-14]
796
770
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
797
771
return func
798
799
772
return decorator
800
773
801
774
802
775
def dbus_interface_annotations(dbus_interface):
803
"""Decorator for marking functions returning interface annotations
776
"""Decorator for marking functions returning interface annotations.
804
777
805
778
Usage:
806
779
810
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
811
784
"false"}
812
785
"""
813
814
786
def decorator(func):
815
787
func._dbus_is_interface = True
816
788
func._dbus_interface = dbus_interface
817
789
func._dbus_name = dbus_interface
818
790
return func
819
820
791
return decorator
821
792
822
793
824
795
"""Decorator to annotate D-Bus methods, signals or properties
825
796
Usage:
826
797
827
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
"org.freedesktop.DBus.Property."
829
"EmitsChangedSignal": "false"})
830
798
@dbus_service_property("org.example.Interface", signature="b",
831
799
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
832
803
def Property_dbus_property(self):
833
804
return dbus.Boolean(False)
834
805
"""
835
836
806
def decorator(func):
837
807
func._dbus_annotations = annotations
838
808
return func
839
840
809
return decorator
841
810
842
811
843
812
class DBusPropertyException(dbus.exceptions.DBusException):
844
813
"""A base class for D-Bus property-related exceptions
845
814
"""
846
pass
815
def __unicode__(self):
816
return unicode(str(self))
847
817
848
818
849
819
class DBusPropertyAccessException(DBusPropertyException):
873
843
If called like _is_dbus_thing("method") it returns a function
874
844
suitable for use as predicate to inspect.getmembers().
875
845
"""
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
877
847
False)
878
848
879
849
def _get_all_dbus_things(self, thing):
880
850
"""Returns a generator of (name, attribute) pairs
881
851
"""
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
883
854
athing.__get__(self))
884
855
for cls in self.__class__.__mro__
885
856
for name, athing in
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
887
859
888
860
def _get_dbus_property(self, interface_name, property_name):
889
861
"""Returns a bound method if one exists which is a D-Bus
890
862
property with the specified name and interface.
891
863
"""
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
cls, self._is_dbus_thing("property")):
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
895
868
if (value._dbus_name == property_name
896
869
and value._dbus_interface == interface_name):
897
870
return value.__get__(self)
898
871
899
872
# No such property
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
875
+ property_name)
902
876
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
904
in_signature="ss",
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
878
out_signature="v")
906
879
def Get(self, interface_name, property_name):
907
880
"""Standard D-Bus property Get() method, see D-Bus standard.
925
898
# The byte_arrays option is not supported yet on
926
899
# signatures other than "ay".
927
900
if prop._dbus_signature != "ay":
928
raise ValueError("Byte arrays not supported for non-"
929
"'ay' signature {!r}"
930
.format(prop._dbus_signature))
901
raise ValueError
931
902
value = dbus.ByteArray(b''.join(chr(byte)
932
903
for byte in value))
933
904
prop(value)
934
905
935
@dbus.service.method(dbus.PROPERTIES_IFACE,
936
in_signature="s",
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
937
907
out_signature="a{sv}")
938
908
def GetAll(self, interface_name):
939
909
"""Standard D-Bus property GetAll() method, see D-Bus
954
924
if not hasattr(value, "variant_level"):
955
925
properties[name] = value
956
926
continue
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
959
929
return dbus.Dictionary(properties, signature="sv")
960
930
961
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
def PropertiesChanged(self, interface_name, changed_properties,
963
invalidated_properties):
964
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
965
standard.
966
"""
967
pass
968
969
931
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
932
out_signature="s",
971
933
path_keyword='object_path',
979
941
connection)
980
942
try:
981
943
document = xml.dom.minidom.parseString(xmlstring)
982
983
944
def make_tag(document, name, prop):
984
945
e = document.createElement("property")
985
946
e.setAttribute("name", name)
986
947
e.setAttribute("type", prop._dbus_signature)
987
948
e.setAttribute("access", prop._dbus_access)
988
949
return e
989
990
950
for if_tag in document.getElementsByTagName("interface"):
991
951
# Add property tags
992
952
for tag in (make_tag(document, name, prop)
1004
964
if (name == tag.getAttribute("name")
1005
965
and prop._dbus_interface
1006
966
== if_tag.getAttribute("name")):
1007
annots.update(getattr(
1008
prop, "_dbus_annotations", {}))
1009
for name, value in annots.items():
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
1010
972
ann_tag = document.createElement(
1011
973
"annotation")
1012
974
ann_tag.setAttribute("name", name)
1014
976
tag.appendChild(ann_tag)
1015
977
# Add interface annotation tags
1016
978
for annotation, value in dict(
1017
itertools.chain.from_iterable(
1018
annotations().items()
1019
for name, annotations
1020
in self._get_all_dbus_things("interface")
1021
if name == if_tag.getAttribute("name")
1022
)).items():
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
1023
985
ann_tag = document.createElement("annotation")
1024
986
ann_tag.setAttribute("name", annotation)
1025
987
ann_tag.setAttribute("value", value)
1048
1010
return xmlstring
1049
1011
1050
1012
1051
def datetime_to_dbus(dt, variant_level=0):
1013
def datetime_to_dbus (dt, variant_level=0):
1052
1014
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1015
if dt is None:
1054
1016
return dbus.String("", variant_level = variant_level)
1055
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1057
1058
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1059
"""A class decorator; applied to a subclass of
1060
dbus.service.Object, it will add alternate D-Bus attributes with
1061
interface names according to the "alt_interface_names" mapping.
1062
Usage:
1063
1064
@alternate_dbus_interfaces({"org.example.Interface":
1065
"net.example.AlternateInterface"})
1066
class SampleDBusObject(dbus.service.Object):
1067
@dbus.service.method("org.example.Interface")
1068
def SampleDBusMethod():
1069
pass
1070
1071
The above "SampleDBusMethod" on "SampleDBusObject" will be
1072
reachable via two interfaces: "org.example.Interface" and
1073
"net.example.AlternateInterface", the latter of which will have
1074
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1075
"true", unless "deprecate" is passed with a False value.
1076
1077
This works for methods and signals, and also for D-Bus properties
1078
(from DBusObjectWithProperties) and interfaces (from the
1079
dbus_interface_annotations decorator).
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1019
1020
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
.__metaclass__):
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1080
1025
"""
1081
1082
def wrapper(cls):
1083
for orig_interface_name, alt_interface_name in (
1084
alt_interface_names.items()):
1085
attr = {}
1086
interface_names = set()
1087
# Go though all attributes of the class
1088
for attrname, attribute in inspect.getmembers(cls):
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1089
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
1035
# with the wrong interface name
1091
1036
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1094
1039
continue
1095
1040
# Create an alternate D-Bus interface name based on
1096
1041
# the current name
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1099
interface_names.add(alt_interface)
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1100
1047
# Is this a D-Bus signal?
1101
1048
if getattr(attribute, "_dbus_is_signal", False):
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1049
# Extract the original non-method function by
1050
# black magic
1051
nonmethod_func = (dict(
1106
1052
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))
1108
["func"].cell_contents)
1109
else:
1110
nonmethod_func = attribute
1053
attribute.__closure__))["func"]
1054
.cell_contents)
1111
1055
# Create a new, but exactly alike, function
1112
1056
# object, and decorate it to be a new D-Bus signal
1113
1057
# with the alternate D-Bus interface name
1114
if sys.version_info.major == 2:
1115
new_function = types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)
1121
else:
1122
new_function = types.FunctionType(
1123
nonmethod_func.__code__,
1124
nonmethod_func.__globals__,
1125
nonmethod_func.__name__,
1126
nonmethod_func.__defaults__,
1127
nonmethod_func.__closure__)
1128
new_function = (dbus.service.signal(
1129
alt_interface,
1130
attribute._dbus_signature)(new_function))
1058
new_function = (dbus.service.signal
1059
(alt_interface,
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1131
1067
# Copy annotations, if any
1132
1068
try:
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1135
1071
except AttributeError:
1136
1072
pass
1137
1073
# Define a creator of a function to call both the
1138
# original and alternate functions, so both the
1139
# original and alternate signals gets sent when
1140
# the function is called
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1141
1076
def fixscope(func1, func2):
1142
1077
"""This function is a scope container to pass
1143
1078
func1 and func2 to the "call_both" function
1144
1079
outside of its arguments"""
1145
1146
1080
def call_both(*args, **kwargs):
1147
1081
"""This function will emit two D-Bus
1148
1082
signals by calling func1 and func2"""
1149
1083
func1(*args, **kwargs)
1150
1084
func2(*args, **kwargs)
1151
1152
1085
return call_both
1153
1086
# Create the "call_both" function and add it to
1154
1087
# the class
1155
attr[attrname] = fixscope(attribute, new_function)
1088
attr[attrname] = fixscope(attribute,
1089
new_function)
1156
1090
# Is this a D-Bus method?
1157
1091
elif getattr(attribute, "_dbus_is_method", False):
1158
1092
# Create a new, but exactly alike, function
1159
1093
# object. Decorate it to be a new D-Bus method
1160
1094
# with the alternate D-Bus interface name. Add it
1161
1095
# to the class.
1162
attr[attrname] = (
1163
dbus.service.method(
1164
alt_interface,
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1096
attr[attrname] = (dbus.service.method
1097
(alt_interface,
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1100
(types.FunctionType
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1172
1106
# Copy annotations, if any
1173
1107
try:
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1176
1110
except AttributeError:
1177
1111
pass
1178
1112
# Is this a D-Bus property?
1181
1115
# object, and decorate it to be a new D-Bus
1182
1116
# property with the alternate D-Bus interface
1183
1117
# name. Add it to the class.
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1188
["byte_arrays"])
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1118
attr[attrname] = (dbus_service_property
1119
(alt_interface,
1120
attribute._dbus_signature,
1121
attribute._dbus_access,
1122
attribute
1123
._dbus_get_args_options
1124
["byte_arrays"])
1125
(types.FunctionType
1126
(attribute.func_code,
1127
attribute.func_globals,
1128
attribute.func_name,
1129
attribute.func_defaults,
1130
attribute.func_closure)))
1195
1131
# Copy annotations, if any
1196
1132
try:
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1199
1135
except AttributeError:
1200
1136
pass
1201
1137
# Is this a D-Bus interface?
1204
1140
# object. Decorate it to be a new D-Bus interface
1205
1141
# with the alternate D-Bus interface name. Add it
1206
1142
# to the class.
1207
attr[attrname] = (
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1214
if deprecate:
1215
# Deprecate all alternate interfaces
1216
iname="_AlternateDBusNames_interface_annotation{}"
1217
for interface_name in interface_names:
1218
1219
@dbus_interface_annotations(interface_name)
1220
def func(self):
1221
return { "org.freedesktop.DBus.Deprecated":
1222
"true" }
1223
# Find an unused name
1224
for aname in (iname.format(i)
1225
for i in itertools.count()):
1226
if aname not in attr:
1227
attr[aname] = func
1228
break
1229
if interface_names:
1230
# Replace the class with a new subclass of it with
1231
# methods, signals, etc. as created above.
1232
cls = type(b"{}Alternate".format(cls.__name__),
1233
(cls, ), attr)
1234
return cls
1235
1236
return wrapper
1237
1238
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
"se.bsnet.fukt.Mandos"})
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
return type.__new__(mcs, name, bases, attr)
1164
1165
1241
1166
class ClientDBus(Client, DBusObjectWithProperties):
1242
1167
"""A Client class using D-Bus
1243
1168
1247
1172
"""
1248
1173
1249
1174
runtime_expansions = (Client.runtime_expansions
1250
+ ("dbus_object_path", ))
1251
1252
_interface = "se.recompile.Mandos.Client"
1175
+ ("dbus_object_path",))
1253
1176
1254
1177
# dbus.service.Object doesn't use super(), so we can't either.
1255
1178
1258
1181
Client.__init__(self, *args, **kwargs)
1259
1182
# Only now, when this client is initialized, can it show up on
1260
1183
# the D-Bus
1261
client_object_name = str(self.name).translate(
1184
client_object_name = unicode(self.name).translate(
1262
1185
{ord("."): ord("_"),
1263
1186
ord("-"): ord("_")})
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1266
1189
DBusObjectWithProperties.__init__(self, self.bus,
1267
1190
self.dbus_object_path)
1268
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1271
variant_level=1,
1272
invalidate_only=False,
1273
_interface=_interface):
1191
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1194
variant_level=1):
1274
1195
""" Modify a variable so that it's a property which announces
1275
1196
its changes to DBus.
1276
1197
1281
1202
to the D-Bus. Default: no transform
1282
1203
variant_level: D-Bus variant level. Default: 1
1283
1204
"""
1284
attrname = "_{}".format(dbus_name)
1285
1205
attrname = "_{0}".format(dbus_name)
1286
1206
def setter(self, value):
1287
1207
if hasattr(self, "dbus_object_path"):
1288
1208
if (not hasattr(self, attrname) or
1289
1209
type_func(getattr(self, attrname, None))
1290
1210
!= type_func(value)):
1291
if invalidate_only:
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1295
else:
1296
dbus_value = transform_func(
1297
type_func(value),
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1300
dbus_value)
1301
self.PropertiesChanged(
1302
_interface,
1303
dbus.Dictionary({ dbus.String(dbus_name):
1304
dbus_value }),
1305
dbus.Array())
1211
dbus_value = transform_func(type_func(value),
1212
variant_level
1213
=variant_level)
1214
self.PropertyChanged(dbus.String(dbus_name),
1215
dbus_value)
1306
1216
setattr(self, attrname, value)
1307
1217
1308
1218
return property(lambda self: getattr(self, attrname), setter)
1309
1219
1220
1310
1221
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1311
1222
approvals_pending = notifychangeproperty(dbus.Boolean,
1312
1223
"ApprovalPending",
1314
1225
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1226
last_enabled = notifychangeproperty(datetime_to_dbus,
1316
1227
"LastEnabled")
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1228
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
type_func = lambda checker:
1230
checker is not None)
1320
1231
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1232
"LastCheckedOK")
1322
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1325
1236
datetime_to_dbus, "LastApprovalRequest")
1326
1237
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1238
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1240
"ApprovalDelay",
1241
type_func =
1242
timedelta_to_milliseconds)
1331
1243
approval_duration = notifychangeproperty(
1332
1244
dbus.UInt64, "ApprovalDuration",
1333
type_func = lambda td: td.total_seconds() * 1000)
1245
type_func = timedelta_to_milliseconds)
1334
1246
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
type_func =
1249
timedelta_to_milliseconds)
1338
1250
extended_timeout = notifychangeproperty(
1339
1251
dbus.UInt64, "ExtendedTimeout",
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1254
"Interval",
1255
type_func =
1256
timedelta_to_milliseconds)
1344
1257
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1347
1258
1348
1259
del notifychangeproperty
1349
1260
1356
1267
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1268
Client.__del__(self, *args, **kwargs)
1358
1269
1359
def checker_callback(self, source, condition,
1360
connection, command, *args, **kwargs):
1361
ret = Client.checker_callback(self, source, condition,
1362
connection, command, *args,
1363
**kwargs)
1364
exitstatus = self.last_checker_status
1365
if exitstatus >= 0:
1270
def checker_callback(self, pid, condition, command,
1271
*args, **kwargs):
1272
self.checker_callback_tag = None
1273
self.checker = None
1274
if os.WIFEXITED(condition):
1275
exitstatus = os.WEXITSTATUS(condition)
1366
1276
# Emit D-Bus signal
1367
1277
self.CheckerCompleted(dbus.Int16(exitstatus),
1368
dbus.Int64(0),
1278
dbus.Int64(condition),
1369
1279
dbus.String(command))
1370
1280
else:
1371
1281
# Emit D-Bus signal
1372
1282
self.CheckerCompleted(dbus.Int16(-1),
1373
dbus.Int64(
1374
self.last_checker_signal),
1283
dbus.Int64(condition),
1375
1284
dbus.String(command))
1376
return ret
1285
1286
return Client.checker_callback(self, pid, condition, command,
1287
*args, **kwargs)
1377
1288
1378
1289
def start_checker(self, *args, **kwargs):
1379
old_checker_pid = getattr(self.checker, "pid", None)
1290
old_checker = self.checker
1291
if self.checker is not None:
1292
old_checker_pid = self.checker.pid
1293
else:
1294
old_checker_pid = None
1380
1295
r = Client.start_checker(self, *args, **kwargs)
1381
1296
# Only if new checker process was started
1382
1297
if (self.checker is not None
1390
1305
return False
1391
1306
1392
1307
def approve(self, value=True):
1308
self.send_changedstate()
1393
1309
self.approved = value
1394
gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
* 1000), self._reset_approved)
1396
self.send_changedstate()
1310
gobject.timeout_add(timedelta_to_milliseconds
1311
(self.approval_duration),
1312
self._reset_approved)
1313
1397
1314
1398
1315
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1399
1317
1400
1318
## Interfaces
1401
1319
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
1324
1402
1325
## Signals
1403
1326
1404
1327
# CheckerCompleted - signal
1414
1337
pass
1415
1338
1416
1339
# PropertyChanged - signal
1417
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1418
1340
@dbus.service.signal(_interface, signature="sv")
1419
1341
def PropertyChanged(self, property, value):
1420
1342
"D-Bus signal"
1484
1406
return dbus.Boolean(bool(self.approvals_pending))
1485
1407
1486
1408
# ApprovedByDefault - property
1487
@dbus_service_property(_interface,
1488
signature="b",
1409
@dbus_service_property(_interface, signature="b",
1489
1410
access="readwrite")
1490
1411
def ApprovedByDefault_dbus_property(self, value=None):
1491
1412
if value is None: # get
1493
1414
self.approved_by_default = bool(value)
1494
1415
1495
1416
# ApprovalDelay - property
1496
@dbus_service_property(_interface,
1497
signature="t",
1417
@dbus_service_property(_interface, signature="t",
1498
1418
access="readwrite")
1499
1419
def ApprovalDelay_dbus_property(self, value=None):
1500
1420
if value is None: # get
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1502
* 1000)
1421
return dbus.UInt64(self.approval_delay_milliseconds())
1503
1422
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1504
1423
1505
1424
# ApprovalDuration - property
1506
@dbus_service_property(_interface,
1507
signature="t",
1425
@dbus_service_property(_interface, signature="t",
1508
1426
access="readwrite")
1509
1427
def ApprovalDuration_dbus_property(self, value=None):
1510
1428
if value is None: # get
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1512
* 1000)
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
1513
1431
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1514
1432
1515
1433
# Name - property
1523
1441
return dbus.String(self.fingerprint)
1524
1442
1525
1443
# Host - property
1526
@dbus_service_property(_interface,
1527
signature="s",
1444
@dbus_service_property(_interface, signature="s",
1528
1445
access="readwrite")
1529
1446
def Host_dbus_property(self, value=None):
1530
1447
if value is None: # get
1531
1448
return dbus.String(self.host)
1532
self.host = str(value)
1449
self.host = unicode(value)
1533
1450
1534
1451
# Created - property
1535
1452
@dbus_service_property(_interface, signature="s", access="read")
1542
1459
return datetime_to_dbus(self.last_enabled)
1543
1460
1544
1461
# Enabled - property
1545
@dbus_service_property(_interface,
1546
signature="b",
1462
@dbus_service_property(_interface, signature="b",
1547
1463
access="readwrite")
1548
1464
def Enabled_dbus_property(self, value=None):
1549
1465
if value is None: # get
1554
1470
self.disable()
1555
1471
1556
1472
# LastCheckedOK - property
1557
@dbus_service_property(_interface,
1558
signature="s",
1473
@dbus_service_property(_interface, signature="s",
1559
1474
access="readwrite")
1560
1475
def LastCheckedOK_dbus_property(self, value=None):
1561
1476
if value is not None:
1564
1479
return datetime_to_dbus(self.last_checked_ok)
1565
1480
1566
1481
# LastCheckerStatus - property
1567
@dbus_service_property(_interface, signature="n", access="read")
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1568
1484
def LastCheckerStatus_dbus_property(self):
1569
1485
return dbus.Int16(self.last_checker_status)
1570
1486
1579
1495
return datetime_to_dbus(self.last_approval_request)
1580
1496
1581
1497
# Timeout - property
1582
@dbus_service_property(_interface,
1583
signature="t",
1498
@dbus_service_property(_interface, signature="t",
1584
1499
access="readwrite")
1585
1500
def Timeout_dbus_property(self, value=None):
1586
1501
if value is None: # get
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1588
old_timeout = self.timeout
1502
return dbus.UInt64(self.timeout_milliseconds())
1589
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
1590
# Reschedule disabling
1504
# Reschedule timeout
1591
1505
if self.enabled:
1592
1506
now = datetime.datetime.utcnow()
1593
self.expires += self.timeout - old_timeout
1594
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1595
1510
# The timeout has passed
1596
1511
self.disable()
1597
1512
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1598
1516
if (getattr(self, "disable_initiator_tag", None)
1599
1517
is None):
1600
1518
return
1601
1519
gobject.source_remove(self.disable_initiator_tag)
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1604
self.disable)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1605
1523
1606
1524
# ExtendedTimeout - property
1607
@dbus_service_property(_interface,
1608
signature="t",
1525
@dbus_service_property(_interface, signature="t",
1609
1526
access="readwrite")
1610
1527
def ExtendedTimeout_dbus_property(self, value=None):
1611
1528
if value is None: # get
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1613
* 1000)
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1615
1531
1616
1532
# Interval - property
1617
@dbus_service_property(_interface,
1618
signature="t",
1533
@dbus_service_property(_interface, signature="t",
1619
1534
access="readwrite")
1620
1535
def Interval_dbus_property(self, value=None):
1621
1536
if value is None: # get
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1537
return dbus.UInt64(self.interval_milliseconds())
1623
1538
self.interval = datetime.timedelta(0, 0, 0, value)
1624
1539
if getattr(self, "checker_initiator_tag", None) is None:
1625
1540
return
1626
1541
if self.enabled:
1627
1542
# Reschedule checker run
1628
1543
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1632
1547
1633
1548
# Checker - property
1634
@dbus_service_property(_interface,
1635
signature="s",
1549
@dbus_service_property(_interface, signature="s",
1636
1550
access="readwrite")
1637
1551
def Checker_dbus_property(self, value=None):
1638
1552
if value is None: # get
1639
1553
return dbus.String(self.checker_command)
1640
self.checker_command = str(value)
1554
self.checker_command = unicode(value)
1641
1555
1642
1556
# CheckerRunning - property
1643
@dbus_service_property(_interface,
1644
signature="b",
1557
@dbus_service_property(_interface, signature="b",
1645
1558
access="readwrite")
1646
1559
def CheckerRunning_dbus_property(self, value=None):
1647
1560
if value is None: # get
1657
1570
return self.dbus_object_path # is already a dbus.ObjectPath
1658
1571
1659
1572
# Secret = property
1660
@dbus_service_property(_interface,
1661
signature="ay",
1662
access="write",
1663
byte_arrays=True)
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
1664
1575
def Secret_dbus_property(self, value):
1665
self.secret = bytes(value)
1576
self.secret = str(value)
1666
1577
1667
1578
del _interface
1668
1579
1672
1583
self._pipe = child_pipe
1673
1584
self._pipe.send(('init', fpr, address))
1674
1585
if not self._pipe.recv():
1675
raise KeyError(fpr)
1586
raise KeyError()
1676
1587
1677
1588
def __getattribute__(self, name):
1678
1589
if name == '_pipe':
1682
1593
if data[0] == 'data':
1683
1594
return data[1]
1684
1595
if data[0] == 'function':
1685
1686
1596
def func(*args, **kwargs):
1687
1597
self._pipe.send(('funcall', name, args, kwargs))
1688
1598
return self._pipe.recv()[1]
1689
1690
1599
return func
1691
1600
1692
1601
def __setattr__(self, name, value):
1695
1604
self._pipe.send(('setattr', name, value))
1696
1605
1697
1606
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1698
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
1699
1612
"""A class to handle client connections.
1700
1613
1704
1617
def handle(self):
1705
1618
with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
1619
logger.info("TCP connection from: %s",
1707
str(self.client_address))
1620
unicode(self.client_address))
1708
1621
logger.debug("Pipe FD: %d",
1709
1622
self.server.child_pipe.fileno())
1710
1623
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1626
gnutls.connection
1627
.X509Credentials()))
1713
1628
1714
1629
# Note: gnutls.connection.X509Credentials is really a
1715
1630
# generic GnuTLS certificate credentials object so long as
1724
1639
priority = self.server.gnutls_priority
1725
1640
if priority is None:
1726
1641
priority = "NORMAL"
1727
gnutls.library.functions.gnutls_priority_set_direct(
1728
session._c_object, priority, None)
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
1644
priority, None))
1729
1645
1730
1646
# Start communication using the Mandos protocol
1731
1647
# Get protocol number
1733
1649
logger.debug("Protocol version: %r", line)
1734
1650
try:
1735
1651
if int(line.strip().split()[0]) > 1:
1736
raise RuntimeError(line)
1652
raise RuntimeError
1737
1653
except (ValueError, IndexError, RuntimeError) as error:
1738
1654
logger.error("Unknown protocol version: %s", error)
1739
1655
return
1751
1667
approval_required = False
1752
1668
try:
1753
1669
try:
1754
fpr = self.fingerprint(
1755
self.peer_certificate(session))
1670
fpr = self.fingerprint(self.peer_certificate
1671
(session))
1756
1672
except (TypeError,
1757
1673
gnutls.errors.GNUTLSError) as error:
1758
1674
logger.warning("Bad certificate: %s", error)
1773
1689
while True:
1774
1690
if not client.enabled:
1775
1691
logger.info("Client %s is disabled",
1776
client.name)
1692
client.name)
1777
1693
if self.server.use_dbus:
1778
1694
# Emit D-Bus signal
1779
1695
client.Rejected("Disabled")
1788
1704
if self.server.use_dbus:
1789
1705
# Emit D-Bus signal
1790
1706
client.NeedApproval(
1791
client.approval_delay.total_seconds()
1792
* 1000, client.approved_by_default)
1707
client.approval_delay_milliseconds(),
1708
client.approved_by_default)
1793
1709
else:
1794
1710
logger.warning("Client %s was not approved",
1795
1711
client.name)
1801
1717
#wait until timeout or approved
1802
1718
time = datetime.datetime.now()
1803
1719
client.changedstate.acquire()
1804
client.changedstate.wait(delay.total_seconds())
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1805
1723
client.changedstate.release()
1806
1724
time2 = datetime.datetime.now()
1807
1725
if (time2 - time) >= delay:
1823
1741
try:
1824
1742
sent = session.send(client.secret[sent_size:])
1825
1743
except gnutls.errors.GNUTLSError as error:
1826
logger.warning("gnutls send failed",
1827
exc_info=error)
1744
logger.warning("gnutls send failed")
1828
1745
return
1829
logger.debug("Sent: %d, remaining: %d", sent,
1830
len(client.secret) - (sent_size
1831
+ sent))
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
1832
1749
sent_size += sent
1833
1750
1834
1751
logger.info("Sending secret to %s", client.name)
1844
1761
try:
1845
1762
session.bye()
1846
1763
except gnutls.errors.GNUTLSError as error:
1847
logger.warning("GnuTLS bye failed",
1848
exc_info=error)
1764
logger.warning("GnuTLS bye failed")
1849
1765
1850
1766
@staticmethod
1851
1767
def peer_certificate(session):
1852
1768
"Return the peer's OpenPGP certificate as a bytestring"
1853
1769
# If not an OpenPGP certificate...
1854
if (gnutls.library.functions.gnutls_certificate_type_get(
1855
session._c_object)
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1856
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1857
1773
# ...do the normal thing
1858
1774
return session.peer_certificate
1872
1788
def fingerprint(openpgp):
1873
1789
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1790
# New GnuTLS "datum" with the OpenPGP public key
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1793
ctypes.POINTER
1794
(ctypes.c_ubyte)),
1795
ctypes.c_uint(len(openpgp))))
1879
1796
# New empty GnuTLS certificate
1880
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1882
ctypes.byref(crt))
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1800
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
1887
1805
# Verify the self signature in the key
1888
1806
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
1891
1810
if crtverify.value != 0:
1892
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1894
"Verify failed")
1812
raise (gnutls.errors.CertificateSecurityError
1813
("Verify failed"))
1895
1814
# New buffer for the fingerprint
1896
1815
buf = ctypes.create_string_buffer(20)
1897
1816
buf_len = ctypes.c_size_t()
1898
1817
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
1901
1821
# Deinit the certificate
1902
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1823
# Convert the buffer to a Python bytestring
1909
1829
1910
1830
class MultiprocessingMixIn(object):
1911
1831
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1912
1913
1832
def sub_process_main(self, request, address):
1914
1833
try:
1915
1834
self.finish_request(request, address)
1920
1839
def process_request(self, request, address):
1921
1840
"""Start a new process to process the request."""
1922
1841
proc = multiprocessing.Process(target = self.sub_process_main,
1923
args = (request, address))
1842
args = (request,
1843
address))
1924
1844
proc.start()
1925
1845
return proc
1926
1846
1927
1847
1928
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1849
""" adds a pipe to the MixIn """
1930
1931
1850
def process_request(self, request, client_address):
1932
1851
"""Overrides and wraps the original process_request().
1933
1852
1942
1861
1943
1862
def add_pipe(self, parent_pipe, proc):
1944
1863
"""Dummy function; override as necessary"""
1945
raise NotImplementedError()
1864
raise NotImplementedError
1946
1865
1947
1866
1948
1867
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1954
1873
interface: None or a network interface name (string)
1955
1874
use_ipv6: Boolean; to use IPv6 or not
1956
1875
"""
1957
1958
1876
def __init__(self, server_address, RequestHandlerClass,
1959
interface=None,
1960
use_ipv6=True,
1961
socketfd=None):
1962
"""If socketfd is set, use that file descriptor instead of
1963
creating a new one with socket.socket().
1964
"""
1877
interface=None, use_ipv6=True):
1965
1878
self.interface = interface
1966
1879
if use_ipv6:
1967
1880
self.address_family = socket.AF_INET6
1968
if socketfd is not None:
1969
# Save the file descriptor
1970
self.socketfd = socketfd
1971
# Save the original socket.socket() function
1972
self.socket_socket = socket.socket
1973
# To implement --socket, we monkey patch socket.socket.
1974
#
1975
# (When socketserver.TCPServer is a new-style class, we
1976
# could make self.socket into a property instead of monkey
1977
# patching socket.socket.)
1978
#
1979
# Create a one-time-only replacement for socket.socket()
1980
@functools.wraps(socket.socket)
1981
def socket_wrapper(*args, **kwargs):
1982
# Restore original function so subsequent calls are
1983
# not affected.
1984
socket.socket = self.socket_socket
1985
del self.socket_socket
1986
# This time only, return a new socket object from the
1987
# saved file descriptor.
1988
return socket.fromfd(self.socketfd, *args, **kwargs)
1989
# Replace socket.socket() function with wrapper
1990
socket.socket = socket_wrapper
1991
# The socketserver.TCPServer.__init__ will call
1992
# socket.socket(), which might be our replacement,
1993
# socket_wrapper(), if socketfd was set.
1994
1881
socketserver.TCPServer.__init__(self, server_address,
1995
1882
RequestHandlerClass)
1996
1997
1883
def server_bind(self):
1998
1884
"""This overrides the normal server_bind() function
1999
1885
to bind to an interface if one was specified, and also NOT to
2005
1891
self.interface)
2006
1892
else:
2007
1893
try:
2008
self.socket.setsockopt(
2009
socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
(self.interface + "\0").encode("utf-8"))
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1895
SO_BINDTODEVICE,
1896
str(self.interface
1897
+ '\0'))
2011
1898
except socket.error as error:
2012
if error.errno == errno.EPERM:
2013
logger.error("No permission to bind to"
2014
" interface %s", self.interface)
2015
elif error.errno == errno.ENOPROTOOPT:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1902
self.interface)
1903
elif error[0] == errno.ENOPROTOOPT:
2016
1904
logger.error("SO_BINDTODEVICE not available;"
2017
1905
" cannot bind to interface %s",
2018
1906
self.interface)
2019
elif error.errno == errno.ENODEV:
2020
logger.error("Interface %s does not exist,"
2021
" cannot bind", self.interface)
2022
1907
else:
2023
1908
raise
2024
1909
# Only bind(2) the socket if we really need to.
2027
1912
if self.address_family == socket.AF_INET6:
2028
1913
any_address = "::" # in6addr_any
2029
1914
else:
2030
any_address = "0.0.0.0" # INADDR_ANY
1915
any_address = socket.INADDR_ANY
2031
1916
self.server_address = (any_address,
2032
1917
self.server_address[1])
2033
1918
elif not self.server_address[1]:
2034
self.server_address = (self.server_address[0], 0)
1919
self.server_address = (self.server_address[0],
1920
0)
2035
1921
# if self.interface:
2036
1922
# self.server_address = (self.server_address[0],
2037
1923
# 0, # port
2051
1937
2052
1938
Assumes a gobject.MainLoop event loop.
2053
1939
"""
2054
2055
1940
def __init__(self, server_address, RequestHandlerClass,
2056
interface=None,
2057
use_ipv6=True,
2058
clients=None,
2059
gnutls_priority=None,
2060
use_dbus=True,
2061
socketfd=None):
1941
interface=None, use_ipv6=True, clients=None,
1942
gnutls_priority=None, use_dbus=True):
2062
1943
self.enabled = False
2063
1944
self.clients = clients
2064
1945
if self.clients is None:
2068
1949
IPv6_TCPServer.__init__(self, server_address,
2069
1950
RequestHandlerClass,
2070
1951
interface = interface,
2071
use_ipv6 = use_ipv6,
2072
socketfd = socketfd)
2073
1952
use_ipv6 = use_ipv6)
2074
1953
def server_activate(self):
2075
1954
if self.enabled:
2076
1955
return socketserver.TCPServer.server_activate(self)
2080
1959
2081
1960
def add_pipe(self, parent_pipe, proc):
2082
1961
# Call "handle_ipc" for both data and EOF events
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2088
proc = proc))
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1965
parent_pipe =
1966
parent_pipe,
1967
proc = proc))
2089
1968
2090
def handle_ipc(self, source, condition,
2091
parent_pipe=None,
2092
proc = None,
2093
client_object=None):
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1971
condition_names = {
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1974
# blocking).
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1979
# sockets).
1980
}
1981
conditions_string = ' | '.join(name
1982
for cond, name in
1983
condition_names.iteritems()
1984
if cond & condition)
2094
1985
# error, or the other end of multiprocessing.Pipe has closed
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2096
1987
# Wait for other process to exit
2097
1988
proc.join()
2098
1989
return False
2119
2010
parent_pipe.send(False)
2120
2011
return False
2121
2012
2122
gobject.io_add_watch(
2123
parent_pipe.fileno(),
2124
gobject.IO_IN | gobject.IO_HUP,
2125
functools.partial(self.handle_ipc,
2126
parent_pipe = parent_pipe,
2127
proc = proc,
2128
client_object = client))
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2016
parent_pipe =
2017
parent_pipe,
2018
proc = proc,
2019
client_object =
2020
client))
2129
2021
parent_pipe.send(True)
2130
2022
# remove the old hook in favor of the new above hook on
2131
2023
# same fileno
2137
2029
2138
2030
parent_pipe.send(('data', getattr(client_object,
2139
2031
funcname)(*args,
2140
**kwargs)))
2032
**kwargs)))
2141
2033
2142
2034
if command == 'getattr':
2143
2035
attrname = request[1]
2144
if isinstance(client_object.__getattribute__(attrname),
2145
collections.Callable):
2146
parent_pipe.send(('function', ))
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2147
2038
else:
2148
parent_pipe.send((
2149
'data', client_object.__getattribute__(attrname)))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2150
2041
2151
2042
if command == 'setattr':
2152
2043
attrname = request[1]
2156
2047
return True
2157
2048
2158
2049
2159
def rfc3339_duration_to_delta(duration):
2160
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2161
2162
>>> rfc3339_duration_to_delta("P7D")
2163
datetime.timedelta(7)
2164
>>> rfc3339_duration_to_delta("PT60S")
2165
datetime.timedelta(0, 60)
2166
>>> rfc3339_duration_to_delta("PT60M")
2167
datetime.timedelta(0, 3600)
2168
>>> rfc3339_duration_to_delta("PT24H")
2169
datetime.timedelta(1)
2170
>>> rfc3339_duration_to_delta("P1W")
2171
datetime.timedelta(7)
2172
>>> rfc3339_duration_to_delta("PT5M30S")
2173
datetime.timedelta(0, 330)
2174
>>> rfc3339_duration_to_delta("P1DT3M20S")
2175
datetime.timedelta(1, 200)
2176
"""
2177
2178
# Parsing an RFC 3339 duration with regular expressions is not
2179
# possible - there would have to be multiple places for the same
2180
# values, like seconds. The current code, while more esoteric, is
2181
# cleaner without depending on a parsing library. If Python had a
2182
# built-in library for parsing we would use it, but we'd like to
2183
# avoid excessive use of external libraries.
2184
2185
# New type for defining tokens, syntax, and semantics all-in-one
2186
Token = collections.namedtuple("Token", (
2187
"regexp", # To match token; if "value" is not None, must have
2188
# a "group" containing digits
2189
"value", # datetime.timedelta or None
2190
"followers")) # Tokens valid after this token
2191
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
# the "duration" ABNF definition in RFC 3339, Appendix A.
2193
token_end = Token(re.compile(r"$"), None, frozenset())
2194
token_second = Token(re.compile(r"(\d+)S"),
2195
datetime.timedelta(seconds=1),
2196
frozenset((token_end, )))
2197
token_minute = Token(re.compile(r"(\d+)M"),
2198
datetime.timedelta(minutes=1),
2199
frozenset((token_second, token_end)))
2200
token_hour = Token(re.compile(r"(\d+)H"),
2201
datetime.timedelta(hours=1),
2202
frozenset((token_minute, token_end)))
2203
token_time = Token(re.compile(r"T"),
2204
None,
2205
frozenset((token_hour, token_minute,
2206
token_second)))
2207
token_day = Token(re.compile(r"(\d+)D"),
2208
datetime.timedelta(days=1),
2209
frozenset((token_time, token_end)))
2210
token_month = Token(re.compile(r"(\d+)M"),
2211
datetime.timedelta(weeks=4),
2212
frozenset((token_day, token_end)))
2213
token_year = Token(re.compile(r"(\d+)Y"),
2214
datetime.timedelta(weeks=52),
2215
frozenset((token_month, token_end)))
2216
token_week = Token(re.compile(r"(\d+)W"),
2217
datetime.timedelta(weeks=1),
2218
frozenset((token_end, )))
2219
token_duration = Token(re.compile(r"P"), None,
2220
frozenset((token_year, token_month,
2221
token_day, token_time,
2222
token_week)))
2223
# Define starting values
2224
value = datetime.timedelta() # Value so far
2225
found_token = None
2226
followers = frozenset((token_duration, )) # Following valid tokens
2227
s = duration # String left to parse
2228
# Loop until end token is found
2229
while found_token is not token_end:
2230
# Search for any currently valid tokens
2231
for token in followers:
2232
match = token.regexp.match(s)
2233
if match is not None:
2234
# Token found
2235
if token.value is not None:
2236
# Value found, parse digits
2237
factor = int(match.group(1), 10)
2238
# Add to value so far
2239
value += factor * token.value
2240
# Strip token from string
2241
s = token.regexp.sub("", s, 1)
2242
# Go to found token
2243
found_token = token
2244
# Set valid next tokens
2245
followers = found_token.followers
2246
break
2247
else:
2248
# No currently valid tokens were found
2249
raise ValueError("Invalid RFC 3339 duration: {!r}"
2250
.format(duration))
2251
# End token found
2252
return value
2253
2254
2255
2050
def string_to_delta(interval):
2256
2051
"""Parse a string and return a datetime.timedelta
2257
2052
2268
2063
>>> string_to_delta('5m 30s')
2269
2064
datetime.timedelta(0, 330)
2270
2065
"""
2271
2272
try:
2273
return rfc3339_duration_to_delta(interval)
2274
except ValueError:
2275
pass
2276
2277
2066
timevalue = datetime.timedelta(0)
2278
2067
for s in interval.split():
2279
2068
try:
2280
suffix = s[-1]
2069
suffix = unicode(s[-1])
2281
2070
value = int(s[:-1])
2282
2071
if suffix == "d":
2283
2072
delta = datetime.timedelta(value)
2290
2079
elif suffix == "w":
2291
2080
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2292
2081
else:
2293
raise ValueError("Unknown suffix {!r}".format(suffix))
2294
except IndexError as e:
2082
raise ValueError("Unknown suffix {0!r}"
2083
.format(suffix))
2084
except (ValueError, IndexError) as e:
2295
2085
raise ValueError(*(e.args))
2296
2086
timevalue += delta
2297
2087
return timevalue
2313
2103
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2314
2104
if not stat.S_ISCHR(os.fstat(null).st_mode):
2315
2105
raise OSError(errno.ENODEV,
2316
"{} not a character device"
2106
"{0} not a character device"
2317
2107
.format(os.devnull))
2318
2108
os.dup2(null, sys.stdin.fileno())
2319
2109
os.dup2(null, sys.stdout.fileno())
2329
2119
2330
2120
parser = argparse.ArgumentParser()
2331
2121
parser.add_argument("-v", "--version", action="version",
2332
version = "%(prog)s {}".format(version),
2122
version = "%(prog)s {0}".format(version),
2333
2123
help="show version number and exit")
2334
2124
parser.add_argument("-i", "--interface", metavar="IF",
2335
2125
help="Bind to interface IF")
2341
2131
help="Run self-test")
2342
2132
parser.add_argument("--debug", action="store_true",
2343
2133
help="Debug mode; run in foreground and log"
2344
" to terminal", default=None)
2134
" to terminal")
2345
2135
parser.add_argument("--debuglevel", metavar="LEVEL",
2346
2136
help="Debug level for stdout output")
2347
2137
parser.add_argument("--priority", help="GnuTLS"
2354
2144
" files")
2355
2145
parser.add_argument("--no-dbus", action="store_false",
2356
2146
dest="use_dbus", help="Do not provide D-Bus"
2357
" system bus interface", default=None)
2147
" system bus interface")
2358
2148
parser.add_argument("--no-ipv6", action="store_false",
2359
dest="use_ipv6", help="Do not use IPv6",
2360
default=None)
2149
dest="use_ipv6", help="Do not use IPv6")
2361
2150
parser.add_argument("--no-restore", action="store_false",
2362
2151
dest="restore", help="Do not restore stored"
2363
" state", default=None)
2364
parser.add_argument("--socket", type=int,
2365
help="Specify a file descriptor to a network"
2366
" socket to use instead of creating one")
2152
" state")
2367
2153
parser.add_argument("--statedir", metavar="DIR",
2368
2154
help="Directory to save/restore state in")
2369
parser.add_argument("--foreground", action="store_true",
2370
help="Run in foreground", default=None)
2371
parser.add_argument("--no-zeroconf", action="store_false",
2372
dest="zeroconf", help="Do not use Zeroconf",
2373
default=None)
2374
2155
2375
2156
options = parser.parse_args()
2376
2157
2377
2158
if options.check:
2378
2159
import doctest
2379
fail_count, test_count = doctest.testmod()
2380
sys.exit(os.EX_OK if fail_count == 0 else 1)
2160
doctest.testmod()
2161
sys.exit()
2381
2162
2382
2163
# Default values for config file for server-global settings
2383
2164
server_defaults = { "interface": "",
2385
2166
"port": "",
2386
2167
"debug": "False",
2387
2168
"priority":
2388
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2390
2170
"servicename": "Mandos",
2391
2171
"use_dbus": "True",
2392
2172
"use_ipv6": "True",
2393
2173
"debuglevel": "",
2394
2174
"restore": "True",
2395
"socket": "",
2396
"statedir": "/var/lib/mandos",
2397
"foreground": "False",
2398
"zeroconf": "True",
2399
}
2175
"statedir": "/var/lib/mandos"
2176
}
2400
2177
2401
2178
# Parse config file for server-global settings
2402
2179
server_config = configparser.SafeConfigParser(server_defaults)
2403
2180
del server_defaults
2404
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2181
server_config.read(os.path.join(options.configdir,
2182
"mandos.conf"))
2405
2183
# Convert the SafeConfigParser object to a dict
2406
2184
server_settings = server_config.defaults()
2407
2185
# Use the appropriate methods on the non-string config options
2408
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2186
for option in ("debug", "use_dbus", "use_ipv6"):
2409
2187
server_settings[option] = server_config.getboolean("DEFAULT",
2410
2188
option)
2411
2189
if server_settings["port"]:
2412
2190
server_settings["port"] = server_config.getint("DEFAULT",
2413
2191
"port")
2414
if server_settings["socket"]:
2415
server_settings["socket"] = server_config.getint("DEFAULT",
2416
"socket")
2417
# Later, stdin will, and stdout and stderr might, be dup'ed
2418
# over with an opened os.devnull. But we don't want this to
2419
# happen with a supplied network socket.
2420
if 0 <= server_settings["socket"] <= 2:
2421
server_settings["socket"] = os.dup(server_settings
2422
["socket"])
2423
2192
del server_config
2424
2193
2425
2194
# Override the settings from the config file with command line
2426
2195
# options, if set.
2427
2196
for option in ("interface", "address", "port", "debug",
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
2199
"statedir"):
2431
2200
value = getattr(options, option)
2432
2201
if value is not None:
2433
2202
server_settings[option] = value
2434
2203
del options
2435
2204
# Force all strings to be unicode
2436
2205
for option in server_settings.keys():
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2439
.decode("utf-8"))
2440
# Force all boolean options to be boolean
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
"foreground", "zeroconf"):
2443
server_settings[option] = bool(server_settings[option])
2444
# Debug implies foreground
2445
if server_settings["debug"]:
2446
server_settings["foreground"] = True
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
2447
2208
# Now we have our good server settings in "server_settings"
2448
2209
2449
2210
##################################################################
2450
2211
2451
if (not server_settings["zeroconf"]
2452
and not (server_settings["port"]
2453
or server_settings["socket"] != "")):
2454
parser.error("Needs port or socket to work without Zeroconf")
2455
2456
2212
# For convenience
2457
2213
debug = server_settings["debug"]
2458
2214
debuglevel = server_settings["debuglevel"]
2460
2216
use_ipv6 = server_settings["use_ipv6"]
2461
2217
stored_state_path = os.path.join(server_settings["statedir"],
2462
2218
stored_state_file)
2463
foreground = server_settings["foreground"]
2464
zeroconf = server_settings["zeroconf"]
2465
2219
2466
2220
if debug:
2467
2221
initlogger(debug, logging.DEBUG)
2473
2227
initlogger(debug, level)
2474
2228
2475
2229
if server_settings["servicename"] != "Mandos":
2476
syslogger.setFormatter(
2477
logging.Formatter('Mandos ({}) [%(process)d]:'
2478
' %(levelname)s: %(message)s'.format(
2479
server_settings["servicename"])))
2230
syslogger.setFormatter(logging.Formatter
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
2234
["servicename"])))
2480
2235
2481
2236
# Parse config file with clients
2482
2237
client_config = configparser.SafeConfigParser(Client
2487
2242
global mandos_dbus_service
2488
2243
mandos_dbus_service = None
2489
2244
2490
socketfd = None
2491
if server_settings["socket"] != "":
2492
socketfd = server_settings["socket"]
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2495
ClientHandler,
2496
interface=(server_settings["interface"] or None),
2497
use_ipv6=use_ipv6,
2498
gnutls_priority=server_settings["priority"],
2499
use_dbus=use_dbus,
2500
socketfd=socketfd)
2501
if not foreground:
2502
pidfilename = "/run/mandos.pid"
2503
if not os.path.isdir("/run/."):
2504
pidfilename = "/var/run/mandos.pid"
2505
pidfile = None
2245
tcp_server = MandosServer((server_settings["address"],
2246
server_settings["port"]),
2247
ClientHandler,
2248
interface=(server_settings["interface"]
2249
or None),
2250
use_ipv6=use_ipv6,
2251
gnutls_priority=
2252
server_settings["priority"],
2253
use_dbus=use_dbus)
2254
if not debug:
2255
pidfilename = "/var/run/mandos.pid"
2506
2256
try:
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2508
except IOError as e:
2509
logger.error("Could not open file %r", pidfilename,
2510
exc_info=e)
2257
pidfile = open(pidfilename, "w")
2258
except IOError:
2259
logger.error("Could not open file %r", pidfilename)
2511
2260
2512
2261
for name in ("_mandos", "mandos", "nobody"):
2513
2262
try:
2523
2272
os.setgid(gid)
2524
2273
os.setuid(uid)
2525
2274
except OSError as error:
2526
if error.errno != errno.EPERM:
2527
raise
2275
if error[0] != errno.EPERM:
2276
raise error
2528
2277
2529
2278
if debug:
2530
2279
# Enable all possible GnuTLS debugging
2537
2286
def debug_gnutls(level, string):
2538
2287
logger.debug("GnuTLS: %s", string[:-1])
2539
2288
2540
gnutls.library.functions.gnutls_global_set_log_function(
2541
debug_gnutls)
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
2542
2291
2543
2292
# Redirect stdin so all checkers get /dev/null
2544
2293
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2547
2296
os.close(null)
2548
2297
2549
2298
# Need to fork before connecting to D-Bus
2550
if not foreground:
2299
if not debug:
2551
2300
# Close all input and output, do double fork, etc.
2552
2301
daemon()
2553
2302
2554
# multiprocessing will use threads, so before we use gobject we
2555
# need to inform gobject that threads will be used.
2556
2303
gobject.threads_init()
2557
2304
2558
2305
global main_loop
2564
2311
if use_dbus:
2565
2312
try:
2566
2313
bus_name = dbus.service.BusName("se.recompile.Mandos",
2567
bus,
2568
do_not_queue=True)
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2571
do_not_queue=True)
2572
except dbus.exceptions.DBusException as e:
2573
logger.error("Disabling D-Bus:", exc_info=e)
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2317
do_not_queue=True))
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
2574
2320
use_dbus = False
2575
2321
server_settings["use_dbus"] = False
2576
2322
tcp_server.use_dbus = False
2577
if zeroconf:
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2583
bus = bus)
2584
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
2587
2331
2588
2332
global multiprocessing_manager
2589
2333
multiprocessing_manager = multiprocessing.Manager()
2590
2334
2591
2335
client_class = Client
2592
2336
if use_dbus:
2593
client_class = functools.partial(ClientDBus, bus = bus)
2337
client_class = functools.partial(ClientDBusTransitional,
2338
bus = bus)
2594
2339
2595
2340
client_settings = Client.config_parser(client_config)
2596
2341
old_client_settings = {}
2597
2342
clients_data = {}
2598
2343
2599
# This is used to redirect stdout and stderr for checker processes
2600
global wnull
2601
wnull = open(os.devnull, "w") # A writable /dev/null
2602
# Only used if server is running in foreground but not in debug
2603
# mode
2604
if debug or not foreground:
2605
wnull.close()
2606
2607
2344
# Get client data and settings from last running state.
2608
2345
if server_settings["restore"]:
2609
2346
try:
2610
2347
with open(stored_state_path, "rb") as stored_state:
2611
clients_data, old_client_settings = pickle.load(
2612
stored_state)
2348
clients_data, old_client_settings = (pickle.load
2349
(stored_state))
2613
2350
os.remove(stored_state_path)
2614
2351
except IOError as e:
2615
if e.errno == errno.ENOENT:
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2618
else:
2619
logger.critical("Could not load persistent state:",
2620
exc_info=e)
2352
logger.warning("Could not load persistent state: {0}"
2353
.format(e))
2354
if e.errno != errno.ENOENT:
2621
2355
raise
2622
2356
except EOFError as e:
2623
2357
logger.warning("Could not load persistent state: "
2624
"EOFError:",
2625
exc_info=e)
2358
"EOFError: {0}".format(e))
2626
2359
2627
2360
with PGPEngine() as pgp:
2628
for client_name, client in clients_data.items():
2629
# Skip removed clients
2630
if client_name not in client_settings:
2631
continue
2632
2361
for client_name, client in clients_data.iteritems():
2633
2362
# Decide which value to use after restoring saved state.
2634
2363
# We have three different values: Old config file,
2635
2364
# new config file, and saved state.
2640
2369
# For each value in new config, check if it
2641
2370
# differs from the old config value (Except for
2642
2371
# the "secret" attribute)
2643
if (name != "secret"
2644
and (value !=
2645
old_client_settings[client_name][name])):
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2374
[name]):
2646
2375
client[name] = value
2647
2376
except KeyError:
2648
2377
pass
2649
2378
2650
2379
# Clients who has passed its expire date can still be
2651
# enabled if its last checker was successful. A Client
2380
# enabled if its last checker was successful. Clients
2652
2381
# whose checker succeeded before we stored its state is
2653
2382
# assumed to have successfully run all checkers during
2654
2383
# downtime.
2656
2385
if datetime.datetime.utcnow() >= client["expires"]:
2657
2386
if not client["last_checked_ok"]:
2658
2387
logger.warning(
2659
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2661
client_name))
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2662
2391
client["enabled"] = False
2663
2392
elif client["last_checker_status"] != 0:
2664
2393
logger.warning(
2665
"disabling client {} - Client last"
2666
" checker failed with error code"
2667
" {}".format(
2668
client_name,
2669
client["last_checker_status"]))
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2670
2398
client["enabled"] = False
2671
2399
else:
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2400
client["expires"] = (datetime.datetime
2401
.utcnow()
2402
+ client["timeout"])
2675
2403
logger.debug("Last checker succeeded,"
2676
" keeping {} enabled".format(
2677
client_name))
2404
" keeping {0} enabled"
2405
.format(client_name))
2678
2406
try:
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2410
["secret"]))
2682
2411
except PGPError:
2683
2412
# If decryption fails, we use secret from new settings
2684
logger.debug("Failed to decrypt {} old secret".format(
2685
client_name))
2686
client["secret"] = (client_settings[client_name]
2687
["secret"])
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2417
2688
2418
2689
2419
# Add/remove clients based on new changes made to config
2690
2420
for client_name in (set(old_client_settings)
2693
2423
for client_name in (set(client_settings)
2694
2424
- set(old_client_settings)):
2695
2425
clients_data[client_name] = client_settings[client_name]
2696
2426
2697
2427
# Create all client objects
2698
for client_name, client in clients_data.items():
2428
for client_name, client in clients_data.iteritems():
2699
2429
tcp_server.clients[client_name] = client_class(
2700
name = client_name,
2701
settings = client,
2702
server_settings = server_settings)
2430
name = client_name, settings = client)
2703
2431
2704
2432
if not tcp_server.clients:
2705
2433
logger.warning("No clients defined")
2706
2707
if not foreground:
2708
if pidfile is not None:
2709
pid = os.getpid()
2710
try:
2711
with pidfile:
2712
print(pid, file=pidfile)
2713
except IOError:
2714
logger.error("Could not write to file %r with PID %d",
2715
pidfilename, pid)
2716
del pidfile
2434
2435
if not debug:
2436
try:
2437
with pidfile:
2438
pid = os.getpid()
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
del pidfile
2441
except IOError:
2442
logger.error("Could not write to file %r with PID %d",
2443
pidfilename, pid)
2444
except NameError:
2445
# "pidfile" was never created
2446
pass
2717
2447
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2718
2449
2719
2450
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2720
2451
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2721
2452
2722
2453
if use_dbus:
2723
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2726
2454
class MandosDBusService(DBusObjectWithProperties):
2727
2455
"""A D-Bus proxy object"""
2728
2729
2456
def __init__(self):
2730
2457
dbus.service.Object.__init__(self, bus, "/")
2731
2732
2458
_interface = "se.recompile.Mandos"
2733
2459
2734
2460
@dbus_interface_annotations(_interface)
2735
2461
def _foo(self):
2736
return {
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2738
"false" }
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2464
"false"}
2739
2465
2740
2466
@dbus.service.signal(_interface, signature="o")
2741
2467
def ClientAdded(self, objpath):
2755
2481
@dbus.service.method(_interface, out_signature="ao")
2756
2482
def GetAllClients(self):
2757
2483
"D-Bus method"
2758
return dbus.Array(c.dbus_object_path for c in
2484
return dbus.Array(c.dbus_object_path
2485
for c in
2759
2486
tcp_server.clients.itervalues())
2760
2487
2761
2488
@dbus.service.method(_interface,
2763
2490
def GetAllClientsWithProperties(self):
2764
2491
"D-Bus method"
2765
2492
return dbus.Dictionary(
2766
{ c.dbus_object_path: c.GetAll("")
2767
for c in tcp_server.clients.itervalues() },
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
2768
2495
signature="oa{sv}")
2769
2496
2770
2497
@dbus.service.method(_interface, in_signature="o")
2783
2510
2784
2511
del _interface
2785
2512
2786
mandos_dbus_service = MandosDBusService()
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
2787
2516
2788
2517
def cleanup():
2789
2518
"Cleanup function; run on exit"
2790
if zeroconf:
2791
service.cleanup()
2519
service.cleanup()
2792
2520
2793
2521
multiprocessing.active_children()
2794
wnull.close()
2795
2522
if not (tcp_server.clients or client_settings):
2796
2523
return
2797
2524
2808
2535
2809
2536
# A list of attributes that can not be pickled
2810
2537
# + secret.
2811
exclude = { "bus", "changedstate", "secret",
2812
"checker", "server_settings" }
2813
for name, typ in inspect.getmembers(dbus.service
2814
.Object):
2538
exclude = set(("bus", "changedstate", "secret",
2539
"checker"))
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2815
2542
exclude.add(name)
2816
2543
2817
2544
client_dict["encrypted_secret"] = (client
2824
2551
del client_settings[client.name]["secret"]
2825
2552
2826
2553
try:
2827
with tempfile.NamedTemporaryFile(
2828
mode='wb',
2829
suffix=".pickle",
2830
prefix='clients-',
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
prefix="clients-",
2556
dir=os.path.dirname
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2833
2559
pickle.dump((clients, client_settings), stored_state)
2834
tempname = stored_state.name
2835
2560
os.rename(tempname, stored_state_path)
2836
2561
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2563
.format(e))
2837
2564
if not debug:
2838
2565
try:
2839
2566
os.remove(tempname)
2840
2567
except NameError:
2841
2568
pass
2842
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2843
logger.warning("Could not save persistent state: {}"
2844
.format(os.strerror(e.errno)))
2845
else:
2846
logger.warning("Could not save persistent state:",
2847
exc_info=e)
2848
raise
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
errno.EEXIST)):
2571
raise e
2849
2572
2850
2573
# Delete all clients, and settings from config
2851
2574
while tcp_server.clients:
2856
2579
client.disable(quiet=True)
2857
2580
if use_dbus:
2858
2581
# Emit D-Bus signal
2859
mandos_dbus_service.ClientRemoved(
2860
client.dbus_object_path, client.name)
2582
mandos_dbus_service.ClientRemoved(client
2583
.dbus_object_path,
2584
client.name)
2861
2585
client_settings.clear()
2862
2586
2863
2587
atexit.register(cleanup)
2874
2598
tcp_server.server_activate()
2875
2599
2876
2600
# Find out what port we got
2877
if zeroconf:
2878
service.port = tcp_server.socket.getsockname()[1]
2601
service.port = tcp_server.socket.getsockname()[1]
2879
2602
if use_ipv6:
2880
2603
logger.info("Now listening on address %r, port %d,"
2881
2604
" flowinfo %d, scope_id %d",
2887
2610
#service.interface = tcp_server.socket.getsockname()[3]
2888
2611
2889
2612
try:
2890
if zeroconf:
2891
# From the Avahi example code
2892
try:
2893
service.activate()
2894
except dbus.exceptions.DBusException as error:
2895
logger.critical("D-Bus Exception", exc_info=error)
2896
cleanup()
2897
sys.exit(1)
2898
# End of Avahi example code
2613
# From the Avahi example code
2614
try:
2615
service.activate()
2616
except dbus.exceptions.DBusException as error:
2617
logger.critical("D-Bus Exception", exc_info=error)
2618
cleanup()
2619
sys.exit(1)
2620
# End of Avahi example code
2899
2621
2900
2622
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
2623
lambda *args, **kwargs:
2916
2638
# Must run before the D-Bus bus name gets deregistered
2917
2639
cleanup()
2918
2640
2919
2920
2641
if __name__ == '__main__':
2921
2642
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0