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