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