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 609
- compare with another revision
- download diff
- download tarball
- view history from revision 609
- Committer: Teddy Hogeborn
- Date: 2012-06-23 00:58:49 UTC
- Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
duration.
(rfc3339_duration_to_delta): New function.
(string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
(EXAMPLE): Update to new interval format.
(SEE ALSO): Reference RFC 3339.
* mandos: All client options for time intervals now take an RFC 3339
duration.
(rfc3339_duration_to_delta): New function.
(string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
(EXAMPLE): Update to new interval format.
(SEE ALSO): Reference RFC 3339.
- files added:
- debian/mandos-client.examples
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
66
import hashlib
68
import binascii
69
import tempfile
70
import itertools
71
import collections
67
72
68
73
import dbus
69
74
import dbus.service
74
79
import ctypes.util
75
80
import xml.dom.minidom
76
81
import inspect
77
import Crypto.Cipher.AES
82
import GnuPGInterface
78
83
79
84
try:
80
85
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
89
except ImportError:
85
90
SO_BINDTODEVICE = None
86
91
87
88
version = "1.4.1"
89
90
stored_state_path = "/var/lib/mandos/clients.pickle"
91
92
#logger = logging.getLogger('mandos')
93
logger = logging.Logger('mandos')
92
version = "1.6.0"
93
stored_state_file = "clients.pickle"
94
95
logger = logging.getLogger()
94
96
syslogger = (logging.handlers.SysLogHandler
95
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
96
98
address = str("/dev/log")))
97
syslogger.setFormatter(logging.Formatter
98
('Mandos [%(process)d]: %(levelname)s:'
99
' %(message)s'))
100
logger.addHandler(syslogger)
101
102
console = logging.StreamHandler()
103
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
106
logger.addHandler(console)
99
100
try:
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
103
.if_nametoindex)
104
except (OSError, AttributeError):
105
def if_nametoindex(interface):
106
"Get an interface index the hard way, i.e. using fcntl()"
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
with contextlib.closing(socket.socket()) as s:
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(str("16s16x"),
111
interface))
112
interface_index = struct.unpack(str("I"),
113
ifreq[16:20])[0]
114
return interface_index
115
116
117
def initlogger(debug, level=logging.WARNING):
118
"""init logger and add loglevel"""
119
120
syslogger.setFormatter(logging.Formatter
121
('Mandos [%(process)d]: %(levelname)s:'
122
' %(message)s'))
123
logger.addHandler(syslogger)
124
125
if debug:
126
console = logging.StreamHandler()
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
128
' [%(process)d]:'
129
' %(levelname)s:'
130
' %(message)s'))
131
logger.addHandler(console)
132
logger.setLevel(level)
133
134
135
class PGPError(Exception):
136
"""Exception if encryption/decryption fails"""
137
pass
138
139
140
class PGPEngine(object):
141
"""A simple class for OpenPGP symmetric encryption & decryption"""
142
def __init__(self):
143
self.gnupg = GnuPGInterface.GnuPG()
144
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
self.gnupg = GnuPGInterface.GnuPG()
146
self.gnupg.options.meta_interactive = False
147
self.gnupg.options.homedir = self.tempdir
148
self.gnupg.options.extra_args.extend(['--force-mdc',
149
'--quiet',
150
'--no-use-agent'])
151
152
def __enter__(self):
153
return self
154
155
def __exit__(self, exc_type, exc_value, traceback):
156
self._cleanup()
157
return False
158
159
def __del__(self):
160
self._cleanup()
161
162
def _cleanup(self):
163
if self.tempdir is not None:
164
# Delete contents of tempdir
165
for root, dirs, files in os.walk(self.tempdir,
166
topdown = False):
167
for filename in files:
168
os.remove(os.path.join(root, filename))
169
for dirname in dirs:
170
os.rmdir(os.path.join(root, dirname))
171
# Remove tempdir
172
os.rmdir(self.tempdir)
173
self.tempdir = None
174
175
def password_encode(self, password):
176
# Passphrase can not be empty and can not contain newlines or
177
# NUL bytes. So we prefix it and hex encode it.
178
return b"mandos" + binascii.hexlify(password)
179
180
def encrypt(self, data, password):
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
183
try:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
188
f.write(data)
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
191
proc.wait()
192
except IOError as e:
193
raise PGPError(e)
194
self.gnupg.passphrase = None
195
return ciphertext
196
197
def decrypt(self, data, password):
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
200
try:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
205
f.write(data)
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
208
proc.wait()
209
except IOError as e:
210
raise PGPError(e)
211
self.gnupg.passphrase = None
212
return decrypted_plaintext
213
107
214
108
215
class AvahiError(Exception):
109
216
def __init__(self, value, *args, **kwargs):
139
246
server: D-Bus Server
140
247
bus: dbus.SystemBus()
141
248
"""
249
142
250
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
143
251
servicetype = None, port = None, TXT = None,
144
252
domain = "", host = "", max_renames = 32768,
157
265
self.server = None
158
266
self.bus = bus
159
267
self.entry_group_state_changed_match = None
268
160
269
def rename(self):
161
270
"""Derived from the Avahi example code"""
162
271
if self.rename_count >= self.max_renames:
168
277
.GetAlternativeServiceName(self.name))
169
278
logger.info("Changing Zeroconf service name to %r ...",
170
279
self.name)
171
syslogger.setFormatter(logging.Formatter
172
('Mandos (%s) [%%(process)d]:'
173
' %%(levelname)s: %%(message)s'
174
% self.name))
175
280
self.remove()
176
281
try:
177
282
self.add()
178
283
except dbus.exceptions.DBusException as error:
179
logger.critical("DBusException: %s", error)
284
logger.critical("D-Bus Exception", exc_info=error)
180
285
self.cleanup()
181
286
os._exit(1)
182
287
self.rename_count += 1
288
183
289
def remove(self):
184
290
"""Derived from the Avahi example code"""
185
291
if self.entry_group_state_changed_match is not None:
187
293
self.entry_group_state_changed_match = None
188
294
if self.group is not None:
189
295
self.group.Reset()
296
190
297
def add(self):
191
298
"""Derived from the Avahi example code"""
192
299
self.remove()
197
304
avahi.DBUS_INTERFACE_ENTRY_GROUP)
198
305
self.entry_group_state_changed_match = (
199
306
self.group.connect_to_signal(
200
'StateChanged', self .entry_group_state_changed))
307
'StateChanged', self.entry_group_state_changed))
201
308
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
202
309
self.name, self.type)
203
310
self.group.AddService(
209
316
dbus.UInt16(self.port),
210
317
avahi.string_array_to_txt_array(self.TXT))
211
318
self.group.Commit()
319
212
320
def entry_group_state_changed(self, state, error):
213
321
"""Derived from the Avahi example code"""
214
322
logger.debug("Avahi entry group state change: %i", state)
221
329
elif state == avahi.ENTRY_GROUP_FAILURE:
222
330
logger.critical("Avahi: Error in group state changed %s",
223
331
unicode(error))
224
raise AvahiGroupError("State changed: %s"
225
% unicode(error))
332
raise AvahiGroupError("State changed: {0!s}"
333
.format(error))
334
226
335
def cleanup(self):
227
336
"""Derived from the Avahi example code"""
228
337
if self.group is not None:
229
338
try:
230
339
self.group.Free()
231
340
except (dbus.exceptions.UnknownMethodException,
232
dbus.exceptions.DBusException) as e:
341
dbus.exceptions.DBusException):
233
342
pass
234
343
self.group = None
235
344
self.remove()
345
236
346
def server_state_changed(self, state, error=None):
237
347
"""Derived from the Avahi example code"""
238
348
logger.debug("Avahi server state change: %i", state)
257
367
logger.debug("Unknown state: %r", state)
258
368
else:
259
369
logger.debug("Unknown state: %r: %r", state, error)
370
260
371
def activate(self):
261
372
"""Derived from the Avahi example code"""
262
373
if self.server is None:
270
381
self.server_state_changed(self.server.GetState())
271
382
272
383
273
def _timedelta_to_milliseconds(td):
384
class AvahiServiceToSyslog(AvahiService):
385
def rename(self):
386
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
391
.format(self.name)))
392
return ret
393
394
395
def timedelta_to_milliseconds(td):
274
396
"Convert a datetime.timedelta() to milliseconds"
275
397
return ((td.days * 24 * 60 * 60 * 1000)
276
398
+ (td.seconds * 1000)
277
399
+ (td.microseconds // 1000))
278
400
401
279
402
class Client(object):
280
403
"""A representation of a client host served by this server.
281
404
282
405
Attributes:
283
_approved: bool(); 'None' if not yet approved/disapproved
406
approved: bool(); 'None' if not yet approved/disapproved
284
407
approval_delay: datetime.timedelta(); Time to wait for approval
285
408
approval_duration: datetime.timedelta(); Duration of one approval
286
409
checker: subprocess.Popen(); a running checker process used
304
427
interval: datetime.timedelta(); How often to start a new checker
305
428
last_approval_request: datetime.datetime(); (UTC) or None
306
429
last_checked_ok: datetime.datetime(); (UTC) or None
307
Last_checker_status: integer between 0 and 255 reflecting exit status
308
of last checker. -1 reflect crashed checker.
309
last_enabled: datetime.datetime(); (UTC)
430
last_checker_status: integer between 0 and 255 reflecting exit
431
status of last checker. -1 reflects crashed
432
checker, -2 means no checker completed yet.
433
last_enabled: datetime.datetime(); (UTC) or None
310
434
name: string; from the config file, used in log messages and
311
435
D-Bus identifiers
312
436
secret: bytestring; sent verbatim (over TLS) to client
313
437
timeout: datetime.timedelta(); How long from last_checked_ok
314
438
until this client is disabled
315
extended_timeout: extra long timeout when password has been sent
439
extended_timeout: extra long timeout when secret has been sent
316
440
runtime_expansions: Allowed attributes for runtime expansion.
317
441
expires: datetime.datetime(); time (UTC) when a client will be
318
442
disabled, or None
319
443
"""
320
444
321
445
runtime_expansions = ("approval_delay", "approval_duration",
322
"created", "enabled", "fingerprint",
323
"host", "interval", "last_checked_ok",
446
"created", "enabled", "expires",
447
"fingerprint", "host", "interval",
448
"last_approval_request", "last_checked_ok",
324
449
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
452
"interval": "PT2M",
453
"checker": "fping -q -- %%(host)s",
454
"host": "",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
458
"enabled": "True",
459
}
325
460
326
461
def timeout_milliseconds(self):
327
462
"Return the 'timeout' attribute in milliseconds"
328
return _timedelta_to_milliseconds(self.timeout)
463
return timedelta_to_milliseconds(self.timeout)
329
464
330
465
def extended_timeout_milliseconds(self):
331
466
"Return the 'extended_timeout' attribute in milliseconds"
332
return _timedelta_to_milliseconds(self.extended_timeout)
467
return timedelta_to_milliseconds(self.extended_timeout)
333
468
334
469
def interval_milliseconds(self):
335
470
"Return the 'interval' attribute in milliseconds"
336
return _timedelta_to_milliseconds(self.interval)
471
return timedelta_to_milliseconds(self.interval)
337
472
338
473
def approval_delay_milliseconds(self):
339
return _timedelta_to_milliseconds(self.approval_delay)
340
341
def __init__(self, name = None, config=None):
342
"""Note: the 'checker' key in 'config' sets the
343
'checker_command' attribute and *not* the 'checker'
344
attribute."""
474
return timedelta_to_milliseconds(self.approval_delay)
475
476
@staticmethod
477
def config_parser(config):
478
"""Construct a new dict of client settings of this form:
479
{ 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
"""
484
settings = {}
485
for client_name in config.sections():
486
section = dict(config.items(client_name))
487
client = settings[client_name] = {}
488
489
client["host"] = section["host"]
490
# Reformat values from string types to Python types
491
client["approved_by_default"] = config.getboolean(
492
client_name, "approved_by_default")
493
client["enabled"] = config.getboolean(client_name,
494
"enabled")
495
496
client["fingerprint"] = (section["fingerprint"].upper()
497
.replace(" ", ""))
498
if "secret" in section:
499
client["secret"] = section["secret"].decode("base64")
500
elif "secfile" in section:
501
with open(os.path.expanduser(os.path.expandvars
502
(section["secfile"])),
503
"rb") as secfile:
504
client["secret"] = secfile.read()
505
else:
506
raise TypeError("No secret or secfile for section {0}"
507
.format(section))
508
client["timeout"] = string_to_delta(section["timeout"])
509
client["extended_timeout"] = string_to_delta(
510
section["extended_timeout"])
511
client["interval"] = string_to_delta(section["interval"])
512
client["approval_delay"] = string_to_delta(
513
section["approval_delay"])
514
client["approval_duration"] = string_to_delta(
515
section["approval_duration"])
516
client["checker_command"] = section["checker"]
517
client["last_approval_request"] = None
518
client["last_checked_ok"] = None
519
client["last_checker_status"] = -2
520
521
return settings
522
523
def __init__(self, settings, name = None):
345
524
self.name = name
346
if config is None:
347
config = {}
525
# adding all client settings
526
for setting, value in settings.iteritems():
527
setattr(self, setting, value)
528
529
if self.enabled:
530
if not hasattr(self, "last_enabled"):
531
self.last_enabled = datetime.datetime.utcnow()
532
if not hasattr(self, "expires"):
533
self.expires = (datetime.datetime.utcnow()
534
+ self.timeout)
535
else:
536
self.last_enabled = None
537
self.expires = None
538
348
539
logger.debug("Creating client %r", self.name)
349
540
# Uppercase and remove spaces from fingerprint for later
350
541
# comparison purposes with return value from the fingerprint()
351
542
# function
352
self.fingerprint = (config["fingerprint"].upper()
353
.replace(" ", ""))
354
543
logger.debug(" Fingerprint: %s", self.fingerprint)
355
if "secret" in config:
356
self.secret = config["secret"].decode("base64")
357
elif "secfile" in config:
358
with open(os.path.expanduser(os.path.expandvars
359
(config["secfile"])),
360
"rb") as secfile:
361
self.secret = secfile.read()
362
else:
363
raise TypeError("No secret or secfile for client %s"
364
% self.name)
365
self.host = config.get("host", "")
366
self.created = datetime.datetime.utcnow()
367
self.enabled = True
368
self.last_approval_request = None
369
self.last_enabled = datetime.datetime.utcnow()
370
self.last_checked_ok = None
371
self.last_checker_status = 0
372
self.timeout = string_to_delta(config["timeout"])
373
self.extended_timeout = string_to_delta(config
374
["extended_timeout"])
375
self.interval = string_to_delta(config["interval"])
544
self.created = settings.get("created",
545
datetime.datetime.utcnow())
546
547
# attributes specific for this server instance
376
548
self.checker = None
377
549
self.checker_initiator_tag = None
378
550
self.disable_initiator_tag = None
379
self.expires = datetime.datetime.utcnow() + self.timeout
380
551
self.checker_callback_tag = None
381
self.checker_command = config["checker"]
382
552
self.current_checker_command = None
383
self._approved = None
384
self.approved_by_default = config.get("approved_by_default",
385
True)
553
self.approved = None
386
554
self.approvals_pending = 0
387
self.approval_delay = string_to_delta(
388
config["approval_delay"])
389
self.approval_duration = string_to_delta(
390
config["approval_duration"])
391
555
self.changedstate = (multiprocessing_manager
392
556
.Condition(multiprocessing_manager
393
557
.Lock()))
394
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
560
if not attr.startswith("_")]
395
561
self.client_structure.append("client_structure")
396
397
562
398
563
for name, t in inspect.getmembers(type(self),
399
lambda obj: isinstance(obj, property)):
564
lambda obj:
565
isinstance(obj,
566
property)):
400
567
if not name.startswith("_"):
401
568
self.client_structure.append(name)
402
569
403
570
# Send notice to process children that client state has changed
404
571
def send_changedstate(self):
405
self.changedstate.acquire()
406
self.changedstate.notify_all()
407
self.changedstate.release()
572
with self.changedstate:
573
self.changedstate.notify_all()
408
574
409
575
def enable(self):
410
576
"""Start this client's checker and timeout hooks"""
411
577
if getattr(self, "enabled", False):
412
578
# Already enabled
413
579
return
414
self.send_changedstate()
415
580
self.expires = datetime.datetime.utcnow() + self.timeout
416
581
self.enabled = True
417
582
self.last_enabled = datetime.datetime.utcnow()
418
583
self.init_checker()
584
self.send_changedstate()
419
585
420
586
def disable(self, quiet=True):
421
587
"""Disable this client."""
422
588
if not getattr(self, "enabled", False):
423
589
return False
424
590
if not quiet:
425
self.send_changedstate()
426
if not quiet:
427
591
logger.info("Disabling client %s", self.name)
428
if getattr(self, "disable_initiator_tag", False):
592
if getattr(self, "disable_initiator_tag", None) is not None:
429
593
gobject.source_remove(self.disable_initiator_tag)
430
594
self.disable_initiator_tag = None
431
595
self.expires = None
432
if getattr(self, "checker_initiator_tag", False):
596
if getattr(self, "checker_initiator_tag", None) is not None:
433
597
gobject.source_remove(self.checker_initiator_tag)
434
598
self.checker_initiator_tag = None
435
599
self.stop_checker()
436
600
self.enabled = False
601
if not quiet:
602
self.send_changedstate()
437
603
# Do not run this again if called by a gobject.timeout_add
438
604
return False
439
605
440
606
def __del__(self):
441
607
self.disable()
442
608
443
609
def init_checker(self):
444
610
# Schedule a new checker to be started an 'interval' from now,
445
611
# and every interval from then on.
612
if self.checker_initiator_tag is not None:
613
gobject.source_remove(self.checker_initiator_tag)
446
614
self.checker_initiator_tag = (gobject.timeout_add
447
615
(self.interval_milliseconds(),
448
616
self.start_checker))
449
617
# Schedule a disable() when 'timeout' has passed
618
if self.disable_initiator_tag is not None:
619
gobject.source_remove(self.disable_initiator_tag)
450
620
self.disable_initiator_tag = (gobject.timeout_add
451
621
(self.timeout_milliseconds(),
452
622
self.disable))
453
623
# Also start a new checker *right now*.
454
624
self.start_checker()
455
456
625
457
626
def checker_callback(self, pid, condition, command):
458
627
"""The checker has completed, so take appropriate actions."""
459
628
self.checker_callback_tag = None
460
629
self.checker = None
461
630
if os.WIFEXITED(condition):
462
self.last_checker_status = os.WEXITSTATUS(condition)
631
self.last_checker_status = os.WEXITSTATUS(condition)
463
632
if self.last_checker_status == 0:
464
633
logger.info("Checker for %(name)s succeeded",
465
634
vars(self))
472
641
logger.warning("Checker for %(name)s crashed?",
473
642
vars(self))
474
643
475
def checked_ok(self, timeout=None):
476
"""Bump up the timeout for this client.
477
478
This should only be called when the client has been seen,
479
alive and well.
480
"""
644
def checked_ok(self):
645
"""Assert that the client has been seen, alive and well."""
646
self.last_checked_ok = datetime.datetime.utcnow()
647
self.last_checker_status = 0
648
self.bump_timeout()
649
650
def bump_timeout(self, timeout=None):
651
"""Bump up the timeout for this client."""
481
652
if timeout is None:
482
653
timeout = self.timeout
483
self.last_checked_ok = datetime.datetime.utcnow()
484
654
if self.disable_initiator_tag is not None:
485
655
gobject.source_remove(self.disable_initiator_tag)
656
self.disable_initiator_tag = None
486
657
if getattr(self, "enabled", False):
487
658
self.disable_initiator_tag = (gobject.timeout_add
488
(_timedelta_to_milliseconds
659
(timedelta_to_milliseconds
489
660
(timeout), self.disable))
490
661
self.expires = datetime.datetime.utcnow() + timeout
491
662
498
669
If a checker already exists, leave it running and do
499
670
nothing."""
500
671
# The reason for not killing a running checker is that if we
501
# did that, then if a checker (for some reason) started
502
# running slowly and taking more than 'interval' time, the
503
# client would inevitably timeout, since no checker would get
504
# a chance to run to completion. If we instead leave running
672
# did that, and if a checker (for some reason) started running
673
# slowly and taking more than 'interval' time, then the client
674
# would inevitably timeout, since no checker would get a
675
# chance to run to completion. If we instead leave running
505
676
# checkers alone, the checker would have to take more time
506
677
# than 'timeout' for the client to be disabled, which is as it
507
678
# should be.
521
692
self.current_checker_command)
522
693
# Start a new checker if needed
523
694
if self.checker is None:
695
# Escape attributes for the shell
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
698
for attr in
699
self.runtime_expansions)
524
700
try:
525
# In case checker_command has exactly one % operator
526
command = self.checker_command % self.host
527
except TypeError:
528
# Escape attributes for the shell
529
escaped_attrs = dict(
530
(attr,
531
re.escape(unicode(str(getattr(self, attr, "")),
532
errors=
533
'replace')))
534
for attr in
535
self.runtime_expansions)
536
537
try:
538
command = self.checker_command % escaped_attrs
539
except TypeError as error:
540
logger.error('Could not format string "%s":'
541
' %s', self.checker_command, error)
542
return True # Try again later
701
command = self.checker_command % escaped_attrs
702
except TypeError as error:
703
logger.error('Could not format string "%s"',
704
self.checker_command, exc_info=error)
705
return True # Try again later
543
706
self.current_checker_command = command
544
707
try:
545
708
logger.info("Starting checker %r for %s",
551
714
self.checker = subprocess.Popen(command,
552
715
close_fds=True,
553
716
shell=True, cwd="/")
554
self.checker_callback_tag = (gobject.child_watch_add
555
(self.checker.pid,
556
self.checker_callback,
557
data=command))
558
# The checker may have completed before the gobject
559
# watch was added. Check for this.
560
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
561
if pid:
562
gobject.source_remove(self.checker_callback_tag)
563
self.checker_callback(pid, status, command)
564
717
except OSError as error:
565
logger.error("Failed to start subprocess: %s",
566
error)
718
logger.error("Failed to start subprocess",
719
exc_info=error)
720
self.checker_callback_tag = (gobject.child_watch_add
721
(self.checker.pid,
722
self.checker_callback,
723
data=command))
724
# The checker may have completed before the gobject
725
# watch was added. Check for this.
726
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
if pid:
728
gobject.source_remove(self.checker_callback_tag)
729
self.checker_callback(pid, status, command)
567
730
# Re-run this periodically if run by gobject.timeout_add
568
731
return True
569
732
576
739
return
577
740
logger.debug("Stopping checker for %(name)s", vars(self))
578
741
try:
579
os.kill(self.checker.pid, signal.SIGTERM)
742
self.checker.terminate()
580
743
#time.sleep(0.5)
581
744
#if self.checker.poll() is None:
582
# os.kill(self.checker.pid, signal.SIGKILL)
745
# self.checker.kill()
583
746
except OSError as error:
584
747
if error.errno != errno.ESRCH: # No such process
585
748
raise
586
749
self.checker = None
587
750
588
# Encrypts a client secret and stores it in a varible encrypted_secret
589
def encrypt_secret(self, key):
590
# Encryption-key need to be specific size, so we hash inputed key
591
hasheng = hashlib.sha256()
592
hasheng.update(key)
593
encryptionkey = hasheng.digest()
594
595
# Create validation hash so we know at decryption if it was sucessful
596
hasheng = hashlib.sha256()
597
hasheng.update(self.secret)
598
validationhash = hasheng.digest()
599
600
# Encrypt secret
601
iv = os.urandom(Crypto.Cipher.AES.block_size)
602
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
603
Crypto.Cipher.AES.MODE_CFB, iv)
604
ciphertext = ciphereng.encrypt(validationhash+self.secret)
605
self.encrypted_secret = (ciphertext, iv)
606
607
# Decrypt a encrypted client secret
608
def decrypt_secret(self, key):
609
# Decryption-key need to be specific size, so we hash inputed key
610
hasheng = hashlib.sha256()
611
hasheng.update(key)
612
encryptionkey = hasheng.digest()
613
614
# Decrypt encrypted secret
615
ciphertext, iv = self.encrypted_secret
616
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
617
Crypto.Cipher.AES.MODE_CFB, iv)
618
plain = ciphereng.decrypt(ciphertext)
619
620
# Validate decrypted secret to know if it was succesful
621
hasheng = hashlib.sha256()
622
validationhash = plain[:hasheng.digest_size]
623
secret = plain[hasheng.digest_size:]
624
hasheng.update(secret)
625
626
# if validation fails, we use key as new secret. Otherwhise, we use
627
# the decrypted secret
628
if hasheng.digest() == validationhash:
629
self.secret = secret
630
else:
631
self.secret = key
632
del self.encrypted_secret
633
634
751
635
752
def dbus_service_property(dbus_interface, signature="v",
636
753
access="readwrite", byte_arrays=False):
648
765
# "Set" method, so we fail early here:
649
766
if byte_arrays and signature != "ay":
650
767
raise ValueError("Byte arrays not supported for non-'ay'"
651
" signature %r" % signature)
768
" signature {0!r}".format(signature))
652
769
def decorator(func):
653
770
func._dbus_is_property = True
654
771
func._dbus_interface = dbus_interface
662
779
return decorator
663
780
664
781
782
def dbus_interface_annotations(dbus_interface):
783
"""Decorator for marking functions returning interface annotations
784
785
Usage:
786
787
@dbus_interface_annotations("org.example.Interface")
788
def _foo(self): # Function name does not matter
789
return {"org.freedesktop.DBus.Deprecated": "true",
790
"org.freedesktop.DBus.Property.EmitsChangedSignal":
791
"false"}
792
"""
793
def decorator(func):
794
func._dbus_is_interface = True
795
func._dbus_interface = dbus_interface
796
func._dbus_name = dbus_interface
797
return func
798
return decorator
799
800
801
def dbus_annotations(annotations):
802
"""Decorator to annotate D-Bus methods, signals or properties
803
Usage:
804
805
@dbus_service_property("org.example.Interface", signature="b",
806
access="r")
807
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
"org.freedesktop.DBus.Property."
809
"EmitsChangedSignal": "false"})
810
def Property_dbus_property(self):
811
return dbus.Boolean(False)
812
"""
813
def decorator(func):
814
func._dbus_annotations = annotations
815
return func
816
return decorator
817
818
665
819
class DBusPropertyException(dbus.exceptions.DBusException):
666
820
"""A base class for D-Bus property-related exceptions
667
821
"""
690
844
"""
691
845
692
846
@staticmethod
693
def _is_dbus_property(obj):
694
return getattr(obj, "_dbus_is_property", False)
847
def _is_dbus_thing(thing):
848
"""Returns a function testing if an attribute is a D-Bus thing
849
850
If called like _is_dbus_thing("method") it returns a function
851
suitable for use as predicate to inspect.getmembers().
852
"""
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
854
False)
695
855
696
def _get_all_dbus_properties(self):
856
def _get_all_dbus_things(self, thing):
697
857
"""Returns a generator of (name, attribute) pairs
698
858
"""
699
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
859
return ((getattr(athing.__get__(self), "_dbus_name",
860
name),
861
athing.__get__(self))
700
862
for cls in self.__class__.__mro__
701
for name, prop in
702
inspect.getmembers(cls, self._is_dbus_property))
863
for name, athing in
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
703
866
704
867
def _get_dbus_property(self, interface_name, property_name):
705
868
"""Returns a bound method if one exists which is a D-Bus
707
870
"""
708
871
for cls in self.__class__.__mro__:
709
872
for name, value in (inspect.getmembers
710
(cls, self._is_dbus_property)):
873
(cls,
874
self._is_dbus_thing("property"))):
711
875
if (value._dbus_name == property_name
712
876
and value._dbus_interface == interface_name):
713
877
return value.__get__(self)
742
906
# signatures other than "ay".
743
907
if prop._dbus_signature != "ay":
744
908
raise ValueError
745
value = dbus.ByteArray(''.join(unichr(byte)
746
for byte in value))
909
value = dbus.ByteArray(b''.join(chr(byte)
910
for byte in value))
747
911
prop(value)
748
912
749
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
754
918
755
919
Note: Will not include properties with access="write".
756
920
"""
757
all = {}
758
for name, prop in self._get_all_dbus_properties():
921
properties = {}
922
for name, prop in self._get_all_dbus_things("property"):
759
923
if (interface_name
760
924
and interface_name != prop._dbus_interface):
761
925
# Interface non-empty but did not match
765
929
continue
766
930
value = prop()
767
931
if not hasattr(value, "variant_level"):
768
all[name] = value
932
properties[name] = value
769
933
continue
770
all[name] = type(value)(value, variant_level=
771
value.variant_level+1)
772
return dbus.Dictionary(all, signature="sv")
934
properties[name] = type(value)(value, variant_level=
935
value.variant_level+1)
936
return dbus.Dictionary(properties, signature="sv")
773
937
774
938
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
775
939
out_signature="s",
776
940
path_keyword='object_path',
777
941
connection_keyword='connection')
778
942
def Introspect(self, object_path, connection):
779
"""Standard D-Bus method, overloaded to insert property tags.
943
"""Overloading of standard D-Bus method.
944
945
Inserts property tags and interface annotation tags.
780
946
"""
781
947
xmlstring = dbus.service.Object.Introspect(self, object_path,
782
948
connection)
789
955
e.setAttribute("access", prop._dbus_access)
790
956
return e
791
957
for if_tag in document.getElementsByTagName("interface"):
958
# Add property tags
792
959
for tag in (make_tag(document, name, prop)
793
960
for name, prop
794
in self._get_all_dbus_properties()
961
in self._get_all_dbus_things("property")
795
962
if prop._dbus_interface
796
963
== if_tag.getAttribute("name")):
797
964
if_tag.appendChild(tag)
965
# Add annotation tags
966
for typ in ("method", "signal", "property"):
967
for tag in if_tag.getElementsByTagName(typ):
968
annots = dict()
969
for name, prop in (self.
970
_get_all_dbus_things(typ)):
971
if (name == tag.getAttribute("name")
972
and prop._dbus_interface
973
== if_tag.getAttribute("name")):
974
annots.update(getattr
975
(prop,
976
"_dbus_annotations",
977
{}))
978
for name, value in annots.iteritems():
979
ann_tag = document.createElement(
980
"annotation")
981
ann_tag.setAttribute("name", name)
982
ann_tag.setAttribute("value", value)
983
tag.appendChild(ann_tag)
984
# Add interface annotation tags
985
for annotation, value in dict(
986
itertools.chain.from_iterable(
987
annotations().iteritems()
988
for name, annotations in
989
self._get_all_dbus_things("interface")
990
if name == if_tag.getAttribute("name")
991
)).iteritems():
992
ann_tag = document.createElement("annotation")
993
ann_tag.setAttribute("name", annotation)
994
ann_tag.setAttribute("value", value)
995
if_tag.appendChild(ann_tag)
798
996
# Add the names to the return values for the
799
997
# "org.freedesktop.DBus.Properties" methods
800
998
if (if_tag.getAttribute("name")
815
1013
except (AttributeError, xml.dom.DOMException,
816
1014
xml.parsers.expat.ExpatError) as error:
817
1015
logger.error("Failed to override Introspection method",
818
error)
1016
exc_info=error)
819
1017
return xmlstring
820
1018
821
1019
822
def datetime_to_dbus (dt, variant_level=0):
1020
def datetime_to_dbus(dt, variant_level=0):
823
1021
"""Convert a UTC datetime.datetime() to a D-Bus type."""
824
1022
if dt is None:
825
1023
return dbus.String("", variant_level = variant_level)
826
1024
return dbus.String(dt.isoformat(),
827
1025
variant_level=variant_level)
828
1026
829
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
830
.__metaclass__):
831
"""Applied to an empty subclass of a D-Bus object, this metaclass
832
will add additional D-Bus attributes matching a certain pattern.
1027
1028
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1029
"""A class decorator; applied to a subclass of
1030
dbus.service.Object, it will add alternate D-Bus attributes with
1031
interface names according to the "alt_interface_names" mapping.
1032
Usage:
1033
1034
@alternate_dbus_interfaces({"org.example.Interface":
1035
"net.example.AlternateInterface"})
1036
class SampleDBusObject(dbus.service.Object):
1037
@dbus.service.method("org.example.Interface")
1038
def SampleDBusMethod():
1039
pass
1040
1041
The above "SampleDBusMethod" on "SampleDBusObject" will be
1042
reachable via two interfaces: "org.example.Interface" and
1043
"net.example.AlternateInterface", the latter of which will have
1044
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1045
"true", unless "deprecate" is passed with a False value.
1046
1047
This works for methods and signals, and also for D-Bus properties
1048
(from DBusObjectWithProperties) and interfaces (from the
1049
dbus_interface_annotations decorator).
833
1050
"""
834
def __new__(mcs, name, bases, attr):
835
# Go through all the base classes which could have D-Bus
836
# methods, signals, or properties in them
837
for base in (b for b in bases
838
if issubclass(b, dbus.service.Object)):
839
# Go though all attributes of the base class
840
for attrname, attribute in inspect.getmembers(base):
1051
def wrapper(cls):
1052
for orig_interface_name, alt_interface_name in (
1053
alt_interface_names.iteritems()):
1054
attr = {}
1055
interface_names = set()
1056
# Go though all attributes of the class
1057
for attrname, attribute in inspect.getmembers(cls):
841
1058
# Ignore non-D-Bus attributes, and D-Bus attributes
842
1059
# with the wrong interface name
843
1060
if (not hasattr(attribute, "_dbus_interface")
844
1061
or not attribute._dbus_interface
845
.startswith("se.recompile.Mandos")):
1062
.startswith(orig_interface_name)):
846
1063
continue
847
1064
# Create an alternate D-Bus interface name based on
848
1065
# the current name
849
1066
alt_interface = (attribute._dbus_interface
850
.replace("se.recompile.Mandos",
851
"se.bsnet.fukt.Mandos"))
1067
.replace(orig_interface_name,
1068
alt_interface_name))
1069
interface_names.add(alt_interface)
852
1070
# Is this a D-Bus signal?
853
1071
if getattr(attribute, "_dbus_is_signal", False):
854
1072
# Extract the original non-method function by
869
1087
nonmethod_func.func_name,
870
1088
nonmethod_func.func_defaults,
871
1089
nonmethod_func.func_closure)))
1090
# Copy annotations, if any
1091
try:
1092
new_function._dbus_annotations = (
1093
dict(attribute._dbus_annotations))
1094
except AttributeError:
1095
pass
872
1096
# Define a creator of a function to call both the
873
# old and new functions, so both the old and new
874
# signals gets sent when the function is called
1097
# original and alternate functions, so both the
1098
# original and alternate signals gets sent when
1099
# the function is called
875
1100
def fixscope(func1, func2):
876
1101
"""This function is a scope container to pass
877
1102
func1 and func2 to the "call_both" function
884
1109
return call_both
885
1110
# Create the "call_both" function and add it to
886
1111
# the class
887
attr[attrname] = fixscope(attribute,
888
new_function)
1112
attr[attrname] = fixscope(attribute, new_function)
889
1113
# Is this a D-Bus method?
890
1114
elif getattr(attribute, "_dbus_is_method", False):
891
1115
# Create a new, but exactly alike, function
902
1126
attribute.func_name,
903
1127
attribute.func_defaults,
904
1128
attribute.func_closure)))
1129
# Copy annotations, if any
1130
try:
1131
attr[attrname]._dbus_annotations = (
1132
dict(attribute._dbus_annotations))
1133
except AttributeError:
1134
pass
905
1135
# Is this a D-Bus property?
906
1136
elif getattr(attribute, "_dbus_is_property", False):
907
1137
# Create a new, but exactly alike, function
921
1151
attribute.func_name,
922
1152
attribute.func_defaults,
923
1153
attribute.func_closure)))
924
return type.__new__(mcs, name, bases, attr)
925
1154
# Copy annotations, if any
1155
try:
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1158
except AttributeError:
1159
pass
1160
# Is this a D-Bus interface?
1161
elif getattr(attribute, "_dbus_is_interface", False):
1162
# Create a new, but exactly alike, function
1163
# object. Decorate it to be a new D-Bus interface
1164
# with the alternate D-Bus interface name. Add it
1165
# to the class.
1166
attr[attrname] = (dbus_interface_annotations
1167
(alt_interface)
1168
(types.FunctionType
1169
(attribute.func_code,
1170
attribute.func_globals,
1171
attribute.func_name,
1172
attribute.func_defaults,
1173
attribute.func_closure)))
1174
if deprecate:
1175
# Deprecate all alternate interfaces
1176
iname="_AlternateDBusNames_interface_annotation{0}"
1177
for interface_name in interface_names:
1178
@dbus_interface_annotations(interface_name)
1179
def func(self):
1180
return { "org.freedesktop.DBus.Deprecated":
1181
"true" }
1182
# Find an unused name
1183
for aname in (iname.format(i)
1184
for i in itertools.count()):
1185
if aname not in attr:
1186
attr[aname] = func
1187
break
1188
if interface_names:
1189
# Replace the class with a new subclass of it with
1190
# methods, signals, etc. as created above.
1191
cls = type(b"{0}Alternate".format(cls.__name__),
1192
(cls,), attr)
1193
return cls
1194
return wrapper
1195
1196
1197
@alternate_dbus_interfaces({"se.recompile.Mandos":
1198
"se.bsnet.fukt.Mandos"})
926
1199
class ClientDBus(Client, DBusObjectWithProperties):
927
1200
"""A Client class using D-Bus
928
1201
939
1212
def __init__(self, bus = None, *args, **kwargs):
940
1213
self.bus = bus
941
1214
Client.__init__(self, *args, **kwargs)
942
943
self._approvals_pending = 0
944
1215
# Only now, when this client is initialized, can it show up on
945
1216
# the D-Bus
946
1217
client_object_name = unicode(self.name).translate(
950
1221
("/clients/" + client_object_name))
951
1222
DBusObjectWithProperties.__init__(self, self.bus,
952
1223
self.dbus_object_path)
953
1224
954
1225
def notifychangeproperty(transform_func,
955
1226
dbus_name, type_func=lambda x: x,
956
1227
variant_level=1):
957
1228
""" Modify a variable so that it's a property which announces
958
1229
its changes to DBus.
959
1230
960
1231
transform_fun: Function that takes a value and a variant_level
961
1232
and transforms it to a D-Bus type.
962
1233
dbus_name: D-Bus name of the variable
979
1250
980
1251
return property(lambda self: getattr(self, attrname), setter)
981
1252
982
983
1253
expires = notifychangeproperty(datetime_to_dbus, "Expires")
984
1254
approvals_pending = notifychangeproperty(dbus.Boolean,
985
1255
"ApprovalPending",
992
1262
checker is not None)
993
1263
last_checked_ok = notifychangeproperty(datetime_to_dbus,
994
1264
"LastCheckedOK")
1265
last_checker_status = notifychangeproperty(dbus.Int16,
1266
"LastCheckerStatus")
995
1267
last_approval_request = notifychangeproperty(
996
1268
datetime_to_dbus, "LastApprovalRequest")
997
1269
approved_by_default = notifychangeproperty(dbus.Boolean,
998
1270
"ApprovedByDefault")
999
approval_delay = notifychangeproperty(dbus.UInt16,
1271
approval_delay = notifychangeproperty(dbus.UInt64,
1000
1272
"ApprovalDelay",
1001
1273
type_func =
1002
_timedelta_to_milliseconds)
1274
timedelta_to_milliseconds)
1003
1275
approval_duration = notifychangeproperty(
1004
dbus.UInt16, "ApprovalDuration",
1005
type_func = _timedelta_to_milliseconds)
1276
dbus.UInt64, "ApprovalDuration",
1277
type_func = timedelta_to_milliseconds)
1006
1278
host = notifychangeproperty(dbus.String, "Host")
1007
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1279
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1008
1280
type_func =
1009
_timedelta_to_milliseconds)
1281
timedelta_to_milliseconds)
1010
1282
extended_timeout = notifychangeproperty(
1011
dbus.UInt16, "ExtendedTimeout",
1012
type_func = _timedelta_to_milliseconds)
1013
interval = notifychangeproperty(dbus.UInt16,
1283
dbus.UInt64, "ExtendedTimeout",
1284
type_func = timedelta_to_milliseconds)
1285
interval = notifychangeproperty(dbus.UInt64,
1014
1286
"Interval",
1015
1287
type_func =
1016
_timedelta_to_milliseconds)
1288
timedelta_to_milliseconds)
1017
1289
checker_command = notifychangeproperty(dbus.String, "Checker")
1018
1290
1019
1291
del notifychangeproperty
1061
1333
return r
1062
1334
1063
1335
def _reset_approved(self):
1064
self._approved = None
1336
self.approved = None
1065
1337
return False
1066
1338
1067
1339
def approve(self, value=True):
1068
self.send_changedstate()
1069
self._approved = value
1070
gobject.timeout_add(_timedelta_to_milliseconds
1340
self.approved = value
1341
gobject.timeout_add(timedelta_to_milliseconds
1071
1342
(self.approval_duration),
1072
1343
self._reset_approved)
1073
1344
self.send_changedstate()
1074
1345
1075
1346
## D-Bus methods, signals & properties
1076
1347
_interface = "se.recompile.Mandos.Client"
1077
1348
1349
## Interfaces
1350
1351
@dbus_interface_annotations(_interface)
1352
def _foo(self):
1353
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
"false"}
1355
1078
1356
## Signals
1079
1357
1080
1358
# CheckerCompleted - signal
1179
1457
access="readwrite")
1180
1458
def ApprovalDuration_dbus_property(self, value=None):
1181
1459
if value is None: # get
1182
return dbus.UInt64(_timedelta_to_milliseconds(
1460
return dbus.UInt64(timedelta_to_milliseconds(
1183
1461
self.approval_duration))
1184
1462
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1185
1463
1199
1477
def Host_dbus_property(self, value=None):
1200
1478
if value is None: # get
1201
1479
return dbus.String(self.host)
1202
self.host = value
1480
self.host = unicode(value)
1203
1481
1204
1482
# Created - property
1205
1483
@dbus_service_property(_interface, signature="s", access="read")
1206
1484
def Created_dbus_property(self):
1207
return dbus.String(datetime_to_dbus(self.created))
1485
return datetime_to_dbus(self.created)
1208
1486
1209
1487
# LastEnabled - property
1210
1488
@dbus_service_property(_interface, signature="s", access="read")
1231
1509
return
1232
1510
return datetime_to_dbus(self.last_checked_ok)
1233
1511
1512
# LastCheckerStatus - property
1513
@dbus_service_property(_interface, signature="n",
1514
access="read")
1515
def LastCheckerStatus_dbus_property(self):
1516
return dbus.Int16(self.last_checker_status)
1517
1234
1518
# Expires - property
1235
1519
@dbus_service_property(_interface, signature="s", access="read")
1236
1520
def Expires_dbus_property(self):
1247
1531
def Timeout_dbus_property(self, value=None):
1248
1532
if value is None: # get
1249
1533
return dbus.UInt64(self.timeout_milliseconds())
1534
old_timeout = self.timeout
1250
1535
self.timeout = datetime.timedelta(0, 0, 0, value)
1251
if getattr(self, "disable_initiator_tag", None) is None:
1252
return
1253
# Reschedule timeout
1254
gobject.source_remove(self.disable_initiator_tag)
1255
self.disable_initiator_tag = None
1256
self.expires = None
1257
time_to_die = _timedelta_to_milliseconds((self
1258
.last_checked_ok
1259
+ self.timeout)
1260
- datetime.datetime
1261
.utcnow())
1262
if time_to_die <= 0:
1263
# The timeout has passed
1264
self.disable()
1265
else:
1266
self.expires = (datetime.datetime.utcnow()
1267
+ datetime.timedelta(milliseconds =
1268
time_to_die))
1269
self.disable_initiator_tag = (gobject.timeout_add
1270
(time_to_die, self.disable))
1536
# Reschedule disabling
1537
if self.enabled:
1538
now = datetime.datetime.utcnow()
1539
self.expires += self.timeout - old_timeout
1540
if self.expires <= now:
1541
# The timeout has passed
1542
self.disable()
1543
else:
1544
if (getattr(self, "disable_initiator_tag", None)
1545
is None):
1546
return
1547
gobject.source_remove(self.disable_initiator_tag)
1548
self.disable_initiator_tag = (
1549
gobject.timeout_add(
1550
timedelta_to_milliseconds(self.expires - now),
1551
self.disable))
1271
1552
1272
1553
# ExtendedTimeout - property
1273
1554
@dbus_service_property(_interface, signature="t",
1286
1567
self.interval = datetime.timedelta(0, 0, 0, value)
1287
1568
if getattr(self, "checker_initiator_tag", None) is None:
1288
1569
return
1289
# Reschedule checker run
1290
gobject.source_remove(self.checker_initiator_tag)
1291
self.checker_initiator_tag = (gobject.timeout_add
1292
(value, self.start_checker))
1293
self.start_checker() # Start one now, too
1570
if self.enabled:
1571
# Reschedule checker run
1572
gobject.source_remove(self.checker_initiator_tag)
1573
self.checker_initiator_tag = (gobject.timeout_add
1574
(value, self.start_checker))
1575
self.start_checker() # Start one now, too
1294
1576
1295
1577
# Checker - property
1296
1578
@dbus_service_property(_interface, signature="s",
1298
1580
def Checker_dbus_property(self, value=None):
1299
1581
if value is None: # get
1300
1582
return dbus.String(self.checker_command)
1301
self.checker_command = value
1583
self.checker_command = unicode(value)
1302
1584
1303
1585
# CheckerRunning - property
1304
1586
@dbus_service_property(_interface, signature="b",
1333
1615
raise KeyError()
1334
1616
1335
1617
def __getattribute__(self, name):
1336
if(name == '_pipe'):
1618
if name == '_pipe':
1337
1619
return super(ProxyClient, self).__getattribute__(name)
1338
1620
self._pipe.send(('getattr', name))
1339
1621
data = self._pipe.recv()
1346
1628
return func
1347
1629
1348
1630
def __setattr__(self, name, value):
1349
if(name == '_pipe'):
1631
if name == '_pipe':
1350
1632
return super(ProxyClient, self).__setattr__(name, value)
1351
1633
self._pipe.send(('setattr', name, value))
1352
1634
1353
class ClientDBusTransitional(ClientDBus):
1354
__metaclass__ = AlternateDBusNamesMetaclass
1355
1635
1356
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
1357
1637
"""A class to handle client connections.
1440
1720
client.Rejected("Disabled")
1441
1721
return
1442
1722
1443
if client._approved or not client.approval_delay:
1723
if client.approved or not client.approval_delay:
1444
1724
#We are approved or approval is disabled
1445
1725
break
1446
elif client._approved is None:
1726
elif client.approved is None:
1447
1727
logger.info("Client %s needs approval",
1448
1728
client.name)
1449
1729
if self.server.use_dbus:
1462
1742
#wait until timeout or approved
1463
1743
time = datetime.datetime.now()
1464
1744
client.changedstate.acquire()
1465
(client.changedstate.wait
1466
(float(client._timedelta_to_milliseconds(delay)
1467
/ 1000)))
1745
client.changedstate.wait(
1746
float(timedelta_to_milliseconds(delay)
1747
/ 1000))
1468
1748
client.changedstate.release()
1469
1749
time2 = datetime.datetime.now()
1470
1750
if (time2 - time) >= delay:
1486
1766
try:
1487
1767
sent = session.send(client.secret[sent_size:])
1488
1768
except gnutls.errors.GNUTLSError as error:
1489
logger.warning("gnutls send failed")
1769
logger.warning("gnutls send failed",
1770
exc_info=error)
1490
1771
return
1491
1772
logger.debug("Sent: %d, remaining: %d",
1492
1773
sent, len(client.secret)
1495
1776
1496
1777
logger.info("Sending secret to %s", client.name)
1497
1778
# bump the timeout using extended_timeout
1498
client.checked_ok(client.extended_timeout)
1779
client.bump_timeout(client.extended_timeout)
1499
1780
if self.server.use_dbus:
1500
1781
# Emit D-Bus signal
1501
1782
client.GotSecret()
1506
1787
try:
1507
1788
session.bye()
1508
1789
except gnutls.errors.GNUTLSError as error:
1509
logger.warning("GnuTLS bye failed")
1790
logger.warning("GnuTLS bye failed",
1791
exc_info=error)
1510
1792
1511
1793
@staticmethod
1512
1794
def peer_certificate(session):
1568
1850
# Convert the buffer to a Python bytestring
1569
1851
fpr = ctypes.string_at(buf, buf_len.value)
1570
1852
# Convert the bytestring to hexadecimal notation
1571
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1853
hex_fpr = binascii.hexlify(fpr).upper()
1572
1854
return hex_fpr
1573
1855
1574
1856
1577
1859
def sub_process_main(self, request, address):
1578
1860
try:
1579
1861
self.finish_request(request, address)
1580
except:
1862
except Exception:
1581
1863
self.handle_error(request, address)
1582
1864
self.close_request(request)
1583
1865
1584
1866
def process_request(self, request, address):
1585
1867
"""Start a new process to process the request."""
1586
1868
proc = multiprocessing.Process(target = self.sub_process_main,
1587
args = (request,
1588
address))
1869
args = (request, address))
1589
1870
proc.start()
1590
1871
return proc
1591
1872
1619
1900
use_ipv6: Boolean; to use IPv6 or not
1620
1901
"""
1621
1902
def __init__(self, server_address, RequestHandlerClass,
1622
interface=None, use_ipv6=True):
1903
interface=None, use_ipv6=True, socketfd=None):
1904
"""If socketfd is set, use that file descriptor instead of
1905
creating a new one with socket.socket().
1906
"""
1623
1907
self.interface = interface
1624
1908
if use_ipv6:
1625
1909
self.address_family = socket.AF_INET6
1910
if socketfd is not None:
1911
# Save the file descriptor
1912
self.socketfd = socketfd
1913
# Save the original socket.socket() function
1914
self.socket_socket = socket.socket
1915
# To implement --socket, we monkey patch socket.socket.
1916
#
1917
# (When socketserver.TCPServer is a new-style class, we
1918
# could make self.socket into a property instead of monkey
1919
# patching socket.socket.)
1920
#
1921
# Create a one-time-only replacement for socket.socket()
1922
@functools.wraps(socket.socket)
1923
def socket_wrapper(*args, **kwargs):
1924
# Restore original function so subsequent calls are
1925
# not affected.
1926
socket.socket = self.socket_socket
1927
del self.socket_socket
1928
# This time only, return a new socket object from the
1929
# saved file descriptor.
1930
return socket.fromfd(self.socketfd, *args, **kwargs)
1931
# Replace socket.socket() function with wrapper
1932
socket.socket = socket_wrapper
1933
# The socketserver.TCPServer.__init__ will call
1934
# socket.socket(), which might be our replacement,
1935
# socket_wrapper(), if socketfd was set.
1626
1936
socketserver.TCPServer.__init__(self, server_address,
1627
1937
RequestHandlerClass)
1938
1628
1939
def server_bind(self):
1629
1940
"""This overrides the normal server_bind() function
1630
1941
to bind to an interface if one was specified, and also NOT to
1638
1949
try:
1639
1950
self.socket.setsockopt(socket.SOL_SOCKET,
1640
1951
SO_BINDTODEVICE,
1641
str(self.interface
1642
+ '\0'))
1952
str(self.interface + '\0'))
1643
1953
except socket.error as error:
1644
if error[0] == errno.EPERM:
1645
logger.error("No permission to"
1646
" bind to interface %s",
1647
self.interface)
1648
elif error[0] == errno.ENOPROTOOPT:
1954
if error.errno == errno.EPERM:
1955
logger.error("No permission to bind to"
1956
" interface %s", self.interface)
1957
elif error.errno == errno.ENOPROTOOPT:
1649
1958
logger.error("SO_BINDTODEVICE not available;"
1650
1959
" cannot bind to interface %s",
1651
1960
self.interface)
1961
elif error.errno == errno.ENODEV:
1962
logger.error("Interface %s does not exist,"
1963
" cannot bind", self.interface)
1652
1964
else:
1653
1965
raise
1654
1966
# Only bind(2) the socket if we really need to.
1684
1996
"""
1685
1997
def __init__(self, server_address, RequestHandlerClass,
1686
1998
interface=None, use_ipv6=True, clients=None,
1687
gnutls_priority=None, use_dbus=True):
1999
gnutls_priority=None, use_dbus=True, socketfd=None):
1688
2000
self.enabled = False
1689
2001
self.clients = clients
1690
2002
if self.clients is None:
1694
2006
IPv6_TCPServer.__init__(self, server_address,
1695
2007
RequestHandlerClass,
1696
2008
interface = interface,
1697
use_ipv6 = use_ipv6)
2009
use_ipv6 = use_ipv6,
2010
socketfd = socketfd)
1698
2011
def server_activate(self):
1699
2012
if self.enabled:
1700
2013
return socketserver.TCPServer.server_activate(self)
1713
2026
1714
2027
def handle_ipc(self, source, condition, parent_pipe=None,
1715
2028
proc = None, client_object=None):
1716
condition_names = {
1717
gobject.IO_IN: "IN", # There is data to read.
1718
gobject.IO_OUT: "OUT", # Data can be written (without
1719
# blocking).
1720
gobject.IO_PRI: "PRI", # There is urgent data to read.
1721
gobject.IO_ERR: "ERR", # Error condition.
1722
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1723
# broken, usually for pipes and
1724
# sockets).
1725
}
1726
conditions_string = ' | '.join(name
1727
for cond, name in
1728
condition_names.iteritems()
1729
if cond & condition)
1730
2029
# error, or the other end of multiprocessing.Pipe has closed
1731
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2030
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1732
2031
# Wait for other process to exit
1733
2032
proc.join()
1734
2033
return False
1792
2091
return True
1793
2092
1794
2093
2094
def rfc3339_duration_to_delta(duration):
2095
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2096
2097
>>> rfc3339_duration_to_delta("P7D")
2098
datetime.timedelta(7)
2099
>>> rfc3339_duration_to_delta("PT60S")
2100
datetime.timedelta(0, 60)
2101
>>> rfc3339_duration_to_delta("PT60M")
2102
datetime.timedelta(0, 3600)
2103
>>> rfc3339_duration_to_delta("PT24H")
2104
datetime.timedelta(1)
2105
>>> rfc3339_duration_to_delta("P1W")
2106
datetime.timedelta(7)
2107
>>> rfc3339_duration_to_delta("PT5M30S")
2108
datetime.timedelta(0, 330)
2109
>>> rfc3339_duration_to_delta("P1DT3M20S")
2110
datetime.timedelta(1, 200)
2111
"""
2112
2113
# Parsing an RFC 3339 duration with regular expressions is not
2114
# possible - there would have to be multiple places for the same
2115
# values, like seconds. The current code, while more esoteric, is
2116
# cleaner without depending on a parsing library. If Python had a
2117
# built-in library for parsing we would use it, but we'd like to
2118
# avoid excessive use of external libraries.
2119
2120
# New type for defining tokens, syntax, and semantics all-in-one
2121
Token = collections.namedtuple("Token",
2122
("regexp", # To match token; if
2123
# "value" is not None,
2124
# must have a "group"
2125
# containing digits
2126
"value", # datetime.timedelta or
2127
# None
2128
"followers")) # Tokens valid after
2129
# this token
2130
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
# the "duration" ABNF definition in RFC 3339, Appendix A.
2132
token_end = Token(re.compile(r"$"), None, frozenset())
2133
token_second = Token(re.compile(r"(\d+)S"),
2134
datetime.timedelta(seconds=1),
2135
frozenset((token_end,)))
2136
token_minute = Token(re.compile(r"(\d+)M"),
2137
datetime.timedelta(minutes=1),
2138
frozenset((token_second, token_end)))
2139
token_hour = Token(re.compile(r"(\d+)H"),
2140
datetime.timedelta(hours=1),
2141
frozenset((token_minute, token_end)))
2142
token_time = Token(re.compile(r"T"),
2143
None,
2144
frozenset((token_hour, token_minute,
2145
token_second)))
2146
token_day = Token(re.compile(r"(\d+)D"),
2147
datetime.timedelta(days=1),
2148
frozenset((token_time, token_end)))
2149
token_month = Token(re.compile(r"(\d+)M"),
2150
datetime.timedelta(weeks=4),
2151
frozenset((token_day, token_end)))
2152
token_year = Token(re.compile(r"(\d+)Y"),
2153
datetime.timedelta(weeks=52),
2154
frozenset((token_month, token_end)))
2155
token_week = Token(re.compile(r"(\d+)W"),
2156
datetime.timedelta(weeks=1),
2157
frozenset((token_end,)))
2158
token_duration = Token(re.compile(r"P"), None,
2159
frozenset((token_year, token_month,
2160
token_day, token_time,
2161
token_week))),
2162
# Define starting values
2163
value = datetime.timedelta() # Value so far
2164
found_token = None
2165
followers = frozenset(token_duration,) # Following valid tokens
2166
s = duration # String left to parse
2167
# Loop until end token is found
2168
while found_token is not token_end:
2169
# Search for any currently valid tokens
2170
for token in followers:
2171
match = token.regexp.match(s)
2172
if match is not None:
2173
# Token found
2174
if token.value is not None:
2175
# Value found, parse digits
2176
factor = int(match.group(1), 10)
2177
# Add to value so far
2178
value += factor * token.value
2179
# Strip token from string
2180
s = token.regexp.sub("", s, 1)
2181
# Go to found token
2182
found_token = token
2183
# Set valid next tokens
2184
followers = found_token.followers
2185
break
2186
else:
2187
# No currently valid tokens were found
2188
raise ValueError("Invalid RFC 3339 duration")
2189
# End token found
2190
return value
2191
2192
1795
2193
def string_to_delta(interval):
1796
2194
"""Parse a string and return a datetime.timedelta
1797
2195
1808
2206
>>> string_to_delta('5m 30s')
1809
2207
datetime.timedelta(0, 330)
1810
2208
"""
2209
2210
try:
2211
return rfc3339_duration_to_delta(interval)
2212
except ValueError:
2213
pass
2214
1811
2215
timevalue = datetime.timedelta(0)
1812
2216
for s in interval.split():
1813
2217
try:
1824
2228
elif suffix == "w":
1825
2229
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1826
2230
else:
1827
raise ValueError("Unknown suffix %r" % suffix)
2231
raise ValueError("Unknown suffix {0!r}"
2232
.format(suffix))
1828
2233
except (ValueError, IndexError) as e:
1829
2234
raise ValueError(*(e.args))
1830
2235
timevalue += delta
1831
2236
return timevalue
1832
2237
1833
2238
1834
def if_nametoindex(interface):
1835
"""Call the C function if_nametoindex(), or equivalent
1836
1837
Note: This function cannot accept a unicode string."""
1838
global if_nametoindex
1839
try:
1840
if_nametoindex = (ctypes.cdll.LoadLibrary
1841
(ctypes.util.find_library("c"))
1842
.if_nametoindex)
1843
except (OSError, AttributeError):
1844
logger.warning("Doing if_nametoindex the hard way")
1845
def if_nametoindex(interface):
1846
"Get an interface index the hard way, i.e. using fcntl()"
1847
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1848
with contextlib.closing(socket.socket()) as s:
1849
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1850
struct.pack(str("16s16x"),
1851
interface))
1852
interface_index = struct.unpack(str("I"),
1853
ifreq[16:20])[0]
1854
return interface_index
1855
return if_nametoindex(interface)
1856
1857
1858
2239
def daemon(nochdir = False, noclose = False):
1859
2240
"""See daemon(3). Standard BSD Unix function.
1860
2241
1868
2249
sys.exit()
1869
2250
if not noclose:
1870
2251
# Close all standard open file descriptors
1871
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2252
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1872
2253
if not stat.S_ISCHR(os.fstat(null).st_mode):
1873
2254
raise OSError(errno.ENODEV,
1874
"%s not a character device"
1875
% os.path.devnull)
2255
"{0} not a character device"
2256
.format(os.devnull))
1876
2257
os.dup2(null, sys.stdin.fileno())
1877
2258
os.dup2(null, sys.stdout.fileno())
1878
2259
os.dup2(null, sys.stderr.fileno())
1887
2268
1888
2269
parser = argparse.ArgumentParser()
1889
2270
parser.add_argument("-v", "--version", action="version",
1890
version = "%%(prog)s %s" % version,
2271
version = "%(prog)s {0}".format(version),
1891
2272
help="show version number and exit")
1892
2273
parser.add_argument("-i", "--interface", metavar="IF",
1893
2274
help="Bind to interface IF")
1916
2297
parser.add_argument("--no-ipv6", action="store_false",
1917
2298
dest="use_ipv6", help="Do not use IPv6")
1918
2299
parser.add_argument("--no-restore", action="store_false",
1919
dest="restore", help="Do not restore old state",
1920
default=True)
1921
2300
dest="restore", help="Do not restore stored"
2301
" state")
2302
parser.add_argument("--socket", type=int,
2303
help="Specify a file descriptor to a network"
2304
" socket to use instead of creating one")
2305
parser.add_argument("--statedir", metavar="DIR",
2306
help="Directory to save/restore state in")
2307
parser.add_argument("--foreground", action="store_true",
2308
help="Run in foreground")
2309
1922
2310
options = parser.parse_args()
1923
2311
1924
2312
if options.check:
1937
2325
"use_dbus": "True",
1938
2326
"use_ipv6": "True",
1939
2327
"debuglevel": "",
2328
"restore": "True",
2329
"socket": "",
2330
"statedir": "/var/lib/mandos",
2331
"foreground": "False",
1940
2332
}
1941
2333
1942
2334
# Parse config file for server-global settings
1947
2339
# Convert the SafeConfigParser object to a dict
1948
2340
server_settings = server_config.defaults()
1949
2341
# Use the appropriate methods on the non-string config options
1950
for option in ("debug", "use_dbus", "use_ipv6"):
2342
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1951
2343
server_settings[option] = server_config.getboolean("DEFAULT",
1952
2344
option)
1953
2345
if server_settings["port"]:
1954
2346
server_settings["port"] = server_config.getint("DEFAULT",
1955
2347
"port")
2348
if server_settings["socket"]:
2349
server_settings["socket"] = server_config.getint("DEFAULT",
2350
"socket")
2351
# Later, stdin will, and stdout and stderr might, be dup'ed
2352
# over with an opened os.devnull. But we don't want this to
2353
# happen with a supplied network socket.
2354
if 0 <= server_settings["socket"] <= 2:
2355
server_settings["socket"] = os.dup(server_settings
2356
["socket"])
1956
2357
del server_config
1957
2358
1958
2359
# Override the settings from the config file with command line
1959
2360
# options, if set.
1960
2361
for option in ("interface", "address", "port", "debug",
1961
2362
"priority", "servicename", "configdir",
1962
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2363
"use_dbus", "use_ipv6", "debuglevel", "restore",
2364
"statedir", "socket", "foreground"):
1963
2365
value = getattr(options, option)
1964
2366
if value is not None:
1965
2367
server_settings[option] = value
1968
2370
for option in server_settings.keys():
1969
2371
if type(server_settings[option]) is str:
1970
2372
server_settings[option] = unicode(server_settings[option])
2373
# Debug implies foreground
2374
if server_settings["debug"]:
2375
server_settings["foreground"] = True
1971
2376
# Now we have our good server settings in "server_settings"
1972
2377
1973
2378
##################################################################
1977
2382
debuglevel = server_settings["debuglevel"]
1978
2383
use_dbus = server_settings["use_dbus"]
1979
2384
use_ipv6 = server_settings["use_ipv6"]
2385
stored_state_path = os.path.join(server_settings["statedir"],
2386
stored_state_file)
2387
foreground = server_settings["foreground"]
2388
2389
if debug:
2390
initlogger(debug, logging.DEBUG)
2391
else:
2392
if not debuglevel:
2393
initlogger(debug)
2394
else:
2395
level = getattr(logging, debuglevel.upper())
2396
initlogger(debug, level)
1980
2397
1981
2398
if server_settings["servicename"] != "Mandos":
1982
2399
syslogger.setFormatter(logging.Formatter
1983
('Mandos (%s) [%%(process)d]:'
1984
' %%(levelname)s: %%(message)s'
1985
% server_settings["servicename"]))
2400
('Mandos ({0}) [%(process)d]:'
2401
' %(levelname)s: %(message)s'
2402
.format(server_settings
2403
["servicename"])))
1986
2404
1987
2405
# Parse config file with clients
1988
client_defaults = { "timeout": "5m",
1989
"extended_timeout": "15m",
1990
"interval": "2m",
1991
"checker": "fping -q -- %%(host)s",
1992
"host": "",
1993
"approval_delay": "0s",
1994
"approval_duration": "1s",
1995
}
1996
client_config = configparser.SafeConfigParser(client_defaults)
2406
client_config = configparser.SafeConfigParser(Client
2407
.client_defaults)
1997
2408
client_config.read(os.path.join(server_settings["configdir"],
1998
2409
"clients.conf"))
1999
2410
2008
2419
use_ipv6=use_ipv6,
2009
2420
gnutls_priority=
2010
2421
server_settings["priority"],
2011
use_dbus=use_dbus)
2012
if not debug:
2422
use_dbus=use_dbus,
2423
socketfd=(server_settings["socket"]
2424
or None))
2425
if not foreground:
2013
2426
pidfilename = "/var/run/mandos.pid"
2427
pidfile = None
2014
2428
try:
2015
2429
pidfile = open(pidfilename, "w")
2016
except IOError:
2017
logger.error("Could not open file %r", pidfilename)
2430
except IOError as e:
2431
logger.error("Could not open file %r", pidfilename,
2432
exc_info=e)
2018
2433
2019
try:
2020
uid = pwd.getpwnam("_mandos").pw_uid
2021
gid = pwd.getpwnam("_mandos").pw_gid
2022
except KeyError:
2434
for name in ("_mandos", "mandos", "nobody"):
2023
2435
try:
2024
uid = pwd.getpwnam("mandos").pw_uid
2025
gid = pwd.getpwnam("mandos").pw_gid
2436
uid = pwd.getpwnam(name).pw_uid
2437
gid = pwd.getpwnam(name).pw_gid
2438
break
2026
2439
except KeyError:
2027
try:
2028
uid = pwd.getpwnam("nobody").pw_uid
2029
gid = pwd.getpwnam("nobody").pw_gid
2030
except KeyError:
2031
uid = 65534
2032
gid = 65534
2440
continue
2441
else:
2442
uid = 65534
2443
gid = 65534
2033
2444
try:
2034
2445
os.setgid(gid)
2035
2446
os.setuid(uid)
2036
2447
except OSError as error:
2037
if error[0] != errno.EPERM:
2448
if error.errno != errno.EPERM:
2038
2449
raise error
2039
2450
2040
if not debug and not debuglevel:
2041
syslogger.setLevel(logging.WARNING)
2042
console.setLevel(logging.WARNING)
2043
if debuglevel:
2044
level = getattr(logging, debuglevel.upper())
2045
syslogger.setLevel(level)
2046
console.setLevel(level)
2047
2048
2451
if debug:
2049
2452
# Enable all possible GnuTLS debugging
2050
2453
2060
2463
.gnutls_global_set_log_function(debug_gnutls))
2061
2464
2062
2465
# Redirect stdin so all checkers get /dev/null
2063
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2466
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2064
2467
os.dup2(null, sys.stdin.fileno())
2065
2468
if null > 2:
2066
2469
os.close(null)
2067
else:
2068
# No console logging
2069
logger.removeHandler(console)
2070
2470
2071
2471
# Need to fork before connecting to D-Bus
2072
if not debug:
2472
if not foreground:
2073
2473
# Close all input and output, do double fork, etc.
2074
2474
daemon()
2075
2475
2476
# multiprocessing will use threads, so before we use gobject we
2477
# need to inform gobject that threads will be used.
2478
gobject.threads_init()
2479
2076
2480
global main_loop
2077
2481
# From the Avahi example code
2078
DBusGMainLoop(set_as_default=True )
2482
DBusGMainLoop(set_as_default=True)
2079
2483
main_loop = gobject.MainLoop()
2080
2484
bus = dbus.SystemBus()
2081
2485
# End of Avahi example code
2087
2491
("se.bsnet.fukt.Mandos", bus,
2088
2492
do_not_queue=True))
2089
2493
except dbus.exceptions.NameExistsException as e:
2090
logger.error(unicode(e) + ", disabling D-Bus")
2494
logger.error("Disabling D-Bus:", exc_info=e)
2091
2495
use_dbus = False
2092
2496
server_settings["use_dbus"] = False
2093
2497
tcp_server.use_dbus = False
2094
2498
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2095
service = AvahiService(name = server_settings["servicename"],
2096
servicetype = "_mandos._tcp",
2097
protocol = protocol, bus = bus)
2499
service = AvahiServiceToSyslog(name =
2500
server_settings["servicename"],
2501
servicetype = "_mandos._tcp",
2502
protocol = protocol, bus = bus)
2098
2503
if server_settings["interface"]:
2099
2504
service.interface = (if_nametoindex
2100
2505
(str(server_settings["interface"])))
2104
2509
2105
2510
client_class = Client
2106
2511
if use_dbus:
2107
client_class = functools.partial(ClientDBusTransitional,
2108
bus = bus)
2109
2110
special_settings = {
2111
# Some settings need to be accessd by special methods;
2112
# booleans need .getboolean(), etc. Here is a list of them:
2113
"approved_by_default":
2114
lambda section:
2115
client_config.getboolean(section, "approved_by_default"),
2116
}
2117
# Construct a new dict of client settings of this form:
2118
# { client_name: {setting_name: value, ...}, ...}
2119
# with exceptions for any special settings as defined above
2120
client_settings = dict((clientname,
2121
dict((setting,
2122
(value if setting not in special_settings
2123
else special_settings[setting](clientname)))
2124
for setting, value in client_config.items(clientname)))
2125
for clientname in client_config.sections())
2126
2512
client_class = functools.partial(ClientDBus, bus = bus)
2513
2514
client_settings = Client.config_parser(client_config)
2127
2515
old_client_settings = {}
2128
clients_data = []
2129
2516
clients_data = {}
2517
2518
# Get client data and settings from last running state.
2130
2519
if server_settings["restore"]:
2131
2520
try:
2132
2521
with open(stored_state_path, "rb") as stored_state:
2133
clients_data, old_client_settings = pickle.load(stored_state)
2522
clients_data, old_client_settings = (pickle.load
2523
(stored_state))
2134
2524
os.remove(stored_state_path)
2135
2525
except IOError as e:
2136
logger.warning("Could not load persistant state: {0}".format(e))
2137
if e.errno != errno.ENOENT:
2526
if e.errno == errno.ENOENT:
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
2529
else:
2530
logger.critical("Could not load persistent state:",
2531
exc_info=e)
2138
2532
raise
2139
2140
for client in clients_data:
2141
client_name = client["name"]
2142
2143
# Decide which value to use after restoring saved state.
2144
# We have three different values: Old config file,
2145
# new config file, and saved state.
2146
# New config value takes precedence if it differs from old
2147
# config value, otherwise use saved state.
2148
for name, value in client_settings[client_name].items():
2533
except EOFError as e:
2534
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
2536
2537
with PGPEngine() as pgp:
2538
for client_name, client in clients_data.iteritems():
2539
# Decide which value to use after restoring saved state.
2540
# We have three different values: Old config file,
2541
# new config file, and saved state.
2542
# New config value takes precedence if it differs from old
2543
# config value, otherwise use saved state.
2544
for name, value in client_settings[client_name].items():
2545
try:
2546
# For each value in new config, check if it
2547
# differs from the old config value (Except for
2548
# the "secret" attribute)
2549
if (name != "secret" and
2550
value != old_client_settings[client_name]
2551
[name]):
2552
client[name] = value
2553
except KeyError:
2554
pass
2555
2556
# Clients who has passed its expire date can still be
2557
# enabled if its last checker was successful. Clients
2558
# whose checker succeeded before we stored its state is
2559
# assumed to have successfully run all checkers during
2560
# downtime.
2561
if client["enabled"]:
2562
if datetime.datetime.utcnow() >= client["expires"]:
2563
if not client["last_checked_ok"]:
2564
logger.warning(
2565
"disabling client {0} - Client never "
2566
"performed a successful checker"
2567
.format(client_name))
2568
client["enabled"] = False
2569
elif client["last_checker_status"] != 0:
2570
logger.warning(
2571
"disabling client {0} - Client "
2572
"last checker failed with error code {1}"
2573
.format(client_name,
2574
client["last_checker_status"]))
2575
client["enabled"] = False
2576
else:
2577
client["expires"] = (datetime.datetime
2578
.utcnow()
2579
+ client["timeout"])
2580
logger.debug("Last checker succeeded,"
2581
" keeping {0} enabled"
2582
.format(client_name))
2149
2583
try:
2150
# For each value in new config, check if it differs
2151
# from the old config value (Except for the "secret"
2152
# attribute)
2153
if name != "secret" and value != old_client_settings[client_name][name]:
2154
setattr(client, name, value)
2155
except KeyError:
2156
pass
2157
2158
# Clients who has passed its expire date, can still be enabled if its
2159
# last checker was sucessful. Clients who checkers failed before we
2160
# stored it state is asumed to had failed checker during downtime.
2161
if client["enabled"] and client["last_checked_ok"]:
2162
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2163
> client["interval"]):
2164
if client["last_checker_status"] != 0:
2165
client["enabled"] = False
2166
else:
2167
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2168
2169
client["changedstate"] = (multiprocessing_manager
2170
.Condition(multiprocessing_manager
2171
.Lock()))
2172
if use_dbus:
2173
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2174
tcp_server.clients[client_name] = new_client
2175
new_client.bus = bus
2176
for name, value in client.iteritems():
2177
setattr(new_client, name, value)
2178
client_object_name = unicode(client_name).translate(
2179
{ord("."): ord("_"),
2180
ord("-"): ord("_")})
2181
new_client.dbus_object_path = (dbus.ObjectPath
2182
("/clients/" + client_object_name))
2183
DBusObjectWithProperties.__init__(new_client,
2184
new_client.bus,
2185
new_client.dbus_object_path)
2186
else:
2187
tcp_server.clients[client_name] = Client.__new__(Client)
2188
for name, value in client.iteritems():
2189
setattr(tcp_server.clients[client_name], name, value)
2190
2191
tcp_server.clients[client_name].decrypt_secret(
2192
client_settings[client_name]["secret"])
2193
2194
# Create/remove clients based on new changes made to config
2195
for clientname in set(old_client_settings) - set(client_settings):
2196
del tcp_server.clients[clientname]
2197
for clientname in set(client_settings) - set(old_client_settings):
2198
tcp_server.clients[clientname] = (client_class(name = clientname,
2199
config =
2200
client_settings
2201
[clientname]))
2202
2203
2584
client["secret"] = (
2585
pgp.decrypt(client["encrypted_secret"],
2586
client_settings[client_name]
2587
["secret"]))
2588
except PGPError:
2589
# If decryption fails, we use secret from new settings
2590
logger.debug("Failed to decrypt {0} old secret"
2591
.format(client_name))
2592
client["secret"] = (
2593
client_settings[client_name]["secret"])
2594
2595
# Add/remove clients based on new changes made to config
2596
for client_name in (set(old_client_settings)
2597
- set(client_settings)):
2598
del clients_data[client_name]
2599
for client_name in (set(client_settings)
2600
- set(old_client_settings)):
2601
clients_data[client_name] = client_settings[client_name]
2602
2603
# Create all client objects
2604
for client_name, client in clients_data.iteritems():
2605
tcp_server.clients[client_name] = client_class(
2606
name = client_name, settings = client)
2607
2204
2608
if not tcp_server.clients:
2205
2609
logger.warning("No clients defined")
2206
2207
if not debug:
2208
try:
2209
with pidfile:
2210
pid = os.getpid()
2211
pidfile.write(str(pid) + "\n".encode("utf-8"))
2212
del pidfile
2213
except IOError:
2214
logger.error("Could not write to file %r with PID %d",
2215
pidfilename, pid)
2216
except NameError:
2217
# "pidfile" was never created
2218
pass
2610
2611
if not foreground:
2612
if pidfile is not None:
2613
try:
2614
with pidfile:
2615
pid = os.getpid()
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
2617
except IOError:
2618
logger.error("Could not write to file %r with PID %d",
2619
pidfilename, pid)
2620
del pidfile
2219
2621
del pidfilename
2220
2221
signal.signal(signal.SIGINT, signal.SIG_IGN)
2222
2622
2223
2623
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2224
2624
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2225
2625
2226
2626
if use_dbus:
2227
class MandosDBusService(dbus.service.Object):
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2629
class MandosDBusService(DBusObjectWithProperties):
2228
2630
"""A D-Bus proxy object"""
2229
2631
def __init__(self):
2230
2632
dbus.service.Object.__init__(self, bus, "/")
2231
2633
_interface = "se.recompile.Mandos"
2232
2634
2635
@dbus_interface_annotations(_interface)
2636
def _foo(self):
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
2639
"false"}
2640
2233
2641
@dbus.service.signal(_interface, signature="o")
2234
2642
def ClientAdded(self, objpath):
2235
2643
"D-Bus signal"
2277
2685
2278
2686
del _interface
2279
2687
2280
class MandosDBusServiceTransitional(MandosDBusService):
2281
__metaclass__ = AlternateDBusNamesMetaclass
2282
mandos_dbus_service = MandosDBusServiceTransitional()
2688
mandos_dbus_service = MandosDBusService()
2283
2689
2284
2690
def cleanup():
2285
2691
"Cleanup function; run on exit"
2288
2694
multiprocessing.active_children()
2289
2695
if not (tcp_server.clients or client_settings):
2290
2696
return
2291
2292
# Store client before exiting. Secrets are encrypted with key based
2293
# on what config file has. If config file is removed/edited, old
2294
# secret will thus be unrecovable.
2295
clients = []
2296
for client in tcp_server.clients.itervalues():
2297
client.encrypt_secret(client_settings[client.name]["secret"])
2298
2299
client_dict = {}
2300
2301
# A list of attributes that will not be stored when shuting down.
2302
exclude = set(("bus", "changedstate", "secret"))
2303
for name, typ in inspect.getmembers(dbus.service.Object):
2304
exclude.add(name)
2305
2306
client_dict["encrypted_secret"] = client.encrypted_secret
2307
for attr in client.client_structure:
2308
if attr not in exclude:
2309
client_dict[attr] = getattr(client, attr)
2310
2311
clients.append(client_dict)
2312
del client_settings[client.name]["secret"]
2313
2697
2698
# Store client before exiting. Secrets are encrypted with key
2699
# based on what config file has. If config file is
2700
# removed/edited, old secret will thus be unrecovable.
2701
clients = {}
2702
with PGPEngine() as pgp:
2703
for client in tcp_server.clients.itervalues():
2704
key = client_settings[client.name]["secret"]
2705
client.encrypted_secret = pgp.encrypt(client.secret,
2706
key)
2707
client_dict = {}
2708
2709
# A list of attributes that can not be pickled
2710
# + secret.
2711
exclude = set(("bus", "changedstate", "secret",
2712
"checker"))
2713
for name, typ in (inspect.getmembers
2714
(dbus.service.Object)):
2715
exclude.add(name)
2716
2717
client_dict["encrypted_secret"] = (client
2718
.encrypted_secret)
2719
for attr in client.client_structure:
2720
if attr not in exclude:
2721
client_dict[attr] = getattr(client, attr)
2722
2723
clients[client.name] = client_dict
2724
del client_settings[client.name]["secret"]
2725
2314
2726
try:
2315
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2727
with (tempfile.NamedTemporaryFile
2728
(mode='wb', suffix=".pickle", prefix='clients-',
2729
dir=os.path.dirname(stored_state_path),
2730
delete=False)) as stored_state:
2316
2731
pickle.dump((clients, client_settings), stored_state)
2317
except IOError as e:
2318
logger.warning("Could not save persistant state: {0}".format(e))
2319
if e.errno != errno.ENOENT:
2320
raise
2321
2732
tempname=stored_state.name
2733
os.rename(tempname, stored_state_path)
2734
except (IOError, OSError) as e:
2735
if not debug:
2736
try:
2737
os.remove(tempname)
2738
except NameError:
2739
pass
2740
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2741
logger.warning("Could not save persistent state: {0}"
2742
.format(os.strerror(e.errno)))
2743
else:
2744
logger.warning("Could not save persistent state:",
2745
exc_info=e)
2746
raise e
2747
2322
2748
# Delete all clients, and settings from config
2323
2749
while tcp_server.clients:
2324
2750
name, client = tcp_server.clients.popitem()
2329
2755
if use_dbus:
2330
2756
# Emit D-Bus signal
2331
2757
mandos_dbus_service.ClientRemoved(client
2332
.dbus_object_path,
2333
client.name)
2758
.dbus_object_path,
2759
client.name)
2334
2760
client_settings.clear()
2335
2761
2336
2762
atexit.register(cleanup)
2342
2768
# Need to initiate checking of clients
2343
2769
if client.enabled:
2344
2770
client.init_checker()
2345
2346
2771
2347
2772
tcp_server.enable()
2348
2773
tcp_server.server_activate()
2351
2776
service.port = tcp_server.socket.getsockname()[1]
2352
2777
if use_ipv6:
2353
2778
logger.info("Now listening on address %r, port %d,"
2354
" flowinfo %d, scope_id %d"
2355
% tcp_server.socket.getsockname())
2779
" flowinfo %d, scope_id %d",
2780
*tcp_server.socket.getsockname())
2356
2781
else: # IPv4
2357
logger.info("Now listening on address %r, port %d"
2358
% tcp_server.socket.getsockname())
2782
logger.info("Now listening on address %r, port %d",
2783
*tcp_server.socket.getsockname())
2359
2784
2360
2785
#service.interface = tcp_server.socket.getsockname()[3]
2361
2786
2364
2789
try:
2365
2790
service.activate()
2366
2791
except dbus.exceptions.DBusException as error:
2367
logger.critical("DBusException: %s", error)
2792
logger.critical("D-Bus Exception", exc_info=error)
2368
2793
cleanup()
2369
2794
sys.exit(1)
2370
2795
# End of Avahi example code
2377
2802
logger.debug("Starting main loop")
2378
2803
main_loop.run()
2379
2804
except AvahiError as error:
2380
logger.critical("AvahiError: %s", error)
2805
logger.critical("Avahi Error", exc_info=error)
2381
2806
cleanup()
2382
2807
sys.exit(1)
2383
2808
except KeyboardInterrupt:
2388
2813
# Must run before the D-Bus bus name gets deregistered
2389
2814
cleanup()
2390
2815
2391
2392
2816
if __name__ == '__main__':
2393
2817
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0