101
80
except ImportError:
102
81
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
108
stored_state_file = "clients.pickle"
110
logger = logging.getLogger()
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
116
except (OSError, AttributeError):
118
def if_nametoindex(interface):
119
"Get an interface index the hard way, i.e. using fcntl()"
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
with contextlib.closing(socket.socket()) as s:
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
125
return interface_index
128
def initlogger(debug, level=logging.WARNING):
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
syslogger.setFormatter(logging.Formatter
136
('Mandos [%(process)d]: %(levelname)s:'
138
logger.addHandler(syslogger)
141
console = logging.StreamHandler()
142
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
146
logger.addHandler(console)
147
logger.setLevel(level)
150
class PGPError(Exception):
151
"""Exception if encryption/decryption fails"""
155
class PGPEngine(object):
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
169
def __exit__(self, exc_type, exc_value, traceback):
177
if self.tempdir is not None:
178
# Delete contents of tempdir
179
for root, dirs, files in os.walk(self.tempdir,
181
for filename in files:
182
os.remove(os.path.join(root, filename))
184
os.rmdir(os.path.join(root, dirname))
186
os.rmdir(self.tempdir)
189
def password_encode(self, password):
190
# Passphrase can not be empty and can not contain newlines or
191
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
200
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
218
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
234
return decrypted_plaintext
86
logger = logging.Logger(u'mandos')
87
syslogger = (logging.handlers.SysLogHandler
88
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
address = "/dev/log"))
90
syslogger.setFormatter(logging.Formatter
91
(u'Mandos [%(process)d]: %(levelname)s:'
93
logger.addHandler(syslogger)
95
console = logging.StreamHandler()
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
99
logger.addHandler(console)
237
101
class AvahiError(Exception):
238
102
def __init__(self, value, *args, **kwargs):
239
103
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
104
super(AvahiError, self).__init__(value, *args, **kwargs)
105
def __unicode__(self):
106
return unicode(repr(self.value))
244
108
class AvahiServiceError(AvahiError):
248
111
class AvahiGroupError(AvahiError):
352
191
dbus.UInt16(self.port),
353
192
avahi.string_array_to_txt_array(self.TXT))
354
193
self.group.Commit()
356
194
def entry_group_state_changed(self, state, error):
357
195
"""Derived from the Avahi example code"""
358
logger.debug("Avahi entry group state change: %i", state)
196
logger.debug(u"Avahi state change: %i", state)
360
198
if state == avahi.ENTRY_GROUP_ESTABLISHED:
361
logger.debug("Zeroconf service established.")
199
logger.debug(u"Zeroconf service established.")
362
200
elif state == avahi.ENTRY_GROUP_COLLISION:
363
logger.info("Zeroconf service name collision.")
201
logger.warning(u"Zeroconf service name collision.")
365
203
elif state == avahi.ENTRY_GROUP_FAILURE:
366
logger.critical("Avahi: Error in group state changed %s",
368
raise AvahiGroupError("State changed: {!s}".format(error))
204
logger.critical(u"Avahi: Error in group state changed %s",
206
raise AvahiGroupError(u"State changed: %s"
370
208
def cleanup(self):
371
209
"""Derived from the Avahi example code"""
372
210
if self.group is not None:
375
except (dbus.exceptions.UnknownMethodException,
376
dbus.exceptions.DBusException):
378
212
self.group = None
381
def server_state_changed(self, state, error=None):
213
def server_state_changed(self, state):
382
214
"""Derived from the Avahi example code"""
383
logger.debug("Avahi server state change: %i", state)
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
390
if state in bad_states:
391
if bad_states[state] is not None:
393
logger.error(bad_states[state])
395
logger.error(bad_states[state] + ": %r", error)
215
if state == avahi.SERVER_COLLISION:
216
logger.error(u"Zeroconf server name collision")
397
218
elif state == avahi.SERVER_RUNNING:
401
logger.debug("Unknown state: %r", state)
403
logger.debug("Unknown state: %r: %r", state, error)
405
220
def activate(self):
406
221
"""Derived from the Avahi example code"""
407
222
if self.server is None:
408
223
self.server = dbus.Interface(
409
224
self.bus.get_object(avahi.DBUS_NAME,
410
avahi.DBUS_PATH_SERVER,
411
follow_name_owner_changes=True),
225
avahi.DBUS_PATH_SERVER),
412
226
avahi.DBUS_INTERFACE_SERVER)
413
self.server.connect_to_signal("StateChanged",
414
self.server_state_changed)
227
self.server.connect_to_signal(u"StateChanged",
228
self.server_state_changed)
415
229
self.server_state_changed(self.server.GetState())
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
420
"""Add the new name to the syslog messages"""
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
427
def call_pipe(connection, # : multiprocessing.Connection
428
func, *args, **kwargs):
429
"""This function is meant to be called by multiprocessing.Process
431
This function runs func(*args, **kwargs), and writes the resulting
432
return value on the provided multiprocessing.Connection.
434
connection.send(func(*args, **kwargs))
437
232
class Client(object):
438
233
"""A representation of a client host served by this server.
441
approved: bool(); 'None' if not yet approved/disapproved
442
approval_delay: datetime.timedelta(); Time to wait for approval
443
approval_duration: datetime.timedelta(); Duration of one approval
236
name: string; from the config file, used in log messages and
238
fingerprint: string (40 or 32 hexadecimal digits); used to
239
uniquely identify the client
240
secret: bytestring; sent verbatim (over TLS) to client
241
host: string; available for use by the checker command
242
created: datetime.datetime(); (UTC) object creation
243
last_enabled: datetime.datetime(); (UTC)
245
last_checked_ok: datetime.datetime(); (UTC) or None
246
timeout: datetime.timedelta(); How long from last_checked_ok
247
until this client is disabled
248
interval: datetime.timedelta(); How often to start a new checker
249
disable_hook: If set, called by disable() as disable_hook(self)
444
250
checker: subprocess.Popen(); a running checker process used
445
251
to see if the client lives.
446
252
'None' if no process is running.
447
checker_callback_tag: a gobject event source tag, or None
448
checker_command: string; External command which is run to check
449
if client lives. %() expansions are done at
253
checker_initiator_tag: a gobject event source tag, or None
254
disable_initiator_tag: - '' -
255
checker_callback_tag: - '' -
256
checker_command: string; External command which is run to check if
257
client lives. %() expansions are done at
450
258
runtime with vars(self) as dict, so that for
451
259
instance %(name)s can be used in the command.
452
checker_initiator_tag: a gobject event source tag, or None
453
created: datetime.datetime(); (UTC) object creation
454
client_structure: Object describing what attributes a client has
455
and is used for storing the client at exit
456
260
current_checker_command: string; current running checker_command
457
disable_initiator_tag: a gobject event source tag, or None
459
fingerprint: string (40 or 32 hexadecimal digits); used to
460
uniquely identify the client
461
host: string; available for use by the checker command
462
interval: datetime.timedelta(); How often to start a new checker
463
last_approval_request: datetime.datetime(); (UTC) or None
464
last_checked_ok: datetime.datetime(); (UTC) or None
465
last_checker_status: integer between 0 and 255 reflecting exit
466
status of last checker. -1 reflects crashed
467
checker, -2 means no checker completed yet.
468
last_checker_signal: The signal which killed the last checker, if
469
last_checker_status is -1
470
last_enabled: datetime.datetime(); (UTC) or None
471
name: string; from the config file, used in log messages and
473
secret: bytestring; sent verbatim (over TLS) to client
474
timeout: datetime.timedelta(); How long from last_checked_ok
475
until this client is disabled
476
extended_timeout: extra long timeout when secret has been sent
477
runtime_expansions: Allowed attributes for runtime expansion.
478
expires: datetime.datetime(); time (UTC) when a client will be
480
server_settings: The server_settings dict from main()
261
approved_delay: datetime.timedelta(); Time to wait for approval
262
_approved: bool(); 'None' if not yet approved/disapproved
263
approved_duration: datetime.timedelta(); Duration of one approval
483
runtime_expansions = ("approval_delay", "approval_duration",
484
"created", "enabled", "expires",
485
"fingerprint", "host", "interval",
486
"last_approval_request", "last_checked_ok",
487
"last_enabled", "name", "timeout")
490
"extended_timeout": "PT15M",
492
"checker": "fping -q -- %%(host)s",
494
"approval_delay": "PT0S",
495
"approval_duration": "PT1S",
496
"approved_by_default": "True",
501
def config_parser(config):
502
"""Construct a new dict of client settings of this form:
503
{ client_name: {setting_name: value, ...}, ...}
504
with exceptions for any special settings as defined above.
505
NOTE: Must be a pure function. Must return the same result
506
value given the same arguments.
509
for client_name in config.sections():
510
section = dict(config.items(client_name))
511
client = settings[client_name] = {}
513
client["host"] = section["host"]
514
# Reformat values from string types to Python types
515
client["approved_by_default"] = config.getboolean(
516
client_name, "approved_by_default")
517
client["enabled"] = config.getboolean(client_name,
520
# Uppercase and remove spaces from fingerprint for later
521
# comparison purposes with return value from the
522
# fingerprint() function
523
client["fingerprint"] = (section["fingerprint"].upper()
525
if "secret" in section:
526
client["secret"] = section["secret"].decode("base64")
527
elif "secfile" in section:
528
with open(os.path.expanduser(os.path.expandvars
529
(section["secfile"])),
531
client["secret"] = secfile.read()
533
raise TypeError("No secret or secfile for section {}"
535
client["timeout"] = string_to_delta(section["timeout"])
536
client["extended_timeout"] = string_to_delta(
537
section["extended_timeout"])
538
client["interval"] = string_to_delta(section["interval"])
539
client["approval_delay"] = string_to_delta(
540
section["approval_delay"])
541
client["approval_duration"] = string_to_delta(
542
section["approval_duration"])
543
client["checker_command"] = section["checker"]
544
client["last_approval_request"] = None
545
client["last_checked_ok"] = None
546
client["last_checker_status"] = -2
550
def __init__(self, settings, name = None, server_settings=None):
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
273
def timeout_milliseconds(self):
274
"Return the 'timeout' attribute in milliseconds"
275
return self._timedelta_to_milliseconds(self.timeout)
277
def interval_milliseconds(self):
278
"Return the 'interval' attribute in milliseconds"
279
return self._timedelta_to_milliseconds(self.interval)
281
def approved_delay_milliseconds(self):
282
return self._timedelta_to_milliseconds(self.approved_delay)
284
def __init__(self, name = None, disable_hook=None, config=None):
285
"""Note: the 'checker' key in 'config' sets the
286
'checker_command' attribute and *not* the 'checker'
552
if server_settings is None:
554
self.server_settings = server_settings
555
# adding all client settings
556
for setting, value in settings.items():
557
setattr(self, setting, value)
560
if not hasattr(self, "last_enabled"):
561
self.last_enabled = datetime.datetime.utcnow()
562
if not hasattr(self, "expires"):
563
self.expires = (datetime.datetime.utcnow()
291
logger.debug(u"Creating client %r", self.name)
292
# Uppercase and remove spaces from fingerprint for later
293
# comparison purposes with return value from the fingerprint()
295
self.fingerprint = (config[u"fingerprint"].upper()
297
logger.debug(u" Fingerprint: %s", self.fingerprint)
298
if u"secret" in config:
299
self.secret = config[u"secret"].decode(u"base64")
300
elif u"secfile" in config:
301
with open(os.path.expanduser(os.path.expandvars
302
(config[u"secfile"])),
304
self.secret = secfile.read()
566
self.last_enabled = None
569
logger.debug("Creating client %r", self.name)
570
logger.debug(" Fingerprint: %s", self.fingerprint)
571
self.created = settings.get("created",
572
datetime.datetime.utcnow())
574
# attributes specific for this server instance
306
#XXX Need to allow secret on demand!
307
raise TypeError(u"No secret or secfile for client %s"
309
self.host = config.get(u"host", u"")
310
self.created = datetime.datetime.utcnow()
312
self.last_enabled = None
313
self.last_checked_ok = None
314
self.timeout = string_to_delta(config[u"timeout"])
315
self.interval = string_to_delta(config[u"interval"])
316
self.disable_hook = disable_hook
575
317
self.checker = None
576
318
self.checker_initiator_tag = None
577
319
self.disable_initiator_tag = None
578
320
self.checker_callback_tag = None
321
self.checker_command = config[u"checker"]
579
322
self.current_checker_command = None
323
self.last_connect = None
581
324
self.approvals_pending = 0
582
self.changedstate = multiprocessing_manager.Condition(
583
multiprocessing_manager.Lock())
584
self.client_structure = [attr
585
for attr in self.__dict__.iterkeys()
586
if not attr.startswith("_")]
587
self.client_structure.append("client_structure")
589
for name, t in inspect.getmembers(
590
type(self), lambda obj: isinstance(obj, property)):
591
if not name.startswith("_"):
592
self.client_structure.append(name)
594
# Send notice to process children that client state has changed
325
self._approved = None
326
self.approved_by_default = config.get(u"approved_by_default",
328
self.approved_delay = string_to_delta(
329
config[u"approved_delay"])
330
self.approved_duration = string_to_delta(
331
config[u"approved_duration"])
332
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
595
334
def send_changedstate(self):
596
with self.changedstate:
597
self.changedstate.notify_all()
335
self.changedstate.acquire()
336
self.changedstate.notify_all()
337
self.changedstate.release()
599
339
def enable(self):
600
340
"""Start this client's checker and timeout hooks"""
601
if getattr(self, "enabled", False):
341
if getattr(self, u"enabled", False):
602
342
# Already enabled
604
self.expires = datetime.datetime.utcnow() + self.timeout
344
self.send_changedstate()
606
345
self.last_enabled = datetime.datetime.utcnow()
608
self.send_changedstate()
346
# Schedule a new checker to be started an 'interval' from now,
347
# and every interval from then on.
348
self.checker_initiator_tag = (gobject.timeout_add
349
(self.interval_milliseconds(),
351
# Schedule a disable() when 'timeout' has passed
352
self.disable_initiator_tag = (gobject.timeout_add
353
(self.timeout_milliseconds(),
356
# Also start a new checker *right now*.
610
359
def disable(self, quiet=True):
611
360
"""Disable this client."""
612
361
if not getattr(self, "enabled", False):
615
logger.info("Disabling client %s", self.name)
616
if getattr(self, "disable_initiator_tag", None) is not None:
364
self.send_changedstate()
366
logger.info(u"Disabling client %s", self.name)
367
if getattr(self, u"disable_initiator_tag", False):
617
368
gobject.source_remove(self.disable_initiator_tag)
618
369
self.disable_initiator_tag = None
620
if getattr(self, "checker_initiator_tag", None) is not None:
370
if getattr(self, u"checker_initiator_tag", False):
621
371
gobject.source_remove(self.checker_initiator_tag)
622
372
self.checker_initiator_tag = None
623
373
self.stop_checker()
374
if self.disable_hook:
375
self.disable_hook(self)
624
376
self.enabled = False
626
self.send_changedstate()
627
377
# Do not run this again if called by a gobject.timeout_add
630
380
def __del__(self):
381
self.disable_hook = None
633
def init_checker(self):
634
# Schedule a new checker to be started an 'interval' from now,
635
# and every interval from then on.
636
if self.checker_initiator_tag is not None:
637
gobject.source_remove(self.checker_initiator_tag)
638
self.checker_initiator_tag = gobject.timeout_add(
639
int(self.interval.total_seconds() * 1000),
641
# Schedule a disable() when 'timeout' has passed
642
if self.disable_initiator_tag is not None:
643
gobject.source_remove(self.disable_initiator_tag)
644
self.disable_initiator_tag = gobject.timeout_add(
645
int(self.timeout.total_seconds() * 1000), self.disable)
646
# Also start a new checker *right now*.
649
def checker_callback(self, source, condition, connection,
384
def checker_callback(self, pid, condition, command):
651
385
"""The checker has completed, so take appropriate actions."""
652
386
self.checker_callback_tag = None
653
387
self.checker = None
654
# Read return code from connection (see call_pipe)
655
returncode = connection.recv()
659
self.last_checker_status = returncode
660
self.last_checker_signal = None
661
if self.last_checker_status == 0:
662
logger.info("Checker for %(name)s succeeded",
388
if os.WIFEXITED(condition):
389
exitstatus = os.WEXITSTATUS(condition)
391
logger.info(u"Checker for %(name)s succeeded",
664
393
self.checked_ok()
666
logger.info("Checker for %(name)s failed", vars(self))
395
logger.info(u"Checker for %(name)s failed",
668
self.last_checker_status = -1
669
self.last_checker_signal = -returncode
670
logger.warning("Checker for %(name)s crashed?",
398
logger.warning(u"Checker for %(name)s crashed?",
674
401
def checked_ok(self):
675
"""Assert that the client has been seen, alive and well."""
402
"""Bump up the timeout for this client.
404
This should only be called when the client has been seen,
676
407
self.last_checked_ok = datetime.datetime.utcnow()
677
self.last_checker_status = 0
678
self.last_checker_signal = None
681
def bump_timeout(self, timeout=None):
682
"""Bump up the timeout for this client."""
684
timeout = self.timeout
685
if self.disable_initiator_tag is not None:
686
gobject.source_remove(self.disable_initiator_tag)
687
self.disable_initiator_tag = None
688
if getattr(self, "enabled", False):
689
self.disable_initiator_tag = gobject.timeout_add(
690
int(timeout.total_seconds() * 1000), self.disable)
691
self.expires = datetime.datetime.utcnow() + timeout
693
def need_approval(self):
694
self.last_approval_request = datetime.datetime.utcnow()
408
gobject.source_remove(self.disable_initiator_tag)
409
self.disable_initiator_tag = (gobject.timeout_add
410
(self.timeout_milliseconds(),
696
413
def start_checker(self):
697
414
"""Start a new checker subprocess if one is not running.
699
416
If a checker already exists, leave it running and do
701
418
# The reason for not killing a running checker is that if we
702
# did that, and if a checker (for some reason) started running
703
# slowly and taking more than 'interval' time, then the client
704
# would inevitably timeout, since no checker would get a
705
# chance to run to completion. If we instead leave running
419
# did that, then if a checker (for some reason) started
420
# running slowly and taking more than 'interval' time, the
421
# client would inevitably timeout, since no checker would get
422
# a chance to run to completion. If we instead leave running
706
423
# checkers alone, the checker would have to take more time
707
424
# than 'timeout' for the client to be disabled, which is as it
710
if self.checker is not None and not self.checker.is_alive():
711
logger.warning("Checker was not alive; joining")
427
# If a checker exists, make sure it is not a zombie
429
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
430
except (AttributeError, OSError), error:
431
if (isinstance(error, OSError)
432
and error.errno != errno.ECHILD):
436
logger.warning(u"Checker was a zombie")
437
gobject.source_remove(self.checker_callback_tag)
438
self.checker_callback(pid, status,
439
self.current_checker_command)
714
440
# Start a new checker if needed
715
441
if self.checker is None:
716
# Escape attributes for the shell
718
attr: re.escape(str(getattr(self, attr)))
719
for attr in self.runtime_expansions }
721
command = self.checker_command % escaped_attrs
722
except TypeError as error:
723
logger.error('Could not format string "%s"',
724
self.checker_command,
726
return True # Try again later
443
# In case checker_command has exactly one % operator
444
command = self.checker_command % self.host
446
# Escape attributes for the shell
447
escaped_attrs = dict((key,
448
re.escape(unicode(str(val),
452
vars(self).iteritems())
454
command = self.checker_command % escaped_attrs
455
except TypeError, error:
456
logger.error(u'Could not format string "%s":'
457
u' %s', self.checker_command, error)
458
return True # Try again later
727
459
self.current_checker_command = command
728
logger.info("Starting checker %r for %s", command,
730
# We don't need to redirect stdout and stderr, since
731
# in normal mode, that is already done by daemon(),
732
# and in debug mode we don't want to. (Stdin is
733
# always replaced by /dev/null.)
734
# The exception is when not debugging but nevertheless
735
# running in the foreground; use the previously
737
popen_args = { "close_fds": True,
740
if (not self.server_settings["debug"]
741
and self.server_settings["foreground"]):
742
popen_args.update({"stdout": wnull,
744
pipe = multiprocessing.Pipe(duplex = False)
745
self.checker = multiprocessing.Process(
747
args = (pipe[1], subprocess.call, command),
750
self.checker_callback_tag = gobject.io_add_watch(
751
pipe[0].fileno(), gobject.IO_IN,
752
self.checker_callback, pipe[0], command)
461
logger.info(u"Starting checker %r for %s",
463
# We don't need to redirect stdout and stderr, since
464
# in normal mode, that is already done by daemon(),
465
# and in debug mode we don't want to. (Stdin is
466
# always replaced by /dev/null.)
467
self.checker = subprocess.Popen(command,
469
shell=True, cwd=u"/")
470
self.checker_callback_tag = (gobject.child_watch_add
472
self.checker_callback,
474
# The checker may have completed before the gobject
475
# watch was added. Check for this.
476
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
478
gobject.source_remove(self.checker_callback_tag)
479
self.checker_callback(pid, status, command)
480
except OSError, error:
481
logger.error(u"Failed to start subprocess: %s",
753
483
# Re-run this periodically if run by gobject.timeout_add
861
553
class DBusObjectWithProperties(dbus.service.Object):
862
554
"""A D-Bus object with properties.
864
556
Classes inheriting from this can use the dbus_service_property
865
557
decorator to expose methods as D-Bus properties. It exposes the
866
558
standard Get(), Set(), and GetAll() methods on the D-Bus.
870
def _is_dbus_thing(thing):
871
"""Returns a function testing if an attribute is a D-Bus thing
873
If called like _is_dbus_thing("method") it returns a function
874
suitable for use as predicate to inspect.getmembers().
876
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
562
def _is_dbus_property(obj):
563
return getattr(obj, u"_dbus_is_property", False)
879
def _get_all_dbus_things(self, thing):
565
def _get_all_dbus_properties(self):
880
566
"""Returns a generator of (name, attribute) pairs
882
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
athing.__get__(self))
884
for cls in self.__class__.__mro__
886
inspect.getmembers(cls, self._is_dbus_thing(thing)))
568
return ((prop._dbus_name, prop)
570
inspect.getmembers(self, self._is_dbus_property))
888
572
def _get_dbus_property(self, interface_name, property_name):
889
573
"""Returns a bound method if one exists which is a D-Bus
890
574
property with the specified name and interface.
892
for cls in self.__class__.__mro__:
893
for name, value in inspect.getmembers(
894
cls, self._is_dbus_thing("property")):
895
if (value._dbus_name == property_name
896
and value._dbus_interface == interface_name):
897
return value.__get__(self)
576
for name in (property_name,
577
property_name + u"_dbus_property"):
578
prop = getattr(self, name, None)
580
or not self._is_dbus_property(prop)
581
or prop._dbus_name != property_name
582
or (interface_name and prop._dbus_interface
583
and interface_name != prop._dbus_interface)):
899
586
# No such property
900
raise DBusPropertyNotFound("{}:{}.{}".format(
901
self.dbus_object_path, interface_name, property_name))
587
raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
+ interface_name + u"."
903
@dbus.service.method(dbus.PROPERTIES_IFACE,
591
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
906
593
def Get(self, interface_name, property_name):
907
594
"""Standard D-Bus property Get() method, see D-Bus standard.
909
596
prop = self._get_dbus_property(interface_name, property_name)
910
if prop._dbus_access == "write":
597
if prop._dbus_access == u"write":
911
598
raise DBusPropertyAccessException(property_name)
913
if not hasattr(value, "variant_level"):
600
if not hasattr(value, u"variant_level"):
915
602
return type(value)(value, variant_level=value.variant_level+1)
917
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
604
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
918
605
def Set(self, interface_name, property_name, value):
919
606
"""Standard D-Bus property Set() method, see D-Bus standard.
921
608
prop = self._get_dbus_property(interface_name, property_name)
922
if prop._dbus_access == "read":
609
if prop._dbus_access == u"read":
923
610
raise DBusPropertyAccessException(property_name)
924
if prop._dbus_get_args_options["byte_arrays"]:
611
if prop._dbus_get_args_options[u"byte_arrays"]:
925
612
# The byte_arrays option is not supported yet on
926
613
# signatures other than "ay".
927
if prop._dbus_signature != "ay":
928
raise ValueError("Byte arrays not supported for non-"
929
"'ay' signature {!r}"
930
.format(prop._dbus_signature))
931
value = dbus.ByteArray(b''.join(chr(byte)
614
if prop._dbus_signature != u"ay":
616
value = dbus.ByteArray(''.join(unichr(byte)
935
@dbus.service.method(dbus.PROPERTIES_IFACE,
937
out_signature="a{sv}")
620
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
out_signature=u"a{sv}")
938
622
def GetAll(self, interface_name):
939
623
"""Standard D-Bus property GetAll() method, see D-Bus
942
626
Note: Will not include properties with access="write".
945
for name, prop in self._get_all_dbus_things("property"):
629
for name, prop in self._get_all_dbus_properties():
946
630
if (interface_name
947
631
and interface_name != prop._dbus_interface):
948
632
# Interface non-empty but did not match
950
634
# Ignore write-only properties
951
if prop._dbus_access == "write":
635
if prop._dbus_access == u"write":
954
if not hasattr(value, "variant_level"):
955
properties[name] = value
638
if not hasattr(value, u"variant_level"):
957
properties[name] = type(value)(
958
value, variant_level = value.variant_level + 1)
959
return dbus.Dictionary(properties, signature="sv")
961
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
def PropertiesChanged(self, interface_name, changed_properties,
963
invalidated_properties):
964
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
641
all[name] = type(value)(value, variant_level=
642
value.variant_level+1)
643
return dbus.Dictionary(all, signature=u"sv")
969
645
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
971
647
path_keyword='object_path',
972
648
connection_keyword='connection')
973
649
def Introspect(self, object_path, connection):
974
"""Overloading of standard D-Bus method.
976
Inserts property tags and interface annotation tags.
650
"""Standard D-Bus method, overloaded to insert property tags.
978
652
xmlstring = dbus.service.Object.Introspect(self, object_path,
981
655
document = xml.dom.minidom.parseString(xmlstring)
983
656
def make_tag(document, name, prop):
984
e = document.createElement("property")
985
e.setAttribute("name", name)
986
e.setAttribute("type", prop._dbus_signature)
987
e.setAttribute("access", prop._dbus_access)
657
e = document.createElement(u"property")
658
e.setAttribute(u"name", name)
659
e.setAttribute(u"type", prop._dbus_signature)
660
e.setAttribute(u"access", prop._dbus_access)
990
for if_tag in document.getElementsByTagName("interface"):
662
for if_tag in document.getElementsByTagName(u"interface"):
992
663
for tag in (make_tag(document, name, prop)
994
in self._get_all_dbus_things("property")
665
in self._get_all_dbus_properties()
995
666
if prop._dbus_interface
996
== if_tag.getAttribute("name")):
667
== if_tag.getAttribute(u"name")):
997
668
if_tag.appendChild(tag)
998
# Add annotation tags
999
for typ in ("method", "signal", "property"):
1000
for tag in if_tag.getElementsByTagName(typ):
1002
for name, prop in (self.
1003
_get_all_dbus_things(typ)):
1004
if (name == tag.getAttribute("name")
1005
and prop._dbus_interface
1006
== if_tag.getAttribute("name")):
1007
annots.update(getattr(
1008
prop, "_dbus_annotations", {}))
1009
for name, value in annots.items():
1010
ann_tag = document.createElement(
1012
ann_tag.setAttribute("name", name)
1013
ann_tag.setAttribute("value", value)
1014
tag.appendChild(ann_tag)
1015
# Add interface annotation tags
1016
for annotation, value in dict(
1017
itertools.chain.from_iterable(
1018
annotations().items()
1019
for name, annotations
1020
in self._get_all_dbus_things("interface")
1021
if name == if_tag.getAttribute("name")
1023
ann_tag = document.createElement("annotation")
1024
ann_tag.setAttribute("name", annotation)
1025
ann_tag.setAttribute("value", value)
1026
if_tag.appendChild(ann_tag)
1027
669
# Add the names to the return values for the
1028
670
# "org.freedesktop.DBus.Properties" methods
1029
if (if_tag.getAttribute("name")
1030
== "org.freedesktop.DBus.Properties"):
1031
for cn in if_tag.getElementsByTagName("method"):
1032
if cn.getAttribute("name") == "Get":
1033
for arg in cn.getElementsByTagName("arg"):
1034
if (arg.getAttribute("direction")
1036
arg.setAttribute("name", "value")
1037
elif cn.getAttribute("name") == "GetAll":
1038
for arg in cn.getElementsByTagName("arg"):
1039
if (arg.getAttribute("direction")
1041
arg.setAttribute("name", "props")
1042
xmlstring = document.toxml("utf-8")
671
if (if_tag.getAttribute(u"name")
672
== u"org.freedesktop.DBus.Properties"):
673
for cn in if_tag.getElementsByTagName(u"method"):
674
if cn.getAttribute(u"name") == u"Get":
675
for arg in cn.getElementsByTagName(u"arg"):
676
if (arg.getAttribute(u"direction")
678
arg.setAttribute(u"name", u"value")
679
elif cn.getAttribute(u"name") == u"GetAll":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
683
arg.setAttribute(u"name", u"props")
684
xmlstring = document.toxml(u"utf-8")
1043
685
document.unlink()
1044
686
except (AttributeError, xml.dom.DOMException,
1045
xml.parsers.expat.ExpatError) as error:
1046
logger.error("Failed to override Introspection method",
687
xml.parsers.expat.ExpatError), error:
688
logger.error(u"Failed to override Introspection method",
1048
690
return xmlstring
1051
def datetime_to_dbus(dt, variant_level=0):
1052
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1054
return dbus.String("", variant_level = variant_level)
1055
return dbus.String(dt.isoformat(), variant_level=variant_level)
1058
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1059
"""A class decorator; applied to a subclass of
1060
dbus.service.Object, it will add alternate D-Bus attributes with
1061
interface names according to the "alt_interface_names" mapping.
1064
@alternate_dbus_interfaces({"org.example.Interface":
1065
"net.example.AlternateInterface"})
1066
class SampleDBusObject(dbus.service.Object):
1067
@dbus.service.method("org.example.Interface")
1068
def SampleDBusMethod():
1071
The above "SampleDBusMethod" on "SampleDBusObject" will be
1072
reachable via two interfaces: "org.example.Interface" and
1073
"net.example.AlternateInterface", the latter of which will have
1074
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1075
"true", unless "deprecate" is passed with a False value.
1077
This works for methods and signals, and also for D-Bus properties
1078
(from DBusObjectWithProperties) and interfaces (from the
1079
dbus_interface_annotations decorator).
1083
for orig_interface_name, alt_interface_name in (
1084
alt_interface_names.items()):
1086
interface_names = set()
1087
# Go though all attributes of the class
1088
for attrname, attribute in inspect.getmembers(cls):
1089
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
# with the wrong interface name
1091
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface.startswith(
1093
orig_interface_name)):
1095
# Create an alternate D-Bus interface name based on
1097
alt_interface = attribute._dbus_interface.replace(
1098
orig_interface_name, alt_interface_name)
1099
interface_names.add(alt_interface)
1100
# Is this a D-Bus signal?
1101
if getattr(attribute, "_dbus_is_signal", False):
1102
if sys.version_info.major == 2:
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1106
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))
1108
["func"].cell_contents)
1110
nonmethod_func = attribute
1111
# Create a new, but exactly alike, function
1112
# object, and decorate it to be a new D-Bus signal
1113
# with the alternate D-Bus interface name
1114
if sys.version_info.major == 2:
1115
new_function = types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)
1122
new_function = types.FunctionType(
1123
nonmethod_func.__code__,
1124
nonmethod_func.__globals__,
1125
nonmethod_func.__name__,
1126
nonmethod_func.__defaults__,
1127
nonmethod_func.__closure__)
1128
new_function = (dbus.service.signal(
1130
attribute._dbus_signature)(new_function))
1131
# Copy annotations, if any
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1135
except AttributeError:
1137
# Define a creator of a function to call both the
1138
# original and alternate functions, so both the
1139
# original and alternate signals gets sent when
1140
# the function is called
1141
def fixscope(func1, func2):
1142
"""This function is a scope container to pass
1143
func1 and func2 to the "call_both" function
1144
outside of its arguments"""
1146
def call_both(*args, **kwargs):
1147
"""This function will emit two D-Bus
1148
signals by calling func1 and func2"""
1149
func1(*args, **kwargs)
1150
func2(*args, **kwargs)
1153
# Create the "call_both" function and add it to
1155
attr[attrname] = fixscope(attribute, new_function)
1156
# Is this a D-Bus method?
1157
elif getattr(attribute, "_dbus_is_method", False):
1158
# Create a new, but exactly alike, function
1159
# object. Decorate it to be a new D-Bus method
1160
# with the alternate D-Bus interface name. Add it
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1172
# Copy annotations, if any
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1176
except AttributeError:
1178
# Is this a D-Bus property?
1179
elif getattr(attribute, "_dbus_is_property", False):
1180
# Create a new, but exactly alike, function
1181
# object, and decorate it to be a new D-Bus
1182
# property with the alternate D-Bus interface
1183
# name. Add it to the class.
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1195
# Copy annotations, if any
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1199
except AttributeError:
1201
# Is this a D-Bus interface?
1202
elif getattr(attribute, "_dbus_is_interface", False):
1203
# Create a new, but exactly alike, function
1204
# object. Decorate it to be a new D-Bus interface
1205
# with the alternate D-Bus interface name. Add it
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1215
# Deprecate all alternate interfaces
1216
iname="_AlternateDBusNames_interface_annotation{}"
1217
for interface_name in interface_names:
1219
@dbus_interface_annotations(interface_name)
1221
return { "org.freedesktop.DBus.Deprecated":
1223
# Find an unused name
1224
for aname in (iname.format(i)
1225
for i in itertools.count()):
1226
if aname not in attr:
1230
# Replace the class with a new subclass of it with
1231
# methods, signals, etc. as created above.
1232
cls = type(b"{}Alternate".format(cls.__name__),
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
"se.bsnet.fukt.Mandos"})
1241
693
class ClientDBus(Client, DBusObjectWithProperties):
1242
694
"""A Client class using D-Bus
1258
704
Client.__init__(self, *args, **kwargs)
1259
705
# Only now, when this client is initialized, can it show up on
1261
client_object_name = str(self.name).translate(
1262
{ord("."): ord("_"),
1263
ord("-"): ord("_")})
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
707
self.dbus_object_path = (dbus.ObjectPath
709
+ self.name.replace(u".", u"_")))
1266
710
DBusObjectWithProperties.__init__(self, self.bus,
1267
711
self.dbus_object_path)
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1274
""" Modify a variable so that it's a property which announces
1275
its changes to DBus.
1277
transform_fun: Function that takes a value and a variant_level
1278
and transforms it to a D-Bus type.
1279
dbus_name: D-Bus name of the variable
1280
type_func: Function that transform the value before sending it
1281
to the D-Bus. Default: no transform
1282
variant_level: D-Bus variant level. Default: 1
1284
attrname = "_{}".format(dbus_name)
1286
def setter(self, value):
1287
if hasattr(self, "dbus_object_path"):
1288
if (not hasattr(self, attrname) or
1289
type_func(getattr(self, attrname, None))
1290
!= type_func(value)):
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1306
setattr(self, attrname, value)
1308
return property(lambda self: getattr(self, attrname), setter)
1310
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1311
approvals_pending = notifychangeproperty(dbus.Boolean,
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1323
"LastCheckerStatus")
1324
last_approval_request = notifychangeproperty(
1325
datetime_to_dbus, "LastApprovalRequest")
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1331
approval_duration = notifychangeproperty(
1332
dbus.UInt64, "ApprovalDuration",
1333
type_func = lambda td: td.total_seconds() * 1000)
1334
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1338
extended_timeout = notifychangeproperty(
1339
dbus.UInt64, "ExtendedTimeout",
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1348
del notifychangeproperty
714
def _datetime_to_dbus(dt, variant_level=0):
715
"""Convert a UTC datetime.datetime() to a D-Bus type."""
716
return dbus.String(dt.isoformat(),
717
variant_level=variant_level)
720
oldstate = getattr(self, u"enabled", False)
721
r = Client.enable(self)
722
if oldstate != self.enabled:
724
self.PropertyChanged(dbus.String(u"enabled"),
725
dbus.Boolean(True, variant_level=1))
726
self.PropertyChanged(
727
dbus.String(u"last_enabled"),
728
self._datetime_to_dbus(self.last_enabled,
732
def disable(self, quiet = False):
733
oldstate = getattr(self, u"enabled", False)
734
r = Client.disable(self, quiet=quiet)
735
if not quiet and oldstate != self.enabled:
737
self.PropertyChanged(dbus.String(u"enabled"),
738
dbus.Boolean(False, variant_level=1))
1350
741
def __del__(self, *args, **kwargs):
1352
743
self.remove_from_connection()
1353
744
except LookupError:
1355
if hasattr(DBusObjectWithProperties, "__del__"):
746
if hasattr(DBusObjectWithProperties, u"__del__"):
1356
747
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
748
Client.__del__(self, *args, **kwargs)
1359
def checker_callback(self, source, condition,
1360
connection, command, *args, **kwargs):
1361
ret = Client.checker_callback(self, source, condition,
1362
connection, command, *args,
1364
exitstatus = self.last_checker_status
750
def checker_callback(self, pid, condition, command,
752
self.checker_callback_tag = None
755
self.PropertyChanged(dbus.String(u"checker_running"),
756
dbus.Boolean(False, variant_level=1))
757
if os.WIFEXITED(condition):
758
exitstatus = os.WEXITSTATUS(condition)
1366
759
# Emit D-Bus signal
1367
760
self.CheckerCompleted(dbus.Int16(exitstatus),
761
dbus.Int64(condition),
1369
762
dbus.String(command))
1371
764
# Emit D-Bus signal
1372
765
self.CheckerCompleted(dbus.Int16(-1),
1374
self.last_checker_signal),
766
dbus.Int64(condition),
1375
767
dbus.String(command))
769
return Client.checker_callback(self, pid, condition, command,
772
def checked_ok(self, *args, **kwargs):
773
r = Client.checked_ok(self, *args, **kwargs)
775
self.PropertyChanged(
776
dbus.String(u"last_checked_ok"),
777
(self._datetime_to_dbus(self.last_checked_ok,
1378
781
def start_checker(self, *args, **kwargs):
1379
old_checker_pid = getattr(self.checker, "pid", None)
782
old_checker = self.checker
783
if self.checker is not None:
784
old_checker_pid = self.checker.pid
786
old_checker_pid = None
1380
787
r = Client.start_checker(self, *args, **kwargs)
1381
788
# Only if new checker process was started
1382
789
if (self.checker is not None
1383
790
and old_checker_pid != self.checker.pid):
1384
791
# Emit D-Bus signal
1385
792
self.CheckerStarted(self.current_checker_command)
793
self.PropertyChanged(
794
dbus.String(u"checker_running"),
795
dbus.Boolean(True, variant_level=1))
798
def stop_checker(self, *args, **kwargs):
799
old_checker = getattr(self, u"checker", None)
800
r = Client.stop_checker(self, *args, **kwargs)
801
if (old_checker is not None
802
and getattr(self, u"checker", None) is None):
803
self.PropertyChanged(dbus.String(u"checker_running"),
804
dbus.Boolean(False, variant_level=1))
1388
807
def _reset_approved(self):
1389
self.approved = None
808
self._approved = None
1392
811
def approve(self, value=True):
1393
self.approved = value
1394
gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
* 1000), self._reset_approved)
1396
self.send_changedstate()
812
self._approved = value
813
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
815
def approved_pending(self):
816
return self.approvals_pending > 0
1398
819
## D-Bus methods, signals & properties
820
_interface = u"se.bsnet.fukt.Mandos.Client"
1404
824
# CheckerCompleted - signal
1405
@dbus.service.signal(_interface, signature="nxs")
825
@dbus.service.signal(_interface, signature=u"nxs")
1406
826
def CheckerCompleted(self, exitcode, waitstatus, command):
1410
830
# CheckerStarted - signal
1411
@dbus.service.signal(_interface, signature="s")
831
@dbus.service.signal(_interface, signature=u"s")
1412
832
def CheckerStarted(self, command):
1416
836
# PropertyChanged - signal
1417
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1418
@dbus.service.signal(_interface, signature="sv")
837
@dbus.service.signal(_interface, signature=u"sv")
1419
838
def PropertyChanged(self, property, value):
1423
842
# GotSecret - signal
843
# Is sent after succesfull transfer of secret from mandos-server to mandos-client
1424
844
@dbus.service.signal(_interface)
1425
845
def GotSecret(self):
1427
Is sent after a successful transfer of secret from the Mandos
1428
server to mandos-client
1432
849
# Rejected - signal
1433
@dbus.service.signal(_interface, signature="s")
850
@dbus.service.signal(_interface, signature=u"s")
1434
851
def Rejected(self, reason):
1438
855
# NeedApproval - signal
1439
@dbus.service.signal(_interface, signature="tb")
856
@dbus.service.signal(_interface, signature=u"db")
1440
857
def NeedApproval(self, timeout, default):
1442
return self.need_approval()
1446
863
# Approve - method
1447
@dbus.service.method(_interface, in_signature="b")
864
@dbus.service.method(_interface, in_signature=u"b")
1448
865
def Approve(self, value):
1449
866
self.approve(value)
1451
868
# CheckedOK - method
1452
869
@dbus.service.method(_interface)
1453
870
def CheckedOK(self):
871
return self.checked_ok()
1456
873
# Enable - method
1457
874
@dbus.service.method(_interface)
1481
# ApprovalPending - property
1482
@dbus_service_property(_interface, signature="b", access="read")
1483
def ApprovalPending_dbus_property(self):
1484
return dbus.Boolean(bool(self.approvals_pending))
1486
# ApprovedByDefault - property
1487
@dbus_service_property(_interface,
1490
def ApprovedByDefault_dbus_property(self, value=None):
1491
if value is None: # get
1492
return dbus.Boolean(self.approved_by_default)
1493
self.approved_by_default = bool(value)
1495
# ApprovalDelay - property
1496
@dbus_service_property(_interface,
1499
def ApprovalDelay_dbus_property(self, value=None):
1500
if value is None: # get
1501
return dbus.UInt64(self.approval_delay.total_seconds()
1503
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1505
# ApprovalDuration - property
1506
@dbus_service_property(_interface,
1509
def ApprovalDuration_dbus_property(self, value=None):
1510
if value is None: # get
1511
return dbus.UInt64(self.approval_duration.total_seconds()
1513
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1516
@dbus_service_property(_interface, signature="s", access="read")
1517
def Name_dbus_property(self):
898
# approved_pending - property
899
@dbus_service_property(_interface, signature=u"b", access=u"read")
900
def approved_pending_dbus_property(self):
901
return dbus.Boolean(self.approved_pending())
903
# approved_by_default - property
904
@dbus_service_property(_interface, signature=u"b",
906
def approved_by_default_dbus_property(self):
907
return dbus.Boolean(self.approved_by_default)
909
# approved_delay - property
910
@dbus_service_property(_interface, signature=u"t",
912
def approved_delay_dbus_property(self):
913
return dbus.UInt64(self.approved_delay_milliseconds())
915
# approved_duration - property
916
@dbus_service_property(_interface, signature=u"t",
918
def approved_duration_dbus_property(self):
919
return dbus.UInt64(self._timedelta_to_milliseconds(
920
self.approved_duration))
923
@dbus_service_property(_interface, signature=u"s", access=u"read")
924
def name_dbus_property(self):
1518
925
return dbus.String(self.name)
1520
# Fingerprint - property
1521
@dbus_service_property(_interface, signature="s", access="read")
1522
def Fingerprint_dbus_property(self):
927
# fingerprint - property
928
@dbus_service_property(_interface, signature=u"s", access=u"read")
929
def fingerprint_dbus_property(self):
1523
930
return dbus.String(self.fingerprint)
1526
@dbus_service_property(_interface,
1529
def Host_dbus_property(self, value=None):
933
@dbus_service_property(_interface, signature=u"s",
935
def host_dbus_property(self, value=None):
1530
936
if value is None: # get
1531
937
return dbus.String(self.host)
1532
self.host = str(value)
1534
# Created - property
1535
@dbus_service_property(_interface, signature="s", access="read")
1536
def Created_dbus_property(self):
1537
return datetime_to_dbus(self.created)
1539
# LastEnabled - property
1540
@dbus_service_property(_interface, signature="s", access="read")
1541
def LastEnabled_dbus_property(self):
1542
return datetime_to_dbus(self.last_enabled)
1544
# Enabled - property
1545
@dbus_service_property(_interface,
1548
def Enabled_dbus_property(self, value=None):
940
self.PropertyChanged(dbus.String(u"host"),
941
dbus.String(value, variant_level=1))
944
@dbus_service_property(_interface, signature=u"s", access=u"read")
945
def created_dbus_property(self):
946
return dbus.String(self._datetime_to_dbus(self.created))
948
# last_enabled - property
949
@dbus_service_property(_interface, signature=u"s", access=u"read")
950
def last_enabled_dbus_property(self):
951
if self.last_enabled is None:
952
return dbus.String(u"")
953
return dbus.String(self._datetime_to_dbus(self.last_enabled))
956
@dbus_service_property(_interface, signature=u"b",
958
def enabled_dbus_property(self, value=None):
1549
959
if value is None: # get
1550
960
return dbus.Boolean(self.enabled)
1556
# LastCheckedOK - property
1557
@dbus_service_property(_interface,
1560
def LastCheckedOK_dbus_property(self, value=None):
966
# last_checked_ok - property
967
@dbus_service_property(_interface, signature=u"s",
969
def last_checked_ok_dbus_property(self, value=None):
1561
970
if value is not None:
1562
971
self.checked_ok()
1564
return datetime_to_dbus(self.last_checked_ok)
1566
# LastCheckerStatus - property
1567
@dbus_service_property(_interface, signature="n", access="read")
1568
def LastCheckerStatus_dbus_property(self):
1569
return dbus.Int16(self.last_checker_status)
1571
# Expires - property
1572
@dbus_service_property(_interface, signature="s", access="read")
1573
def Expires_dbus_property(self):
1574
return datetime_to_dbus(self.expires)
1576
# LastApprovalRequest - property
1577
@dbus_service_property(_interface, signature="s", access="read")
1578
def LastApprovalRequest_dbus_property(self):
1579
return datetime_to_dbus(self.last_approval_request)
1581
# Timeout - property
1582
@dbus_service_property(_interface,
1585
def Timeout_dbus_property(self, value=None):
973
if self.last_checked_ok is None:
974
return dbus.String(u"")
975
return dbus.String(self._datetime_to_dbus(self
979
@dbus_service_property(_interface, signature=u"t",
981
def timeout_dbus_property(self, value=None):
1586
982
if value is None: # get
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1588
old_timeout = self.timeout
983
return dbus.UInt64(self.timeout_milliseconds())
1589
984
self.timeout = datetime.timedelta(0, 0, 0, value)
1590
# Reschedule disabling
1592
now = datetime.datetime.utcnow()
1593
self.expires += self.timeout - old_timeout
1594
if self.expires <= now:
1595
# The timeout has passed
1598
if (getattr(self, "disable_initiator_tag", None)
1601
gobject.source_remove(self.disable_initiator_tag)
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1606
# ExtendedTimeout - property
1607
@dbus_service_property(_interface,
1610
def ExtendedTimeout_dbus_property(self, value=None):
1611
if value is None: # get
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1616
# Interval - property
1617
@dbus_service_property(_interface,
1620
def Interval_dbus_property(self, value=None):
1621
if value is None: # get
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
986
self.PropertyChanged(dbus.String(u"timeout"),
987
dbus.UInt64(value, variant_level=1))
988
if getattr(self, u"disable_initiator_tag", None) is None:
991
gobject.source_remove(self.disable_initiator_tag)
992
self.disable_initiator_tag = None
994
_timedelta_to_milliseconds((self
1000
# The timeout has passed
1003
self.disable_initiator_tag = (gobject.timeout_add
1004
(time_to_die, self.disable))
1006
# interval - property
1007
@dbus_service_property(_interface, signature=u"t",
1008
access=u"readwrite")
1009
def interval_dbus_property(self, value=None):
1010
if value is None: # get
1011
return dbus.UInt64(self.interval_milliseconds())
1623
1012
self.interval = datetime.timedelta(0, 0, 0, value)
1624
if getattr(self, "checker_initiator_tag", None) is None:
1014
self.PropertyChanged(dbus.String(u"interval"),
1015
dbus.UInt64(value, variant_level=1))
1016
if getattr(self, u"checker_initiator_tag", None) is None:
1627
# Reschedule checker run
1628
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1633
# Checker - property
1634
@dbus_service_property(_interface,
1637
def Checker_dbus_property(self, value=None):
1018
# Reschedule checker run
1019
gobject.source_remove(self.checker_initiator_tag)
1020
self.checker_initiator_tag = (gobject.timeout_add
1021
(value, self.start_checker))
1022
self.start_checker() # Start one now, too
1024
# checker - property
1025
@dbus_service_property(_interface, signature=u"s",
1026
access=u"readwrite")
1027
def checker_dbus_property(self, value=None):
1638
1028
if value is None: # get
1639
1029
return dbus.String(self.checker_command)
1640
self.checker_command = str(value)
1030
self.checker_command = value
1032
self.PropertyChanged(dbus.String(u"checker"),
1033
dbus.String(self.checker_command,
1642
# CheckerRunning - property
1643
@dbus_service_property(_interface,
1646
def CheckerRunning_dbus_property(self, value=None):
1036
# checker_running - property
1037
@dbus_service_property(_interface, signature=u"b",
1038
access=u"readwrite")
1039
def checker_running_dbus_property(self, value=None):
1647
1040
if value is None: # get
1648
1041
return dbus.Boolean(self.checker is not None)
1704
1093
def handle(self):
1705
1094
with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
logger.info("TCP connection from: %s",
1707
str(self.client_address))
1708
logger.debug("Pipe FD: %d",
1095
logger.info(u"TCP connection from: %s",
1096
unicode(self.client_address))
1097
logger.debug(u"Pipe FD: %d",
1709
1098
self.server.child_pipe.fileno())
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1100
session = (gnutls.connection
1101
.ClientSession(self.request,
1103
.X509Credentials()))
1714
1105
# Note: gnutls.connection.X509Credentials is really a
1715
1106
# generic GnuTLS certificate credentials object so long as
1716
1107
# no X.509 keys are added to it. Therefore, we can use it
1717
1108
# here despite using OpenPGP certificates.
1719
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1720
# "+AES-256-CBC", "+SHA1",
1721
# "+COMP-NULL", "+CTYPE-OPENPGP",
1110
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1111
# u"+AES-256-CBC", u"+SHA1",
1112
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1723
1114
# Use a fallback default, since this MUST be set.
1724
1115
priority = self.server.gnutls_priority
1725
1116
if priority is None:
1727
gnutls.library.functions.gnutls_priority_set_direct(
1728
session._c_object, priority, None)
1117
priority = u"NORMAL"
1118
(gnutls.library.functions
1119
.gnutls_priority_set_direct(session._c_object,
1730
1122
# Start communication using the Mandos protocol
1731
1123
# Get protocol number
1732
1124
line = self.request.makefile().readline()
1733
logger.debug("Protocol version: %r", line)
1125
logger.debug(u"Protocol version: %r", line)
1735
1127
if int(line.strip().split()[0]) > 1:
1736
raise RuntimeError(line)
1737
except (ValueError, IndexError, RuntimeError) as error:
1738
logger.error("Unknown protocol version: %s", error)
1129
except (ValueError, IndexError, RuntimeError), error:
1130
logger.error(u"Unknown protocol version: %s", error)
1741
1133
# Start GnuTLS connection
1743
1135
session.handshake()
1744
except gnutls.errors.GNUTLSError as error:
1745
logger.warning("Handshake failed: %s", error)
1136
except gnutls.errors.GNUTLSError, error:
1137
logger.warning(u"Handshake failed: %s", error)
1746
1138
# Do not run session.bye() here: the session is not
1747
1139
# established. Just abandon the request.
1749
logger.debug("Handshake succeeded")
1141
logger.debug(u"Handshake succeeded")
1751
1143
approval_required = False
1754
fpr = self.fingerprint(
1755
self.peer_certificate(session))
1757
gnutls.errors.GNUTLSError) as error:
1758
logger.warning("Bad certificate: %s", error)
1146
fpr = self.fingerprint(self.peer_certificate
1148
except (TypeError, gnutls.errors.GNUTLSError), error:
1149
logger.warning(u"Bad certificate: %s", error)
1760
logger.debug("Fingerprint: %s", fpr)
1151
logger.debug(u"Fingerprint: %s", fpr)
1763
1154
client = ProxyClient(child_pipe, fpr,
1764
1155
self.client_address)
1765
1156
except KeyError:
1768
if client.approval_delay:
1769
delay = client.approval_delay
1159
if client.approved_delay:
1160
delay = client.approved_delay
1770
1161
client.approvals_pending += 1
1771
1162
approval_required = True
1774
1165
if not client.enabled:
1775
logger.info("Client %s is disabled",
1166
logger.warning(u"Client %s is disabled",
1777
1168
if self.server.use_dbus:
1778
1169
# Emit D-Bus signal
1779
client.Rejected("Disabled")
1170
client.Rejected("Disabled")
1782
if client.approved or not client.approval_delay:
1173
if client._approved or not client.approved_delay:
1783
1174
#We are approved or approval is disabled
1785
elif client.approved is None:
1786
logger.info("Client %s needs approval",
1176
elif client._approved is None:
1177
logger.info(u"Client %s need approval",
1788
1179
if self.server.use_dbus:
1789
1180
# Emit D-Bus signal
1790
1181
client.NeedApproval(
1791
client.approval_delay.total_seconds()
1792
* 1000, client.approved_by_default)
1182
client.approved_delay_milliseconds(),
1183
client.approved_by_default)
1794
logger.warning("Client %s was not approved",
1185
logger.warning(u"Client %s was not approved",
1796
1187
if self.server.use_dbus:
1797
1188
# Emit D-Bus signal
1798
client.Rejected("Denied")
1189
client.Rejected("Disapproved")
1801
1192
#wait until timeout or approved
1193
#x = float(client._timedelta_to_milliseconds(delay))
1802
1194
time = datetime.datetime.now()
1803
1195
client.changedstate.acquire()
1804
client.changedstate.wait(delay.total_seconds())
1196
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1805
1197
client.changedstate.release()
1806
1198
time2 = datetime.datetime.now()
1807
1199
if (time2 - time) >= delay:
1872
1256
def fingerprint(openpgp):
1873
1257
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1258
# New GnuTLS "datum" with the OpenPGP public key
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1259
datum = (gnutls.library.types
1260
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1263
ctypes.c_uint(len(openpgp))))
1879
1264
# New empty GnuTLS certificate
1880
1265
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1266
(gnutls.library.functions
1267
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1268
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1269
(gnutls.library.functions
1270
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1271
gnutls.library.constants
1272
.GNUTLS_OPENPGP_FMT_RAW))
1887
1273
# Verify the self signature in the key
1888
1274
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1275
(gnutls.library.functions
1276
.gnutls_openpgp_crt_verify_self(crt, 0,
1277
ctypes.byref(crtverify)))
1891
1278
if crtverify.value != 0:
1892
1279
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1280
raise (gnutls.errors.CertificateSecurityError
1895
1282
# New buffer for the fingerprint
1896
1283
buf = ctypes.create_string_buffer(20)
1897
1284
buf_len = ctypes.c_size_t()
1898
1285
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1286
(gnutls.library.functions
1287
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1288
ctypes.byref(buf_len)))
1901
1289
# Deinit the certificate
1902
1290
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1291
# Convert the buffer to a Python bytestring
1904
1292
fpr = ctypes.string_at(buf, buf_len.value)
1905
1293
# Convert the bytestring to hexadecimal notation
1906
hex_fpr = binascii.hexlify(fpr).upper()
1294
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1910
1298
class MultiprocessingMixIn(object):
1911
1299
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1913
1300
def sub_process_main(self, request, address):
1915
1302
self.finish_request(request, address)
1917
1304
self.handle_error(request, address)
1918
1305
self.close_request(request)
1920
1307
def process_request(self, request, address):
1921
1308
"""Start a new process to process the request."""
1922
proc = multiprocessing.Process(target = self.sub_process_main,
1923
args = (request, address))
1309
multiprocessing.Process(target = self.sub_process_main,
1310
args = (request, address)).start()
1928
1312
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1313
""" adds a pipe to the MixIn """
1931
1314
def process_request(self, request, client_address):
1932
1315
"""Overrides and wraps the original process_request().
1934
1317
This function creates a new pipe in self.pipe
1936
1319
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1938
proc = MultiprocessingMixIn.process_request(self, request,
1321
super(MultiprocessingMixInWithPipe,
1322
self).process_request(request, client_address)
1940
1323
self.child_pipe.close()
1941
self.add_pipe(parent_pipe, proc)
1943
def add_pipe(self, parent_pipe, proc):
1324
self.add_pipe(parent_pipe)
1326
def add_pipe(self, parent_pipe):
1944
1327
"""Dummy function; override as necessary"""
1945
raise NotImplementedError()
1948
1330
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1949
1331
socketserver.TCPServer, object):
2052
1401
Assumes a gobject.MainLoop event loop.
2055
1403
def __init__(self, server_address, RequestHandlerClass,
2059
gnutls_priority=None,
1404
interface=None, use_ipv6=True, clients=None,
1405
gnutls_priority=None, use_dbus=True):
2062
1406
self.enabled = False
2063
1407
self.clients = clients
2064
1408
if self.clients is None:
1409
self.clients = set()
2066
1410
self.use_dbus = use_dbus
2067
1411
self.gnutls_priority = gnutls_priority
2068
1412
IPv6_TCPServer.__init__(self, server_address,
2069
1413
RequestHandlerClass,
2070
1414
interface = interface,
2071
use_ipv6 = use_ipv6,
2072
socketfd = socketfd)
1415
use_ipv6 = use_ipv6)
2074
1416
def server_activate(self):
2075
1417
if self.enabled:
2076
1418
return socketserver.TCPServer.server_activate(self)
2078
1419
def enable(self):
2079
1420
self.enabled = True
2081
def add_pipe(self, parent_pipe, proc):
1421
def add_pipe(self, parent_pipe):
2082
1422
# Call "handle_ipc" for both data and EOF events
2083
gobject.io_add_watch(
2084
parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe = parent_pipe,
2090
def handle_ipc(self, source, condition,
1423
gobject.io_add_watch(parent_pipe.fileno(),
1424
gobject.IO_IN | gobject.IO_HUP,
1425
functools.partial(self.handle_ipc,
1426
parent_pipe = parent_pipe))
1428
def handle_ipc(self, source, condition, parent_pipe=None,
2093
1429
client_object=None):
2094
# error, or the other end of multiprocessing.Pipe has closed
2095
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2096
# Wait for other process to exit
1431
gobject.IO_IN: u"IN", # There is data to read.
1432
gobject.IO_OUT: u"OUT", # Data can be written (without
1434
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1435
gobject.IO_ERR: u"ERR", # Error condition.
1436
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1437
# broken, usually for pipes and
1440
conditions_string = ' | '.join(name
1442
condition_names.iteritems()
1443
if cond & condition)
1444
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1447
# error or the other end of multiprocessing.Pipe has closed
1448
if condition & gobject.IO_HUP or condition & gobject.IO_ERR:
2100
1451
# Read a request from the child
2101
1452
request = parent_pipe.recv()
1453
logger.debug(u"IPC request: %s", repr(request))
2102
1454
command = request[0]
2104
1456
if command == 'init':
2105
1457
fpr = request[1]
2106
1458
address = request[2]
2108
for c in self.clients.itervalues():
1460
for c in self.clients:
2109
1461
if c.fingerprint == fpr:
2113
logger.info("Client not found for fingerprint: %s, ad"
2114
"dress: %s", fpr, address)
1465
logger.warning(u"Client not found for fingerprint: %s, ad"
1466
u"dress: %s", fpr, address)
2115
1467
if self.use_dbus:
2116
1468
# Emit D-Bus signal
2117
mandos_dbus_service.ClientNotFound(fpr,
1469
mandos_dbus_service.ClientNotFound(fpr, address)
2119
1470
parent_pipe.send(False)
2122
gobject.io_add_watch(
2123
parent_pipe.fileno(),
2124
gobject.IO_IN | gobject.IO_HUP,
2125
functools.partial(self.handle_ipc,
2126
parent_pipe = parent_pipe,
2128
client_object = client))
1473
gobject.io_add_watch(parent_pipe.fileno(),
1474
gobject.IO_IN | gobject.IO_HUP,
1475
functools.partial(self.handle_ipc,
1476
parent_pipe = parent_pipe,
1477
client_object = client))
2129
1478
parent_pipe.send(True)
2130
# remove the old hook in favor of the new above hook on
1479
# remove the old hook in favor of the new above hook on same fileno
2133
1481
if command == 'funcall':
2134
1482
funcname = request[1]
2135
1483
args = request[2]
2136
1484
kwargs = request[3]
2138
parent_pipe.send(('data', getattr(client_object,
1486
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2142
1488
if command == 'getattr':
2143
1489
attrname = request[1]
2144
if isinstance(client_object.__getattribute__(attrname),
2145
collections.Callable):
2146
parent_pipe.send(('function', ))
1490
if callable(client_object.__getattribute__(attrname)):
1491
parent_pipe.send(('function',))
2149
'data', client_object.__getattribute__(attrname)))
1493
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2151
1495
if command == 'setattr':
2152
1496
attrname = request[1]
2153
1497
value = request[2]
2154
1498
setattr(client_object, attrname, value)
2159
def rfc3339_duration_to_delta(duration):
2160
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2162
>>> rfc3339_duration_to_delta("P7D")
2163
datetime.timedelta(7)
2164
>>> rfc3339_duration_to_delta("PT60S")
2165
datetime.timedelta(0, 60)
2166
>>> rfc3339_duration_to_delta("PT60M")
2167
datetime.timedelta(0, 3600)
2168
>>> rfc3339_duration_to_delta("PT24H")
2169
datetime.timedelta(1)
2170
>>> rfc3339_duration_to_delta("P1W")
2171
datetime.timedelta(7)
2172
>>> rfc3339_duration_to_delta("PT5M30S")
2173
datetime.timedelta(0, 330)
2174
>>> rfc3339_duration_to_delta("P1DT3M20S")
2175
datetime.timedelta(1, 200)
2178
# Parsing an RFC 3339 duration with regular expressions is not
2179
# possible - there would have to be multiple places for the same
2180
# values, like seconds. The current code, while more esoteric, is
2181
# cleaner without depending on a parsing library. If Python had a
2182
# built-in library for parsing we would use it, but we'd like to
2183
# avoid excessive use of external libraries.
2185
# New type for defining tokens, syntax, and semantics all-in-one
2186
Token = collections.namedtuple("Token", (
2187
"regexp", # To match token; if "value" is not None, must have
2188
# a "group" containing digits
2189
"value", # datetime.timedelta or None
2190
"followers")) # Tokens valid after this token
2191
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
# the "duration" ABNF definition in RFC 3339, Appendix A.
2193
token_end = Token(re.compile(r"$"), None, frozenset())
2194
token_second = Token(re.compile(r"(\d+)S"),
2195
datetime.timedelta(seconds=1),
2196
frozenset((token_end, )))
2197
token_minute = Token(re.compile(r"(\d+)M"),
2198
datetime.timedelta(minutes=1),
2199
frozenset((token_second, token_end)))
2200
token_hour = Token(re.compile(r"(\d+)H"),
2201
datetime.timedelta(hours=1),
2202
frozenset((token_minute, token_end)))
2203
token_time = Token(re.compile(r"T"),
2205
frozenset((token_hour, token_minute,
2207
token_day = Token(re.compile(r"(\d+)D"),
2208
datetime.timedelta(days=1),
2209
frozenset((token_time, token_end)))
2210
token_month = Token(re.compile(r"(\d+)M"),
2211
datetime.timedelta(weeks=4),
2212
frozenset((token_day, token_end)))
2213
token_year = Token(re.compile(r"(\d+)Y"),
2214
datetime.timedelta(weeks=52),
2215
frozenset((token_month, token_end)))
2216
token_week = Token(re.compile(r"(\d+)W"),
2217
datetime.timedelta(weeks=1),
2218
frozenset((token_end, )))
2219
token_duration = Token(re.compile(r"P"), None,
2220
frozenset((token_year, token_month,
2221
token_day, token_time,
2223
# Define starting values
2224
value = datetime.timedelta() # Value so far
2226
followers = frozenset((token_duration, )) # Following valid tokens
2227
s = duration # String left to parse
2228
# Loop until end token is found
2229
while found_token is not token_end:
2230
# Search for any currently valid tokens
2231
for token in followers:
2232
match = token.regexp.match(s)
2233
if match is not None:
2235
if token.value is not None:
2236
# Value found, parse digits
2237
factor = int(match.group(1), 10)
2238
# Add to value so far
2239
value += factor * token.value
2240
# Strip token from string
2241
s = token.regexp.sub("", s, 1)
2244
# Set valid next tokens
2245
followers = found_token.followers
2248
# No currently valid tokens were found
2249
raise ValueError("Invalid RFC 3339 duration: {!r}"
2255
1503
def string_to_delta(interval):
2256
1504
"""Parse a string and return a datetime.timedelta
2258
>>> string_to_delta('7d')
1506
>>> string_to_delta(u'7d')
2259
1507
datetime.timedelta(7)
2260
>>> string_to_delta('60s')
1508
>>> string_to_delta(u'60s')
2261
1509
datetime.timedelta(0, 60)
2262
>>> string_to_delta('60m')
1510
>>> string_to_delta(u'60m')
2263
1511
datetime.timedelta(0, 3600)
2264
>>> string_to_delta('24h')
1512
>>> string_to_delta(u'24h')
2265
1513
datetime.timedelta(1)
2266
>>> string_to_delta('1w')
1514
>>> string_to_delta(u'1w')
2267
1515
datetime.timedelta(7)
2268
>>> string_to_delta('5m 30s')
1516
>>> string_to_delta(u'5m 30s')
2269
1517
datetime.timedelta(0, 330)
2273
return rfc3339_duration_to_delta(interval)
2277
1519
timevalue = datetime.timedelta(0)
2278
1520
for s in interval.split():
1522
suffix = unicode(s[-1])
2281
1523
value = int(s[:-1])
2283
1525
delta = datetime.timedelta(value)
1526
elif suffix == u"s":
2285
1527
delta = datetime.timedelta(0, value)
1528
elif suffix == u"m":
2287
1529
delta = datetime.timedelta(0, 0, 0, 0, value)
1530
elif suffix == u"h":
2289
1531
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1532
elif suffix == u"w":
2291
1533
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2293
raise ValueError("Unknown suffix {!r}".format(suffix))
2294
except IndexError as e:
2295
raise ValueError(*(e.args))
1535
raise ValueError(u"Unknown suffix %r" % suffix)
1536
except (ValueError, IndexError), e:
1537
raise ValueError(e.message)
2296
1538
timevalue += delta
2297
1539
return timevalue
1542
def if_nametoindex(interface):
1543
"""Call the C function if_nametoindex(), or equivalent
1545
Note: This function cannot accept a unicode string."""
1546
global if_nametoindex
1548
if_nametoindex = (ctypes.cdll.LoadLibrary
1549
(ctypes.util.find_library(u"c"))
1551
except (OSError, AttributeError):
1552
logger.warning(u"Doing if_nametoindex the hard way")
1553
def if_nametoindex(interface):
1554
"Get an interface index the hard way, i.e. using fcntl()"
1555
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1556
with contextlib.closing(socket.socket()) as s:
1557
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1558
struct.pack(str(u"16s16x"),
1560
interface_index = struct.unpack(str(u"I"),
1562
return interface_index
1563
return if_nametoindex(interface)
2300
1566
def daemon(nochdir = False, noclose = False):
2301
1567
"""See daemon(3). Standard BSD Unix function.
2327
1593
##################################################################
2328
1594
# Parsing of options, both command line and config file
2330
parser = argparse.ArgumentParser()
2331
parser.add_argument("-v", "--version", action="version",
2332
version = "%(prog)s {}".format(version),
2333
help="show version number and exit")
2334
parser.add_argument("-i", "--interface", metavar="IF",
2335
help="Bind to interface IF")
2336
parser.add_argument("-a", "--address",
2337
help="Address to listen for requests on")
2338
parser.add_argument("-p", "--port", type=int,
2339
help="Port number to receive requests on")
2340
parser.add_argument("--check", action="store_true",
2341
help="Run self-test")
2342
parser.add_argument("--debug", action="store_true",
2343
help="Debug mode; run in foreground and log"
2344
" to terminal", default=None)
2345
parser.add_argument("--debuglevel", metavar="LEVEL",
2346
help="Debug level for stdout output")
2347
parser.add_argument("--priority", help="GnuTLS"
2348
" priority string (see GnuTLS documentation)")
2349
parser.add_argument("--servicename",
2350
metavar="NAME", help="Zeroconf service name")
2351
parser.add_argument("--configdir",
2352
default="/etc/mandos", metavar="DIR",
2353
help="Directory to search for configuration"
2355
parser.add_argument("--no-dbus", action="store_false",
2356
dest="use_dbus", help="Do not provide D-Bus"
2357
" system bus interface", default=None)
2358
parser.add_argument("--no-ipv6", action="store_false",
2359
dest="use_ipv6", help="Do not use IPv6",
2361
parser.add_argument("--no-restore", action="store_false",
2362
dest="restore", help="Do not restore stored"
2363
" state", default=None)
2364
parser.add_argument("--socket", type=int,
2365
help="Specify a file descriptor to a network"
2366
" socket to use instead of creating one")
2367
parser.add_argument("--statedir", metavar="DIR",
2368
help="Directory to save/restore state in")
2369
parser.add_argument("--foreground", action="store_true",
2370
help="Run in foreground", default=None)
2371
parser.add_argument("--no-zeroconf", action="store_false",
2372
dest="zeroconf", help="Do not use Zeroconf",
2375
options = parser.parse_args()
1596
parser = optparse.OptionParser(version = "%%prog %s" % version)
1597
parser.add_option("-i", u"--interface", type=u"string",
1598
metavar="IF", help=u"Bind to interface IF")
1599
parser.add_option("-a", u"--address", type=u"string",
1600
help=u"Address to listen for requests on")
1601
parser.add_option("-p", u"--port", type=u"int",
1602
help=u"Port number to receive requests on")
1603
parser.add_option("--check", action=u"store_true",
1604
help=u"Run self-test")
1605
parser.add_option("--debug", action=u"store_true",
1606
help=u"Debug mode; run in foreground and log to"
1608
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1609
u" priority string (see GnuTLS documentation)")
1610
parser.add_option("--servicename", type=u"string",
1611
metavar=u"NAME", help=u"Zeroconf service name")
1612
parser.add_option("--configdir", type=u"string",
1613
default=u"/etc/mandos", metavar=u"DIR",
1614
help=u"Directory to search for configuration"
1616
parser.add_option("--no-dbus", action=u"store_false",
1617
dest=u"use_dbus", help=u"Do not provide D-Bus"
1618
u" system bus interface")
1619
parser.add_option("--no-ipv6", action=u"store_false",
1620
dest=u"use_ipv6", help=u"Do not use IPv6")
1621
options = parser.parse_args()[0]
2377
1623
if options.check:
2379
fail_count, test_count = doctest.testmod()
2380
sys.exit(os.EX_OK if fail_count == 0 else 1)
2382
1628
# Default values for config file for server-global settings
2383
server_defaults = { "interface": "",
2388
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2390
"servicename": "Mandos",
2396
"statedir": "/var/lib/mandos",
2397
"foreground": "False",
1629
server_defaults = { u"interface": u"",
1634
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1635
u"servicename": u"Mandos",
1636
u"use_dbus": u"True",
1637
u"use_ipv6": u"True",
2401
1640
# Parse config file for server-global settings
2402
1641
server_config = configparser.SafeConfigParser(server_defaults)
2403
1642
del server_defaults
2404
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1643
server_config.read(os.path.join(options.configdir,
2405
1645
# Convert the SafeConfigParser object to a dict
2406
1646
server_settings = server_config.defaults()
2407
1647
# Use the appropriate methods on the non-string config options
2408
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2409
server_settings[option] = server_config.getboolean("DEFAULT",
1648
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1649
server_settings[option] = server_config.getboolean(u"DEFAULT",
2411
1651
if server_settings["port"]:
2412
server_settings["port"] = server_config.getint("DEFAULT",
2414
if server_settings["socket"]:
2415
server_settings["socket"] = server_config.getint("DEFAULT",
2417
# Later, stdin will, and stdout and stderr might, be dup'ed
2418
# over with an opened os.devnull. But we don't want this to
2419
# happen with a supplied network socket.
2420
if 0 <= server_settings["socket"] <= 2:
2421
server_settings["socket"] = os.dup(server_settings
1652
server_settings["port"] = server_config.getint(u"DEFAULT",
2423
1654
del server_config
2425
1656
# Override the settings from the config file with command line
2426
1657
# options, if set.
2427
for option in ("interface", "address", "port", "debug",
2428
"priority", "servicename", "configdir", "use_dbus",
2429
"use_ipv6", "debuglevel", "restore", "statedir",
2430
"socket", "foreground", "zeroconf"):
1658
for option in (u"interface", u"address", u"port", u"debug",
1659
u"priority", u"servicename", u"configdir",
1660
u"use_dbus", u"use_ipv6"):
2431
1661
value = getattr(options, option)
2432
1662
if value is not None:
2433
1663
server_settings[option] = value
2435
1665
# Force all strings to be unicode
2436
1666
for option in server_settings.keys():
2437
if isinstance(server_settings[option], bytes):
2438
server_settings[option] = (server_settings[option]
2440
# Force all boolean options to be boolean
2441
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
"foreground", "zeroconf"):
2443
server_settings[option] = bool(server_settings[option])
2444
# Debug implies foreground
2445
if server_settings["debug"]:
2446
server_settings["foreground"] = True
1667
if type(server_settings[option]) is str:
1668
server_settings[option] = unicode(server_settings[option])
2447
1669
# Now we have our good server settings in "server_settings"
2449
1671
##################################################################
2451
if (not server_settings["zeroconf"]
2452
and not (server_settings["port"]
2453
or server_settings["socket"] != "")):
2454
parser.error("Needs port or socket to work without Zeroconf")
2456
1673
# For convenience
2457
debug = server_settings["debug"]
2458
debuglevel = server_settings["debuglevel"]
2459
use_dbus = server_settings["use_dbus"]
2460
use_ipv6 = server_settings["use_ipv6"]
2461
stored_state_path = os.path.join(server_settings["statedir"],
2463
foreground = server_settings["foreground"]
2464
zeroconf = server_settings["zeroconf"]
2467
initlogger(debug, logging.DEBUG)
2472
level = getattr(logging, debuglevel.upper())
2473
initlogger(debug, level)
2475
if server_settings["servicename"] != "Mandos":
2476
syslogger.setFormatter(
2477
logging.Formatter('Mandos ({}) [%(process)d]:'
2478
' %(levelname)s: %(message)s'.format(
2479
server_settings["servicename"])))
1674
debug = server_settings[u"debug"]
1675
use_dbus = server_settings[u"use_dbus"]
1676
use_ipv6 = server_settings[u"use_ipv6"]
1679
syslogger.setLevel(logging.WARNING)
1680
console.setLevel(logging.WARNING)
1682
if server_settings[u"servicename"] != u"Mandos":
1683
syslogger.setFormatter(logging.Formatter
1684
(u'Mandos (%s) [%%(process)d]:'
1685
u' %%(levelname)s: %%(message)s'
1686
% server_settings[u"servicename"]))
2481
1688
# Parse config file with clients
2482
client_config = configparser.SafeConfigParser(Client
2484
client_config.read(os.path.join(server_settings["configdir"],
1689
client_defaults = { u"timeout": u"1h",
1691
u"checker": u"fping -q -- %%(host)s",
1693
u"approved_delay": u"5m",
1694
u"approved_duration": u"1s",
1696
client_config = configparser.SafeConfigParser(client_defaults)
1697
client_config.read(os.path.join(server_settings[u"configdir"],
2487
1700
global mandos_dbus_service
2488
1701
mandos_dbus_service = None
2491
if server_settings["socket"] != "":
2492
socketfd = server_settings["socket"]
2493
tcp_server = MandosServer(
2494
(server_settings["address"], server_settings["port"]),
2496
interface=(server_settings["interface"] or None),
2498
gnutls_priority=server_settings["priority"],
2502
pidfilename = "/run/mandos.pid"
2503
if not os.path.isdir("/run/."):
2504
pidfilename = "/var/run/mandos.pid"
2507
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2508
except IOError as e:
2509
logger.error("Could not open file %r", pidfilename,
1703
tcp_server = MandosServer((server_settings[u"address"],
1704
server_settings[u"port"]),
1706
interface=server_settings[u"interface"],
1709
server_settings[u"priority"],
1711
pidfilename = u"/var/run/mandos.pid"
1713
pidfile = open(pidfilename, u"w")
1715
logger.error(u"Could not open file %r", pidfilename)
2512
for name in ("_mandos", "mandos", "nobody"):
1718
uid = pwd.getpwnam(u"_mandos").pw_uid
1719
gid = pwd.getpwnam(u"_mandos").pw_gid
2514
uid = pwd.getpwnam(name).pw_uid
2515
gid = pwd.getpwnam(name).pw_gid
1722
uid = pwd.getpwnam(u"mandos").pw_uid
1723
gid = pwd.getpwnam(u"mandos").pw_gid
2517
1724
except KeyError:
1726
uid = pwd.getpwnam(u"nobody").pw_uid
1727
gid = pwd.getpwnam(u"nobody").pw_gid
2525
except OSError as error:
2526
if error.errno != errno.EPERM:
1734
except OSError, error:
1735
if error[0] != errno.EPERM:
1738
# Enable all possible GnuTLS debugging
2530
# Enable all possible GnuTLS debugging
2532
1740
# "Use a log level over 10 to enable all debugging options."
2533
1741
# - GnuTLS manual
2534
1742
gnutls.library.functions.gnutls_global_set_log_level(11)
2536
1744
@gnutls.library.types.gnutls_log_func
2537
1745
def debug_gnutls(level, string):
2538
logger.debug("GnuTLS: %s", string[:-1])
2540
gnutls.library.functions.gnutls_global_set_log_function(
2543
# Redirect stdin so all checkers get /dev/null
2544
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2545
os.dup2(null, sys.stdin.fileno())
2549
# Need to fork before connecting to D-Bus
2551
# Close all input and output, do double fork, etc.
2554
# multiprocessing will use threads, so before we use gobject we
2555
# need to inform gobject that threads will be used.
2556
gobject.threads_init()
1746
logger.debug(u"GnuTLS: %s", string[:-1])
1748
(gnutls.library.functions
1749
.gnutls_global_set_log_function(debug_gnutls))
2558
1751
global main_loop
2559
1752
# From the Avahi example code
2560
DBusGMainLoop(set_as_default=True)
1753
DBusGMainLoop(set_as_default=True )
2561
1754
main_loop = gobject.MainLoop()
2562
1755
bus = dbus.SystemBus()
2563
1756
# End of Avahi example code
2566
bus_name = dbus.service.BusName("se.recompile.Mandos",
2569
old_bus_name = dbus.service.BusName(
2570
"se.bsnet.fukt.Mandos", bus,
2572
except dbus.exceptions.DBusException as e:
2573
logger.error("Disabling D-Bus:", exc_info=e)
1759
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1760
bus, do_not_queue=True)
1761
except dbus.exceptions.NameExistsException, e:
1762
logger.error(unicode(e) + u", disabling D-Bus")
2574
1763
use_dbus = False
2575
server_settings["use_dbus"] = False
1764
server_settings[u"use_dbus"] = False
2576
1765
tcp_server.use_dbus = False
2578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
service = AvahiServiceToSyslog(
2580
name = server_settings["servicename"],
2581
servicetype = "_mandos._tcp",
2582
protocol = protocol,
2584
if server_settings["interface"]:
2585
service.interface = if_nametoindex(
2586
server_settings["interface"].encode("utf-8"))
1766
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1767
service = AvahiService(name = server_settings[u"servicename"],
1768
servicetype = u"_mandos._tcp",
1769
protocol = protocol, bus = bus)
1770
if server_settings["interface"]:
1771
service.interface = (if_nametoindex
1772
(str(server_settings[u"interface"])))
2588
1774
global multiprocessing_manager
2589
1775
multiprocessing_manager = multiprocessing.Manager()
2591
1777
client_class = Client
2593
1779
client_class = functools.partial(ClientDBus, bus = bus)
2595
client_settings = Client.config_parser(client_config)
2596
old_client_settings = {}
2599
# This is used to redirect stdout and stderr for checker processes
2601
wnull = open(os.devnull, "w") # A writable /dev/null
2602
# Only used if server is running in foreground but not in debug
2604
if debug or not foreground:
2607
# Get client data and settings from last running state.
2608
if server_settings["restore"]:
2610
with open(stored_state_path, "rb") as stored_state:
2611
clients_data, old_client_settings = pickle.load(
2613
os.remove(stored_state_path)
2614
except IOError as e:
2615
if e.errno == errno.ENOENT:
2616
logger.warning("Could not load persistent state:"
2617
" {}".format(os.strerror(e.errno)))
2619
logger.critical("Could not load persistent state:",
2622
except EOFError as e:
2623
logger.warning("Could not load persistent state: "
2627
with PGPEngine() as pgp:
2628
for client_name, client in clients_data.items():
2629
# Skip removed clients
2630
if client_name not in client_settings:
2633
# Decide which value to use after restoring saved state.
2634
# We have three different values: Old config file,
2635
# new config file, and saved state.
2636
# New config value takes precedence if it differs from old
2637
# config value, otherwise use saved state.
2638
for name, value in client_settings[client_name].items():
2640
# For each value in new config, check if it
2641
# differs from the old config value (Except for
2642
# the "secret" attribute)
2643
if (name != "secret"
2645
old_client_settings[client_name][name])):
2646
client[name] = value
2650
# Clients who has passed its expire date can still be
2651
# enabled if its last checker was successful. A Client
2652
# whose checker succeeded before we stored its state is
2653
# assumed to have successfully run all checkers during
2655
if client["enabled"]:
2656
if datetime.datetime.utcnow() >= client["expires"]:
2657
if not client["last_checked_ok"]:
2659
"disabling client {} - Client never "
2660
"performed a successful checker".format(
2662
client["enabled"] = False
2663
elif client["last_checker_status"] != 0:
2665
"disabling client {} - Client last"
2666
" checker failed with error code"
2669
client["last_checker_status"]))
2670
client["enabled"] = False
2672
client["expires"] = (
2673
datetime.datetime.utcnow()
2674
+ client["timeout"])
2675
logger.debug("Last checker succeeded,"
2676
" keeping {} enabled".format(
1780
def client_config_items(config, section):
1781
special_settings = {
1782
"approved_by_default":
1783
lambda: config.getboolean(section,
1784
"approved_by_default"),
1786
for name, value in config.items(section):
2679
client["secret"] = pgp.decrypt(
2680
client["encrypted_secret"],
2681
client_settings[client_name]["secret"])
2683
# If decryption fails, we use secret from new settings
2684
logger.debug("Failed to decrypt {} old secret".format(
2686
client["secret"] = (client_settings[client_name]
2689
# Add/remove clients based on new changes made to config
2690
for client_name in (set(old_client_settings)
2691
- set(client_settings)):
2692
del clients_data[client_name]
2693
for client_name in (set(client_settings)
2694
- set(old_client_settings)):
2695
clients_data[client_name] = client_settings[client_name]
2697
# Create all client objects
2698
for client_name, client in clients_data.items():
2699
tcp_server.clients[client_name] = client_class(
2702
server_settings = server_settings)
1788
yield (name, special_settings[name]())
1792
tcp_server.clients.update(set(
1793
client_class(name = section,
1794
config= dict(client_config_items(
1795
client_config, section)))
1796
for section in client_config.sections()))
2704
1797
if not tcp_server.clients:
2705
logger.warning("No clients defined")
2708
if pidfile is not None:
1798
logger.warning(u"No clients defined")
1801
# Redirect stdin so all checkers get /dev/null
1802
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1803
os.dup2(null, sys.stdin.fileno())
1807
# No console logging
1808
logger.removeHandler(console)
1809
# Close all input and output, do double fork, etc.
2709
1814
pid = os.getpid()
2712
print(pid, file=pidfile)
2714
logger.error("Could not write to file %r with PID %d",
1815
pidfile.write(str(pid) + "\n")
1818
logger.error(u"Could not write to file %r with PID %d",
1821
# "pidfile" was never created
1826
signal.signal(signal.SIGINT, signal.SIG_IGN)
2719
1827
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2720
1828
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2724
@alternate_dbus_interfaces(
2725
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2726
class MandosDBusService(DBusObjectWithProperties):
1831
class MandosDBusService(dbus.service.Object):
2727
1832
"""A D-Bus proxy object"""
2729
1833
def __init__(self):
2730
dbus.service.Object.__init__(self, bus, "/")
2732
_interface = "se.recompile.Mandos"
2734
@dbus_interface_annotations(_interface)
2737
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2740
@dbus.service.signal(_interface, signature="o")
1834
dbus.service.Object.__init__(self, bus, u"/")
1835
_interface = u"se.bsnet.fukt.Mandos"
1837
@dbus.service.signal(_interface, signature=u"o")
2741
1838
def ClientAdded(self, objpath):
2745
@dbus.service.signal(_interface, signature="ss")
1842
@dbus.service.signal(_interface, signature=u"ss")
2746
1843
def ClientNotFound(self, fingerprint, address):
2750
@dbus.service.signal(_interface, signature="os")
1847
@dbus.service.signal(_interface, signature=u"os")
2751
1848
def ClientRemoved(self, objpath, name):
2755
@dbus.service.method(_interface, out_signature="ao")
1852
@dbus.service.method(_interface, out_signature=u"ao")
2756
1853
def GetAllClients(self):
2758
return dbus.Array(c.dbus_object_path for c in
2759
tcp_server.clients.itervalues())
1855
return dbus.Array(c.dbus_object_path
1856
for c in tcp_server.clients)
2761
1858
@dbus.service.method(_interface,
2762
out_signature="a{oa{sv}}")
1859
out_signature=u"a{oa{sv}}")
2763
1860
def GetAllClientsWithProperties(self):
2765
1862
return dbus.Dictionary(
2766
{ c.dbus_object_path: c.GetAll("")
2767
for c in tcp_server.clients.itervalues() },
1863
((c.dbus_object_path, c.GetAll(u""))
1864
for c in tcp_server.clients),
1865
signature=u"oa{sv}")
2770
@dbus.service.method(_interface, in_signature="o")
1867
@dbus.service.method(_interface, in_signature=u"o")
2771
1868
def RemoveClient(self, object_path):
2773
for c in tcp_server.clients.itervalues():
1870
for c in tcp_server.clients:
2774
1871
if c.dbus_object_path == object_path:
2775
del tcp_server.clients[c.name]
1872
tcp_server.clients.remove(c)
2776
1873
c.remove_from_connection()
2777
1874
# Don't signal anything except ClientRemoved
2778
1875
c.disable(quiet=True)
2789
1886
"Cleanup function; run on exit"
2793
multiprocessing.active_children()
2795
if not (tcp_server.clients or client_settings):
2798
# Store client before exiting. Secrets are encrypted with key
2799
# based on what config file has. If config file is
2800
# removed/edited, old secret will thus be unrecovable.
2802
with PGPEngine() as pgp:
2803
for client in tcp_server.clients.itervalues():
2804
key = client_settings[client.name]["secret"]
2805
client.encrypted_secret = pgp.encrypt(client.secret,
2809
# A list of attributes that can not be pickled
2811
exclude = { "bus", "changedstate", "secret",
2812
"checker", "server_settings" }
2813
for name, typ in inspect.getmembers(dbus.service
2817
client_dict["encrypted_secret"] = (client
2819
for attr in client.client_structure:
2820
if attr not in exclude:
2821
client_dict[attr] = getattr(client, attr)
2823
clients[client.name] = client_dict
2824
del client_settings[client.name]["secret"]
2827
with tempfile.NamedTemporaryFile(
2831
dir=os.path.dirname(stored_state_path),
2832
delete=False) as stored_state:
2833
pickle.dump((clients, client_settings), stored_state)
2834
tempname = stored_state.name
2835
os.rename(tempname, stored_state_path)
2836
except (IOError, OSError) as e:
2842
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2843
logger.warning("Could not save persistent state: {}"
2844
.format(os.strerror(e.errno)))
2846
logger.warning("Could not save persistent state:",
2850
# Delete all clients, and settings from config
2851
1889
while tcp_server.clients:
2852
name, client = tcp_server.clients.popitem()
1890
client = tcp_server.clients.pop()
2854
1892
client.remove_from_connection()
1893
client.disable_hook = None
2855
1894
# Don't signal anything except ClientRemoved
2856
1895
client.disable(quiet=True)
2858
1897
# Emit D-Bus signal
2859
mandos_dbus_service.ClientRemoved(
2860
client.dbus_object_path, client.name)
2861
client_settings.clear()
1898
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2863
1901
atexit.register(cleanup)
2865
for client in tcp_server.clients.itervalues():
1903
for client in tcp_server.clients:
2867
1905
# Emit D-Bus signal
2868
1906
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2869
# Need to initiate checking of clients
2871
client.init_checker()
2873
1909
tcp_server.enable()
2874
1910
tcp_server.server_activate()
2876
1912
# Find out what port we got
2878
service.port = tcp_server.socket.getsockname()[1]
1913
service.port = tcp_server.socket.getsockname()[1]
2880
logger.info("Now listening on address %r, port %d,"
2881
" flowinfo %d, scope_id %d",
2882
*tcp_server.socket.getsockname())
1915
logger.info(u"Now listening on address %r, port %d,"
1916
" flowinfo %d, scope_id %d"
1917
% tcp_server.socket.getsockname())
2884
logger.info("Now listening on address %r, port %d",
2885
*tcp_server.socket.getsockname())
1919
logger.info(u"Now listening on address %r, port %d"
1920
% tcp_server.socket.getsockname())
2887
1922
#service.interface = tcp_server.socket.getsockname()[3]
2891
# From the Avahi example code
2894
except dbus.exceptions.DBusException as error:
2895
logger.critical("D-Bus Exception", exc_info=error)
2898
# End of Avahi example code
1925
# From the Avahi example code
1928
except dbus.exceptions.DBusException, error:
1929
logger.critical(u"DBusException: %s", error)
1932
# End of Avahi example code
2900
1934
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
1935
lambda *args, **kwargs:
2902
1936
(tcp_server.handle_request
2903
1937
(*args[2:], **kwargs) or True))
2905
logger.debug("Starting main loop")
1939
logger.debug(u"Starting main loop")
2906
1940
main_loop.run()
2907
except AvahiError as error:
2908
logger.critical("Avahi Error", exc_info=error)
1941
except AvahiError, error:
1942
logger.critical(u"AvahiError: %s", error)
2911
1945
except KeyboardInterrupt:
2913
print("", file=sys.stderr)
2914
logger.debug("Server received KeyboardInterrupt")
2915
logger.debug("Server exiting")
1948
logger.debug(u"Server received KeyboardInterrupt")
1949
logger.debug(u"Server exiting")
2916
1950
# Must run before the D-Bus bus name gets deregistered
2920
1953
if __name__ == '__main__':