84
74
from IN import SO_BINDTODEVICE
85
75
except ImportError:
86
SO_BINDTODEVICE = None
89
stored_state_file = "clients.pickle"
91
logger = logging.getLogger()
76
# From /usr/include/asm/socket.h
82
logger = logging.Logger(u'mandos')
92
83
syslogger = (logging.handlers.SysLogHandler
93
84
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
100
except (OSError, AttributeError):
101
def if_nametoindex(interface):
102
"Get an interface index the hard way, i.e. using fcntl()"
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
with contextlib.closing(socket.socket()) as s:
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
110
return interface_index
113
def initlogger(debug, level=logging.WARNING):
114
"""init logger and add loglevel"""
116
syslogger.setFormatter(logging.Formatter
117
('Mandos [%(process)d]: %(levelname)s:'
119
logger.addHandler(syslogger)
122
console = logging.StreamHandler()
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
logger.addHandler(console)
128
logger.setLevel(level)
131
class PGPError(Exception):
132
"""Exception if encryption/decryption fails"""
136
class PGPEngine(object):
137
"""A simple class for OpenPGP symmetric encryption & decryption"""
139
self.gnupg = GnuPGInterface.GnuPG()
140
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
self.gnupg = GnuPGInterface.GnuPG()
142
self.gnupg.options.meta_interactive = False
143
self.gnupg.options.homedir = self.tempdir
144
self.gnupg.options.extra_args.extend(['--force-mdc',
151
def __exit__ (self, exc_type, exc_value, traceback):
159
if self.tempdir is not None:
160
# Delete contents of tempdir
161
for root, dirs, files in os.walk(self.tempdir,
163
for filename in files:
164
os.remove(os.path.join(root, filename))
166
os.rmdir(os.path.join(root, dirname))
168
os.rmdir(self.tempdir)
171
def password_encode(self, password):
172
# Passphrase can not be empty and can not contain newlines or
173
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
176
def encrypt(self, data, password):
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
193
def decrypt(self, data, password):
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
208
return decrypted_plaintext
85
address = "/dev/log"))
86
syslogger.setFormatter(logging.Formatter
87
(u'Mandos [%(process)d]: %(levelname)s:'
89
logger.addHandler(syslogger)
91
console = logging.StreamHandler()
92
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
logger.addHandler(console)
212
97
class AvahiError(Exception):
213
98
def __init__(self, value, *args, **kwargs):
257
139
self.rename_count = 0
258
140
self.max_renames = max_renames
259
141
self.protocol = protocol
260
self.group = None # our entry group
263
self.entry_group_state_changed_match = None
264
142
def rename(self):
265
143
"""Derived from the Avahi example code"""
266
144
if self.rename_count >= self.max_renames:
267
logger.critical("No suitable Zeroconf service name found"
268
" after %i retries, exiting.",
145
logger.critical(u"No suitable Zeroconf service name found"
146
u" after %i retries, exiting.",
269
147
self.rename_count)
270
raise AvahiServiceError("Too many renames")
271
self.name = unicode(self.server
272
.GetAlternativeServiceName(self.name))
273
logger.info("Changing Zeroconf service name to %r ...",
148
raise AvahiServiceError(u"Too many renames")
149
self.name = server.GetAlternativeServiceName(self.name)
150
logger.info(u"Changing Zeroconf service name to %r ...",
152
syslogger.setFormatter(logging.Formatter
153
(u'Mandos (%s) [%%(process)d]:'
154
u' %%(levelname)s: %%(message)s'
278
except dbus.exceptions.DBusException as error:
279
logger.critical("DBusException: %s", error)
282
158
self.rename_count += 1
283
159
def remove(self):
284
160
"""Derived from the Avahi example code"""
285
if self.entry_group_state_changed_match is not None:
286
self.entry_group_state_changed_match.remove()
287
self.entry_group_state_changed_match = None
288
if self.group is not None:
161
if group is not None:
291
164
"""Derived from the Avahi example code"""
293
if self.group is None:
294
self.group = dbus.Interface(
295
self.bus.get_object(avahi.DBUS_NAME,
296
self.server.EntryGroupNew()),
297
avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
self.entry_group_state_changed_match = (
299
self.group.connect_to_signal(
300
'StateChanged', self.entry_group_state_changed))
301
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
self.name, self.type)
303
self.group.AddService(
306
dbus.UInt32(0), # flags
307
self.name, self.type,
308
self.domain, self.host,
309
dbus.UInt16(self.port),
310
avahi.string_array_to_txt_array(self.TXT))
312
def entry_group_state_changed(self, state, error):
313
"""Derived from the Avahi example code"""
314
logger.debug("Avahi entry group state change: %i", state)
316
if state == avahi.ENTRY_GROUP_ESTABLISHED:
317
logger.debug("Zeroconf service established.")
318
elif state == avahi.ENTRY_GROUP_COLLISION:
319
logger.info("Zeroconf service name collision.")
321
elif state == avahi.ENTRY_GROUP_FAILURE:
322
logger.critical("Avahi: Error in group state changed %s",
324
raise AvahiGroupError("State changed: %s"
327
"""Derived from the Avahi example code"""
328
if self.group is not None:
331
except (dbus.exceptions.UnknownMethodException,
332
dbus.exceptions.DBusException):
336
def server_state_changed(self, state, error=None):
337
"""Derived from the Avahi example code"""
338
logger.debug("Avahi server state change: %i", state)
339
bad_states = { avahi.SERVER_INVALID:
340
"Zeroconf server invalid",
341
avahi.SERVER_REGISTERING: None,
342
avahi.SERVER_COLLISION:
343
"Zeroconf server name collision",
344
avahi.SERVER_FAILURE:
345
"Zeroconf server failure" }
346
if state in bad_states:
347
if bad_states[state] is not None:
349
logger.error(bad_states[state])
351
logger.error(bad_states[state] + ": %r", error)
353
elif state == avahi.SERVER_RUNNING:
357
logger.debug("Unknown state: %r", state)
359
logger.debug("Unknown state: %r: %r", state, error)
361
"""Derived from the Avahi example code"""
362
if self.server is None:
363
self.server = dbus.Interface(
364
self.bus.get_object(avahi.DBUS_NAME,
365
avahi.DBUS_PATH_SERVER,
366
follow_name_owner_changes=True),
367
avahi.DBUS_INTERFACE_SERVER)
368
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
370
self.server_state_changed(self.server.GetState())
372
class AvahiServiceToSyslog(AvahiService):
374
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
167
group = dbus.Interface(bus.get_object
169
server.EntryGroupNew()),
170
avahi.DBUS_INTERFACE_ENTRY_GROUP)
171
group.connect_to_signal('StateChanged',
172
entry_group_state_changed)
173
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
174
service.name, service.type)
176
self.interface, # interface
177
self.protocol, # protocol
178
dbus.UInt32(0), # flags
179
self.name, self.type,
180
self.domain, self.host,
181
dbus.UInt16(self.port),
182
avahi.string_array_to_txt_array(self.TXT))
185
# From the Avahi example code:
186
group = None # our entry group
187
# End of Avahi example code
190
def _datetime_to_dbus(dt, variant_level=0):
191
"""Convert a UTC datetime.datetime() to a D-Bus type."""
192
return dbus.String(dt.isoformat(), variant_level=variant_level)
388
195
class Client(object):
389
196
"""A representation of a client host served by this server.
392
approved: bool(); 'None' if not yet approved/disapproved
393
approval_delay: datetime.timedelta(); Time to wait for approval
394
approval_duration: datetime.timedelta(); Duration of one approval
199
name: string; from the config file, used in log messages and
201
fingerprint: string (40 or 32 hexadecimal digits); used to
202
uniquely identify the client
203
secret: bytestring; sent verbatim (over TLS) to client
204
host: string; available for use by the checker command
205
created: datetime.datetime(); (UTC) object creation
206
last_enabled: datetime.datetime(); (UTC)
208
last_checked_ok: datetime.datetime(); (UTC) or None
209
timeout: datetime.timedelta(); How long from last_checked_ok
210
until this client is invalid
211
interval: datetime.timedelta(); How often to start a new checker
212
disable_hook: If set, called by disable() as disable_hook(self)
395
213
checker: subprocess.Popen(); a running checker process used
396
214
to see if the client lives.
397
215
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
399
checker_command: string; External command which is run to check
400
if client lives. %() expansions are done at
216
checker_initiator_tag: a gobject event source tag, or None
217
disable_initiator_tag: - '' -
218
checker_callback_tag: - '' -
219
checker_command: string; External command which is run to check if
220
client lives. %() expansions are done at
401
221
runtime with vars(self) as dict, so that for
402
222
instance %(name)s can be used in the command.
403
checker_initiator_tag: a gobject event source tag, or None
404
created: datetime.datetime(); (UTC) object creation
405
client_structure: Object describing what attributes a client has
406
and is used for storing the client at exit
407
223
current_checker_command: string; current running checker_command
408
disable_initiator_tag: a gobject event source tag, or None
410
fingerprint: string (40 or 32 hexadecimal digits); used to
411
uniquely identify the client
412
host: string; available for use by the checker command
413
interval: datetime.timedelta(); How often to start a new checker
414
last_approval_request: datetime.datetime(); (UTC) or None
415
last_checked_ok: datetime.datetime(); (UTC) or None
416
last_checker_status: integer between 0 and 255 reflecting exit
417
status of last checker. -1 reflects crashed
419
last_enabled: datetime.datetime(); (UTC) or None
420
name: string; from the config file, used in log messages and
422
secret: bytestring; sent verbatim (over TLS) to client
423
timeout: datetime.timedelta(); How long from last_checked_ok
424
until this client is disabled
425
extended_timeout: extra long timeout when secret has been sent
426
runtime_expansions: Allowed attributes for runtime expansion.
427
expires: datetime.datetime(); time (UTC) when a client will be
431
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
434
"last_enabled", "name", "timeout")
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
227
def _datetime_to_milliseconds(dt):
228
"Convert a datetime.datetime() to milliseconds"
229
return ((dt.days * 24 * 60 * 60 * 1000)
230
+ (dt.seconds * 1000)
231
+ (dt.microseconds // 1000))
446
233
def timeout_milliseconds(self):
447
234
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
235
return self._datetime_to_milliseconds(self.timeout)
454
237
def interval_milliseconds(self):
455
238
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
239
return self._datetime_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
462
def config_parser(config):
463
"""Construct a new dict of client settings of this form:
464
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above.
466
NOTE: Must be a pure function. Must return the same result
467
value given the same arguments.
470
for client_name in config.sections():
471
section = dict(config.items(client_name))
472
client = settings[client_name] = {}
474
client["host"] = section["host"]
475
# Reformat values from string types to Python types
476
client["approved_by_default"] = config.getboolean(
477
client_name, "approved_by_default")
478
client["enabled"] = config.getboolean(client_name,
481
client["fingerprint"] = (section["fingerprint"].upper()
483
if "secret" in section:
484
client["secret"] = section["secret"].decode("base64")
485
elif "secfile" in section:
486
with open(os.path.expanduser(os.path.expandvars
487
(section["secfile"])),
489
client["secret"] = secfile.read()
491
raise TypeError("No secret or secfile for section %s"
493
client["timeout"] = string_to_delta(section["timeout"])
494
client["extended_timeout"] = string_to_delta(
495
section["extended_timeout"])
496
client["interval"] = string_to_delta(section["interval"])
497
client["approval_delay"] = string_to_delta(
498
section["approval_delay"])
499
client["approval_duration"] = string_to_delta(
500
section["approval_duration"])
501
client["checker_command"] = section["checker"]
502
client["last_approval_request"] = None
503
client["last_checked_ok"] = None
504
client["last_checker_status"] = None
509
def __init__(self, settings, name = None):
241
def __init__(self, name = None, disable_hook=None, config=None):
510
242
"""Note: the 'checker' key in 'config' sets the
511
243
'checker_command' attribute and *not* the 'checker'
514
# adding all client settings
515
for setting, value in settings.iteritems():
516
setattr(self, setting, value)
519
if not hasattr(self, "last_enabled"):
520
self.last_enabled = datetime.datetime.utcnow()
521
if not hasattr(self, "expires"):
522
self.expires = (datetime.datetime.utcnow()
525
self.last_enabled = None
528
logger.debug("Creating client %r", self.name)
248
logger.debug(u"Creating client %r", self.name)
529
249
# Uppercase and remove spaces from fingerprint for later
530
250
# comparison purposes with return value from the fingerprint()
532
logger.debug(" Fingerprint: %s", self.fingerprint)
533
self.created = settings.get("created",
534
datetime.datetime.utcnow())
536
# attributes specific for this server instance
252
self.fingerprint = (config[u"fingerprint"].upper()
254
logger.debug(u" Fingerprint: %s", self.fingerprint)
255
if u"secret" in config:
256
self.secret = config[u"secret"].decode(u"base64")
257
elif u"secfile" in config:
258
with closing(open(os.path.expanduser
260
(config[u"secfile"])))) as secfile:
261
self.secret = secfile.read()
263
raise TypeError(u"No secret or secfile for client %s"
265
self.host = config.get(u"host", u"")
266
self.created = datetime.datetime.utcnow()
268
self.last_enabled = None
269
self.last_checked_ok = None
270
self.timeout = string_to_delta(config[u"timeout"])
271
self.interval = string_to_delta(config[u"interval"])
272
self.disable_hook = disable_hook
537
273
self.checker = None
538
274
self.checker_initiator_tag = None
539
275
self.disable_initiator_tag = None
540
276
self.checker_callback_tag = None
277
self.checker_command = config[u"checker"]
541
278
self.current_checker_command = None
543
self.approvals_pending = 0
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
549
if not attr.startswith("_")]
550
self.client_structure.append("client_structure")
552
for name, t in inspect.getmembers(type(self),
556
if not name.startswith("_"):
557
self.client_structure.append(name)
559
# Send notice to process children that client state has changed
560
def send_changedstate(self):
561
with self.changedstate:
562
self.changedstate.notify_all()
279
self.last_connect = None
564
281
def enable(self):
565
282
"""Start this client's checker and timeout hooks"""
566
if getattr(self, "enabled", False):
569
self.send_changedstate()
570
self.expires = datetime.datetime.utcnow() + self.timeout
572
283
self.last_enabled = datetime.datetime.utcnow()
575
def disable(self, quiet=True):
576
"""Disable this client."""
577
if not getattr(self, "enabled", False):
580
self.send_changedstate()
582
logger.info("Disabling client %s", self.name)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
585
self.disable_initiator_tag = None
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
589
self.checker_initiator_tag = None
592
# Do not run this again if called by a gobject.timeout_add
598
def init_checker(self):
599
284
# Schedule a new checker to be started an 'interval' from now,
600
285
# and every interval from then on.
601
286
self.checker_initiator_tag = (gobject.timeout_add
602
287
(self.interval_milliseconds(),
603
288
self.start_checker))
289
# Also start a new checker *right now*.
604
291
# Schedule a disable() when 'timeout' has passed
605
292
self.disable_initiator_tag = (gobject.timeout_add
606
293
(self.timeout_milliseconds(),
608
# Also start a new checker *right now*.
298
"""Disable this client."""
299
if not getattr(self, "enabled", False):
301
logger.info(u"Disabling client %s", self.name)
302
if getattr(self, u"disable_initiator_tag", False):
303
gobject.source_remove(self.disable_initiator_tag)
304
self.disable_initiator_tag = None
305
if getattr(self, u"checker_initiator_tag", False):
306
gobject.source_remove(self.checker_initiator_tag)
307
self.checker_initiator_tag = None
309
if self.disable_hook:
310
self.disable_hook(self)
312
# Do not run this again if called by a gobject.timeout_add
316
self.disable_hook = None
611
319
def checker_callback(self, pid, condition, command):
612
320
"""The checker has completed, so take appropriate actions."""
613
321
self.checker_callback_tag = None
614
322
self.checker = None
615
323
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
617
if self.last_checker_status == 0:
618
logger.info("Checker for %(name)s succeeded",
324
exitstatus = os.WEXITSTATUS(condition)
326
logger.info(u"Checker for %(name)s succeeded",
620
328
self.checked_ok()
622
logger.info("Checker for %(name)s failed",
330
logger.info(u"Checker for %(name)s failed",
625
self.last_checker_status = -1
626
logger.warning("Checker for %(name)s crashed?",
333
logger.warning(u"Checker for %(name)s crashed?",
629
def checked_ok(self, timeout=None):
336
def checked_ok(self):
630
337
"""Bump up the timeout for this client.
632
339
This should only be called when the client has been seen,
636
timeout = self.timeout
637
342
self.last_checked_ok = datetime.datetime.utcnow()
638
if self.disable_initiator_tag is not None:
639
gobject.source_remove(self.disable_initiator_tag)
640
if getattr(self, "enabled", False):
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
644
self.expires = datetime.datetime.utcnow() + timeout
646
def need_approval(self):
647
self.last_approval_request = datetime.datetime.utcnow()
343
gobject.source_remove(self.disable_initiator_tag)
344
self.disable_initiator_tag = (gobject.timeout_add
345
(self.timeout_milliseconds(),
649
348
def start_checker(self):
650
349
"""Start a new checker subprocess if one is not running.
726
418
if self.checker_callback_tag:
727
419
gobject.source_remove(self.checker_callback_tag)
728
420
self.checker_callback_tag = None
729
if getattr(self, "checker", None) is None:
421
if getattr(self, u"checker", None) is None:
731
logger.debug("Stopping checker for %(name)s", vars(self))
423
logger.debug(u"Stopping checker for %(name)s", vars(self))
733
425
os.kill(self.checker.pid, signal.SIGTERM)
735
427
#if self.checker.poll() is None:
736
428
# os.kill(self.checker.pid, signal.SIGKILL)
737
except OSError as error:
429
except OSError, error:
738
430
if error.errno != errno.ESRCH: # No such process
740
432
self.checker = None
743
def dbus_service_property(dbus_interface, signature="v",
744
access="readwrite", byte_arrays=False):
745
"""Decorators for marking methods of a DBusObjectWithProperties to
746
become properties on the D-Bus.
748
The decorated method will be called with no arguments by "Get"
749
and with one argument by "Set".
751
The parameters, where they are supported, are the same as
752
dbus.service.method, except there is only "signature", since the
753
type from Get() and the type sent to Set() is the same.
755
# Encoding deeply encoded byte arrays is not supported yet by the
756
# "Set" method, so we fail early here:
757
if byte_arrays and signature != "ay":
758
raise ValueError("Byte arrays not supported for non-'ay'"
759
" signature %r" % signature)
761
func._dbus_is_property = True
762
func._dbus_interface = dbus_interface
763
func._dbus_signature = signature
764
func._dbus_access = access
765
func._dbus_name = func.__name__
766
if func._dbus_name.endswith("_dbus_property"):
767
func._dbus_name = func._dbus_name[:-14]
768
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
773
class DBusPropertyException(dbus.exceptions.DBusException):
774
"""A base class for D-Bus property-related exceptions
776
def __unicode__(self):
777
return unicode(str(self))
780
class DBusPropertyAccessException(DBusPropertyException):
781
"""A property's access permissions disallows an operation.
786
class DBusPropertyNotFound(DBusPropertyException):
787
"""An attempt was made to access a non-existing property.
792
class DBusObjectWithProperties(dbus.service.Object):
793
"""A D-Bus object with properties.
795
Classes inheriting from this can use the dbus_service_property
796
decorator to expose methods as D-Bus properties. It exposes the
797
standard Get(), Set(), and GetAll() methods on the D-Bus.
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
804
def _get_all_dbus_properties(self):
805
"""Returns a generator of (name, attribute) pairs
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
for cls in self.__class__.__mro__
810
inspect.getmembers(cls, self._is_dbus_property))
812
def _get_dbus_property(self, interface_name, property_name):
813
"""Returns a bound method if one exists which is a D-Bus
814
property with the specified name and interface.
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
819
if (value._dbus_name == property_name
820
and value._dbus_interface == interface_name):
821
return value.__get__(self)
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
830
def Get(self, interface_name, property_name):
831
"""Standard D-Bus property Get() method, see D-Bus standard.
833
prop = self._get_dbus_property(interface_name, property_name)
834
if prop._dbus_access == "write":
835
raise DBusPropertyAccessException(property_name)
837
if not hasattr(value, "variant_level"):
839
return type(value)(value, variant_level=value.variant_level+1)
841
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
842
def Set(self, interface_name, property_name, value):
843
"""Standard D-Bus property Set() method, see D-Bus standard.
845
prop = self._get_dbus_property(interface_name, property_name)
846
if prop._dbus_access == "read":
847
raise DBusPropertyAccessException(property_name)
848
if prop._dbus_get_args_options["byte_arrays"]:
849
# The byte_arrays option is not supported yet on
850
# signatures other than "ay".
851
if prop._dbus_signature != "ay":
853
value = dbus.ByteArray(b''.join(chr(byte)
857
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
858
out_signature="a{sv}")
859
def GetAll(self, interface_name):
860
"""Standard D-Bus property GetAll() method, see D-Bus
863
Note: Will not include properties with access="write".
866
for name, prop in self._get_all_dbus_properties():
868
and interface_name != prop._dbus_interface):
869
# Interface non-empty but did not match
871
# Ignore write-only properties
872
if prop._dbus_access == "write":
875
if not hasattr(value, "variant_level"):
876
properties[name] = value
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
880
return dbus.Dictionary(properties, signature="sv")
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
path_keyword='object_path',
885
connection_keyword='connection')
886
def Introspect(self, object_path, connection):
887
"""Standard D-Bus method, overloaded to insert property tags.
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
892
document = xml.dom.minidom.parseString(xmlstring)
893
def make_tag(document, name, prop):
894
e = document.createElement("property")
895
e.setAttribute("name", name)
896
e.setAttribute("type", prop._dbus_signature)
897
e.setAttribute("access", prop._dbus_access)
899
for if_tag in document.getElementsByTagName("interface"):
900
for tag in (make_tag(document, name, prop)
902
in self._get_all_dbus_properties()
903
if prop._dbus_interface
904
== if_tag.getAttribute("name")):
905
if_tag.appendChild(tag)
906
# Add the names to the return values for the
907
# "org.freedesktop.DBus.Properties" methods
908
if (if_tag.getAttribute("name")
909
== "org.freedesktop.DBus.Properties"):
910
for cn in if_tag.getElementsByTagName("method"):
911
if cn.getAttribute("name") == "Get":
912
for arg in cn.getElementsByTagName("arg"):
913
if (arg.getAttribute("direction")
915
arg.setAttribute("name", "value")
916
elif cn.getAttribute("name") == "GetAll":
917
for arg in cn.getElementsByTagName("arg"):
918
if (arg.getAttribute("direction")
920
arg.setAttribute("name", "props")
921
xmlstring = document.toxml("utf-8")
923
except (AttributeError, xml.dom.DOMException,
924
xml.parsers.expat.ExpatError) as error:
925
logger.error("Failed to override Introspection method",
930
def datetime_to_dbus (dt, variant_level=0):
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
933
return dbus.String("", variant_level = variant_level)
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
950
# Ignore non-D-Bus attributes, and D-Bus attributes
951
# with the wrong interface name
952
if (not hasattr(attribute, "_dbus_interface")
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
956
# Create an alternate D-Bus interface name based on
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
961
# Is this a D-Bus signal?
962
if getattr(attribute, "_dbus_is_signal", False):
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
966
zip(attribute.func_code.co_freevars,
967
attribute.__closure__))["func"]
969
# Create a new, but exactly alike, function
970
# object, and decorate it to be a new D-Bus signal
971
# with the alternate D-Bus interface name
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
981
# Define a creator of a function to call both the
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
984
def fixscope(func1, func2):
985
"""This function is a scope container to pass
986
func1 and func2 to the "call_both" function
987
outside of its arguments"""
988
def call_both(*args, **kwargs):
989
"""This function will emit two D-Bus
990
signals by calling func1 and func2"""
991
func1(*args, **kwargs)
992
func2(*args, **kwargs)
994
# Create the "call_both" function and add it to
996
attr[attrname] = fixscope(attribute,
998
# Is this a D-Bus method?
999
elif getattr(attribute, "_dbus_is_method", False):
1000
# Create a new, but exactly alike, function
1001
# object. Decorate it to be a new D-Bus method
1002
# with the alternate D-Bus interface name. Add it
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1014
# Is this a D-Bus property?
1015
elif getattr(attribute, "_dbus_is_property", False):
1016
# Create a new, but exactly alike, function
1017
# object, and decorate it to be a new D-Bus
1018
# property with the alternate D-Bus interface
1019
# name. Add it to the class.
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1036
class ClientDBus(Client, DBusObjectWithProperties):
434
def still_valid(self):
435
"""Has the timeout not yet passed for this client?"""
436
if not getattr(self, u"enabled", False):
438
now = datetime.datetime.utcnow()
439
if self.last_checked_ok is None:
440
return now < (self.created + self.timeout)
442
return now < (self.last_checked_ok + self.timeout)
445
class ClientDBus(Client, dbus.service.Object):
1037
446
"""A Client class using D-Bus
1040
dbus_object_path: dbus.ObjectPath
1041
bus: dbus.SystemBus()
449
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
1044
runtime_expansions = (Client.runtime_expansions
1045
+ ("dbus_object_path",))
1047
451
# dbus.service.Object doesn't use super(), so we can't either.
1049
def __init__(self, bus = None, *args, **kwargs):
453
def __init__(self, *args, **kwargs):
1051
454
Client.__init__(self, *args, **kwargs)
1052
455
# Only now, when this client is initialized, can it show up on
1054
client_object_name = unicode(self.name).translate(
1055
{ord("."): ord("_"),
1056
ord("-"): ord("_")})
1057
457
self.dbus_object_path = (dbus.ObjectPath
1058
("/clients/" + client_object_name))
1059
DBusObjectWithProperties.__init__(self, self.bus,
1060
self.dbus_object_path)
1062
def notifychangeproperty(transform_func,
1063
dbus_name, type_func=lambda x: x,
1065
""" Modify a variable so that it's a property which announces
1066
its changes to DBus.
1068
transform_fun: Function that takes a value and a variant_level
1069
and transforms it to a D-Bus type.
1070
dbus_name: D-Bus name of the variable
1071
type_func: Function that transform the value before sending it
1072
to the D-Bus. Default: no transform
1073
variant_level: D-Bus variant level. Default: 1
1075
attrname = "_{0}".format(dbus_name)
1076
def setter(self, value):
1077
if hasattr(self, "dbus_object_path"):
1078
if (not hasattr(self, attrname) or
1079
type_func(getattr(self, attrname, None))
1080
!= type_func(value)):
1081
dbus_value = transform_func(type_func(value),
1084
self.PropertyChanged(dbus.String(dbus_name),
1086
setattr(self, attrname, value)
1088
return property(lambda self: getattr(self, attrname), setter)
1091
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1092
approvals_pending = notifychangeproperty(dbus.Boolean,
1095
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1096
last_enabled = notifychangeproperty(datetime_to_dbus,
1098
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1099
type_func = lambda checker:
1100
checker is not None)
1101
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
last_approval_request = notifychangeproperty(
1104
datetime_to_dbus, "LastApprovalRequest")
1105
approved_by_default = notifychangeproperty(dbus.Boolean,
1106
"ApprovedByDefault")
1107
approval_delay = notifychangeproperty(dbus.UInt64,
1110
timedelta_to_milliseconds)
1111
approval_duration = notifychangeproperty(
1112
dbus.UInt64, "ApprovalDuration",
1113
type_func = timedelta_to_milliseconds)
1114
host = notifychangeproperty(dbus.String, "Host")
1115
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1117
timedelta_to_milliseconds)
1118
extended_timeout = notifychangeproperty(
1119
dbus.UInt64, "ExtendedTimeout",
1120
type_func = timedelta_to_milliseconds)
1121
interval = notifychangeproperty(dbus.UInt64,
1124
timedelta_to_milliseconds)
1125
checker_command = notifychangeproperty(dbus.String, "Checker")
1127
del notifychangeproperty
459
+ self.name.replace(u".", u"_")))
460
dbus.service.Object.__init__(self, bus,
461
self.dbus_object_path)
463
oldstate = getattr(self, u"enabled", False)
464
r = Client.enable(self)
465
if oldstate != self.enabled:
467
self.PropertyChanged(dbus.String(u"enabled"),
468
dbus.Boolean(True, variant_level=1))
469
self.PropertyChanged(dbus.String(u"last_enabled"),
470
(_datetime_to_dbus(self.last_enabled,
474
def disable(self, signal = True):
475
oldstate = getattr(self, u"enabled", False)
476
r = Client.disable(self)
477
if signal and oldstate != self.enabled:
479
self.PropertyChanged(dbus.String(u"enabled"),
480
dbus.Boolean(False, variant_level=1))
1129
483
def __del__(self, *args, **kwargs):
1131
485
self.remove_from_connection()
1132
486
except LookupError:
1134
if hasattr(DBusObjectWithProperties, "__del__"):
1135
DBusObjectWithProperties.__del__(self, *args, **kwargs)
488
if hasattr(dbus.service.Object, u"__del__"):
489
dbus.service.Object.__del__(self, *args, **kwargs)
1136
490
Client.__del__(self, *args, **kwargs)
1138
492
def checker_callback(self, pid, condition, command,
1139
493
*args, **kwargs):
1140
494
self.checker_callback_tag = None
1141
495
self.checker = None
497
self.PropertyChanged(dbus.String(u"checker_running"),
498
dbus.Boolean(False, variant_level=1))
1142
499
if os.WIFEXITED(condition):
1143
500
exitstatus = os.WEXITSTATUS(condition)
1144
501
# Emit D-Bus signal
1166
532
and old_checker_pid != self.checker.pid):
1167
533
# Emit D-Bus signal
1168
534
self.CheckerStarted(self.current_checker_command)
1171
def _reset_approved(self):
1172
self.approved = None
1175
def approve(self, value=True):
1176
self.send_changedstate()
1177
self.approved = value
1178
gobject.timeout_add(timedelta_to_milliseconds
1179
(self.approval_duration),
1180
self._reset_approved)
1183
## D-Bus methods, signals & properties
1184
_interface = "se.recompile.Mandos.Client"
535
self.PropertyChanged(
536
dbus.String(u"checker_running"),
537
dbus.Boolean(True, variant_level=1))
540
def stop_checker(self, *args, **kwargs):
541
old_checker = getattr(self, u"checker", None)
542
r = Client.stop_checker(self, *args, **kwargs)
543
if (old_checker is not None
544
and getattr(self, u"checker", None) is None):
545
self.PropertyChanged(dbus.String(u"checker_running"),
546
dbus.Boolean(False, variant_level=1))
549
## D-Bus methods & signals
550
_interface = u"se.bsnet.fukt.Mandos.Client"
553
@dbus.service.method(_interface)
555
return self.checked_ok()
1188
557
# CheckerCompleted - signal
1189
@dbus.service.signal(_interface, signature="nxs")
558
@dbus.service.signal(_interface, signature=u"nxs")
1190
559
def CheckerCompleted(self, exitcode, waitstatus, command):
1194
563
# CheckerStarted - signal
1195
@dbus.service.signal(_interface, signature="s")
564
@dbus.service.signal(_interface, signature=u"s")
1196
565
def CheckerStarted(self, command):
569
# GetAllProperties - method
570
@dbus.service.method(_interface, out_signature=u"a{sv}")
571
def GetAllProperties(self):
573
return dbus.Dictionary({
574
dbus.String(u"name"):
575
dbus.String(self.name, variant_level=1),
576
dbus.String(u"fingerprint"):
577
dbus.String(self.fingerprint, variant_level=1),
578
dbus.String(u"host"):
579
dbus.String(self.host, variant_level=1),
580
dbus.String(u"created"):
581
_datetime_to_dbus(self.created, variant_level=1),
582
dbus.String(u"last_enabled"):
583
(_datetime_to_dbus(self.last_enabled,
585
if self.last_enabled is not None
586
else dbus.Boolean(False, variant_level=1)),
587
dbus.String(u"enabled"):
588
dbus.Boolean(self.enabled, variant_level=1),
589
dbus.String(u"last_checked_ok"):
590
(_datetime_to_dbus(self.last_checked_ok,
592
if self.last_checked_ok is not None
593
else dbus.Boolean (False, variant_level=1)),
594
dbus.String(u"timeout"):
595
dbus.UInt64(self.timeout_milliseconds(),
597
dbus.String(u"interval"):
598
dbus.UInt64(self.interval_milliseconds(),
600
dbus.String(u"checker"):
601
dbus.String(self.checker_command,
603
dbus.String(u"checker_running"):
604
dbus.Boolean(self.checker is not None,
606
dbus.String(u"object_path"):
607
dbus.ObjectPath(self.dbus_object_path,
611
# IsStillValid - method
612
@dbus.service.method(_interface, out_signature=u"b")
613
def IsStillValid(self):
614
return self.still_valid()
1200
616
# PropertyChanged - signal
1201
@dbus.service.signal(_interface, signature="sv")
617
@dbus.service.signal(_interface, signature=u"sv")
1202
618
def PropertyChanged(self, property, value):
1206
# GotSecret - signal
622
# ReceivedSecret - signal
1207
623
@dbus.service.signal(_interface)
1208
def GotSecret(self):
1210
Is sent after a successful transfer of secret from the Mandos
1211
server to mandos-client
624
def ReceivedSecret(self):
1215
628
# Rejected - signal
1216
@dbus.service.signal(_interface, signature="s")
1217
def Rejected(self, reason):
629
@dbus.service.signal(_interface)
1221
# NeedApproval - signal
1222
@dbus.service.signal(_interface, signature="tb")
1223
def NeedApproval(self, timeout, default):
1225
return self.need_approval()
1230
@dbus.service.method(_interface, in_signature="b")
1231
def Approve(self, value):
1234
# CheckedOK - method
1235
@dbus.service.method(_interface)
1236
def CheckedOK(self):
634
# SetChecker - method
635
@dbus.service.method(_interface, in_signature=u"s")
636
def SetChecker(self, checker):
637
"D-Bus setter method"
638
self.checker_command = checker
640
self.PropertyChanged(dbus.String(u"checker"),
641
dbus.String(self.checker_command,
645
@dbus.service.method(_interface, in_signature=u"s")
646
def SetHost(self, host):
647
"D-Bus setter method"
650
self.PropertyChanged(dbus.String(u"host"),
651
dbus.String(self.host, variant_level=1))
653
# SetInterval - method
654
@dbus.service.method(_interface, in_signature=u"t")
655
def SetInterval(self, milliseconds):
656
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
658
self.PropertyChanged(dbus.String(u"interval"),
659
(dbus.UInt64(self.interval_milliseconds(),
663
@dbus.service.method(_interface, in_signature=u"ay",
665
def SetSecret(self, secret):
666
"D-Bus setter method"
667
self.secret = str(secret)
669
# SetTimeout - method
670
@dbus.service.method(_interface, in_signature=u"t")
671
def SetTimeout(self, milliseconds):
672
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
674
self.PropertyChanged(dbus.String(u"timeout"),
675
(dbus.UInt64(self.timeout_milliseconds(),
1239
678
# Enable - method
1240
679
@dbus.service.method(_interface)
1259
698
def StopChecker(self):
1260
699
self.stop_checker()
1264
# ApprovalPending - property
1265
@dbus_service_property(_interface, signature="b", access="read")
1266
def ApprovalPending_dbus_property(self):
1267
return dbus.Boolean(bool(self.approvals_pending))
1269
# ApprovedByDefault - property
1270
@dbus_service_property(_interface, signature="b",
1272
def ApprovedByDefault_dbus_property(self, value=None):
1273
if value is None: # get
1274
return dbus.Boolean(self.approved_by_default)
1275
self.approved_by_default = bool(value)
1277
# ApprovalDelay - property
1278
@dbus_service_property(_interface, signature="t",
1280
def ApprovalDelay_dbus_property(self, value=None):
1281
if value is None: # get
1282
return dbus.UInt64(self.approval_delay_milliseconds())
1283
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1285
# ApprovalDuration - property
1286
@dbus_service_property(_interface, signature="t",
1288
def ApprovalDuration_dbus_property(self, value=None):
1289
if value is None: # get
1290
return dbus.UInt64(timedelta_to_milliseconds(
1291
self.approval_duration))
1292
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1295
@dbus_service_property(_interface, signature="s", access="read")
1296
def Name_dbus_property(self):
1297
return dbus.String(self.name)
1299
# Fingerprint - property
1300
@dbus_service_property(_interface, signature="s", access="read")
1301
def Fingerprint_dbus_property(self):
1302
return dbus.String(self.fingerprint)
1305
@dbus_service_property(_interface, signature="s",
1307
def Host_dbus_property(self, value=None):
1308
if value is None: # get
1309
return dbus.String(self.host)
1310
self.host = unicode(value)
1312
# Created - property
1313
@dbus_service_property(_interface, signature="s", access="read")
1314
def Created_dbus_property(self):
1315
return datetime_to_dbus(self.created)
1317
# LastEnabled - property
1318
@dbus_service_property(_interface, signature="s", access="read")
1319
def LastEnabled_dbus_property(self):
1320
return datetime_to_dbus(self.last_enabled)
1322
# Enabled - property
1323
@dbus_service_property(_interface, signature="b",
1325
def Enabled_dbus_property(self, value=None):
1326
if value is None: # get
1327
return dbus.Boolean(self.enabled)
1333
# LastCheckedOK - property
1334
@dbus_service_property(_interface, signature="s",
1336
def LastCheckedOK_dbus_property(self, value=None):
1337
if value is not None:
1340
return datetime_to_dbus(self.last_checked_ok)
1342
# Expires - property
1343
@dbus_service_property(_interface, signature="s", access="read")
1344
def Expires_dbus_property(self):
1345
return datetime_to_dbus(self.expires)
1347
# LastApprovalRequest - property
1348
@dbus_service_property(_interface, signature="s", access="read")
1349
def LastApprovalRequest_dbus_property(self):
1350
return datetime_to_dbus(self.last_approval_request)
1352
# Timeout - property
1353
@dbus_service_property(_interface, signature="t",
1355
def Timeout_dbus_property(self, value=None):
1356
if value is None: # get
1357
return dbus.UInt64(self.timeout_milliseconds())
1358
self.timeout = datetime.timedelta(0, 0, 0, value)
1359
# Reschedule timeout
1361
now = datetime.datetime.utcnow()
1362
time_to_die = timedelta_to_milliseconds(
1363
(self.last_checked_ok + self.timeout) - now)
1364
if time_to_die <= 0:
1365
# The timeout has passed
1368
self.expires = (now +
1369
datetime.timedelta(milliseconds =
1371
if (getattr(self, "disable_initiator_tag", None)
1374
gobject.source_remove(self.disable_initiator_tag)
1375
self.disable_initiator_tag = (gobject.timeout_add
1379
# ExtendedTimeout - property
1380
@dbus_service_property(_interface, signature="t",
1382
def ExtendedTimeout_dbus_property(self, value=None):
1383
if value is None: # get
1384
return dbus.UInt64(self.extended_timeout_milliseconds())
1385
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1387
# Interval - property
1388
@dbus_service_property(_interface, signature="t",
1390
def Interval_dbus_property(self, value=None):
1391
if value is None: # get
1392
return dbus.UInt64(self.interval_milliseconds())
1393
self.interval = datetime.timedelta(0, 0, 0, value)
1394
if getattr(self, "checker_initiator_tag", None) is None:
1397
# Reschedule checker run
1398
gobject.source_remove(self.checker_initiator_tag)
1399
self.checker_initiator_tag = (gobject.timeout_add
1400
(value, self.start_checker))
1401
self.start_checker() # Start one now, too
1403
# Checker - property
1404
@dbus_service_property(_interface, signature="s",
1406
def Checker_dbus_property(self, value=None):
1407
if value is None: # get
1408
return dbus.String(self.checker_command)
1409
self.checker_command = unicode(value)
1411
# CheckerRunning - property
1412
@dbus_service_property(_interface, signature="b",
1414
def CheckerRunning_dbus_property(self, value=None):
1415
if value is None: # get
1416
return dbus.Boolean(self.checker is not None)
1418
self.start_checker()
1422
# ObjectPath - property
1423
@dbus_service_property(_interface, signature="o", access="read")
1424
def ObjectPath_dbus_property(self):
1425
return self.dbus_object_path # is already a dbus.ObjectPath
1428
@dbus_service_property(_interface, signature="ay",
1429
access="write", byte_arrays=True)
1430
def Secret_dbus_property(self, value):
1431
self.secret = str(value)
1436
class ProxyClient(object):
1437
def __init__(self, child_pipe, fpr, address):
1438
self._pipe = child_pipe
1439
self._pipe.send(('init', fpr, address))
1440
if not self._pipe.recv():
1443
def __getattribute__(self, name):
1445
return super(ProxyClient, self).__getattribute__(name)
1446
self._pipe.send(('getattr', name))
1447
data = self._pipe.recv()
1448
if data[0] == 'data':
1450
if data[0] == 'function':
1451
def func(*args, **kwargs):
1452
self._pipe.send(('funcall', name, args, kwargs))
1453
return self._pipe.recv()[1]
1456
def __setattr__(self, name, value):
1458
return super(ProxyClient, self).__setattr__(name, value)
1459
self._pipe.send(('setattr', name, value))
1462
class ClientDBusTransitional(ClientDBus):
1463
__metaclass__ = AlternateDBusNamesMetaclass
1466
704
class ClientHandler(socketserver.BaseRequestHandler, object):
1467
705
"""A class to handle client connections.
1470
708
Note: This will run in its own forked process."""
1472
710
def handle(self):
1473
with contextlib.closing(self.server.child_pipe) as child_pipe:
1474
logger.info("TCP connection from: %s",
1475
unicode(self.client_address))
1476
logger.debug("Pipe FD: %d",
1477
self.server.child_pipe.fileno())
711
logger.info(u"TCP connection from: %s",
712
unicode(self.client_address))
713
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
714
# Open IPC pipe to parent process
715
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1479
716
session = (gnutls.connection
1480
717
.ClientSession(self.request,
1481
718
gnutls.connection
1482
719
.X509Credentials()))
721
line = self.request.makefile().readline()
722
logger.debug(u"Protocol version: %r", line)
724
if int(line.strip().split()[0]) > 1:
726
except (ValueError, IndexError, RuntimeError), error:
727
logger.error(u"Unknown protocol version: %s", error)
1484
730
# Note: gnutls.connection.X509Credentials is really a
1485
731
# generic GnuTLS certificate credentials object so long as
1486
732
# no X.509 keys are added to it. Therefore, we can use it
1487
733
# here despite using OpenPGP certificates.
1489
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1490
# "+AES-256-CBC", "+SHA1",
1491
# "+COMP-NULL", "+CTYPE-OPENPGP",
735
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
736
# u"+AES-256-CBC", u"+SHA1",
737
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1493
739
# Use a fallback default, since this MUST be set.
1494
740
priority = self.server.gnutls_priority
1495
741
if priority is None:
1497
743
(gnutls.library.functions
1498
744
.gnutls_priority_set_direct(session._c_object,
1499
745
priority, None))
1501
# Start communication using the Mandos protocol
1502
# Get protocol number
1503
line = self.request.makefile().readline()
1504
logger.debug("Protocol version: %r", line)
1506
if int(line.strip().split()[0]) > 1:
1508
except (ValueError, IndexError, RuntimeError) as error:
1509
logger.error("Unknown protocol version: %s", error)
1512
# Start GnuTLS connection
1514
748
session.handshake()
1515
except gnutls.errors.GNUTLSError as error:
1516
logger.warning("Handshake failed: %s", error)
749
except gnutls.errors.GNUTLSError, error:
750
logger.warning(u"Handshake failed: %s", error)
1517
751
# Do not run session.bye() here: the session is not
1518
752
# established. Just abandon the request.
1520
logger.debug("Handshake succeeded")
1522
approval_required = False
754
logger.debug(u"Handshake succeeded")
1525
fpr = self.fingerprint(self.peer_certificate
1528
gnutls.errors.GNUTLSError) as error:
1529
logger.warning("Bad certificate: %s", error)
1531
logger.debug("Fingerprint: %s", fpr)
1534
client = ProxyClient(child_pipe, fpr,
1535
self.client_address)
1539
if client.approval_delay:
1540
delay = client.approval_delay
1541
client.approvals_pending += 1
1542
approval_required = True
1545
if not client.enabled:
1546
logger.info("Client %s is disabled",
1548
if self.server.use_dbus:
1550
client.Rejected("Disabled")
1553
if client.approved or not client.approval_delay:
1554
#We are approved or approval is disabled
1556
elif client.approved is None:
1557
logger.info("Client %s needs approval",
1559
if self.server.use_dbus:
1561
client.NeedApproval(
1562
client.approval_delay_milliseconds(),
1563
client.approved_by_default)
1565
logger.warning("Client %s was not approved",
1567
if self.server.use_dbus:
1569
client.Rejected("Denied")
1572
#wait until timeout or approved
1573
time = datetime.datetime.now()
1574
client.changedstate.acquire()
1575
(client.changedstate.wait
1576
(float(client.timedelta_to_milliseconds(delay)
1578
client.changedstate.release()
1579
time2 = datetime.datetime.now()
1580
if (time2 - time) >= delay:
1581
if not client.approved_by_default:
1582
logger.warning("Client %s timed out while"
1583
" waiting for approval",
1585
if self.server.use_dbus:
1587
client.Rejected("Approval timed out")
1592
delay -= time2 - time
1595
while sent_size < len(client.secret):
1597
sent = session.send(client.secret[sent_size:])
1598
except gnutls.errors.GNUTLSError as error:
1599
logger.warning("gnutls send failed")
1601
logger.debug("Sent: %d, remaining: %d",
1602
sent, len(client.secret)
1603
- (sent_size + sent))
1606
logger.info("Sending secret to %s", client.name)
1607
# bump the timeout using extended_timeout
1608
client.checked_ok(client.extended_timeout)
1609
if self.server.use_dbus:
756
fpr = self.fingerprint(self.peer_certificate(session))
757
except (TypeError, gnutls.errors.GNUTLSError), error:
758
logger.warning(u"Bad certificate: %s", error)
761
logger.debug(u"Fingerprint: %s", fpr)
1614
if approval_required:
1615
client.approvals_pending -= 1
1618
except gnutls.errors.GNUTLSError as error:
1619
logger.warning("GnuTLS bye failed")
763
for c in self.server.clients:
764
if c.fingerprint == fpr:
768
ipc.write(u"NOTFOUND %s\n" % fpr)
771
# Have to check if client.still_valid(), since it is
772
# possible that the client timed out while establishing
773
# the GnuTLS session.
774
if not client.still_valid():
775
ipc.write(u"INVALID %s\n" % client.name)
778
ipc.write(u"SENDING %s\n" % client.name)
780
while sent_size < len(client.secret):
781
sent = session.send(client.secret[sent_size:])
782
logger.debug(u"Sent: %d, remaining: %d",
783
sent, len(client.secret)
784
- (sent_size + sent))
1622
789
def peer_certificate(session):
1837
953
for cond, name in
1838
954
condition_names.iteritems()
1839
955
if cond & condition)
1840
# error, or the other end of multiprocessing.Pipe has closed
1841
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1842
# Wait for other process to exit
1846
# Read a request from the child
1847
request = parent_pipe.recv()
1848
command = request[0]
1850
if command == 'init':
1852
address = request[2]
1854
for c in self.clients.itervalues():
1855
if c.fingerprint == fpr:
1859
logger.info("Client not found for fingerprint: %s, ad"
1860
"dress: %s", fpr, address)
1863
mandos_dbus_service.ClientNotFound(fpr,
1865
parent_pipe.send(False)
1868
gobject.io_add_watch(parent_pipe.fileno(),
1869
gobject.IO_IN | gobject.IO_HUP,
1870
functools.partial(self.handle_ipc,
1876
parent_pipe.send(True)
1877
# remove the old hook in favor of the new above hook on
1880
if command == 'funcall':
1881
funcname = request[1]
1885
parent_pipe.send(('data', getattr(client_object,
1889
if command == 'getattr':
1890
attrname = request[1]
1891
if callable(client_object.__getattribute__(attrname)):
1892
parent_pipe.send(('function',))
1894
parent_pipe.send(('data', client_object
1895
.__getattribute__(attrname)))
1897
if command == 'setattr':
1898
attrname = request[1]
1900
setattr(client_object, attrname, value)
956
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
959
# Turn the pipe file descriptor into a Python file object
960
if source not in file_objects:
961
file_objects[source] = os.fdopen(source, u"r", 1)
963
# Read a line from the file object
964
cmdline = file_objects[source].readline()
965
if not cmdline: # Empty line means end of file
967
file_objects[source].close()
968
del file_objects[source]
970
# Stop calling this function
973
logger.debug(u"IPC command: %r", cmdline)
975
# Parse and act on command
976
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
978
if cmd == u"NOTFOUND":
979
logger.warning(u"Client not found for fingerprint: %s",
983
mandos_dbus_service.ClientNotFound(args)
984
elif cmd == u"INVALID":
985
for client in self.clients:
986
if client.name == args:
987
logger.warning(u"Client %s is invalid", args)
993
logger.error(u"Unknown client %s is invalid", args)
994
elif cmd == u"SENDING":
995
for client in self.clients:
996
if client.name == args:
997
logger.info(u"Sending secret to %s", client.name)
1001
client.ReceivedSecret()
1004
logger.error(u"Sending secret to unknown client %s",
1007
logger.error(u"Unknown IPC command: %r", cmdline)
1009
# Keep calling this function
1905
1013
def string_to_delta(interval):
1906
1014
"""Parse a string and return a datetime.timedelta
1908
>>> string_to_delta('7d')
1016
>>> string_to_delta(u'7d')
1909
1017
datetime.timedelta(7)
1910
>>> string_to_delta('60s')
1018
>>> string_to_delta(u'60s')
1911
1019
datetime.timedelta(0, 60)
1912
>>> string_to_delta('60m')
1020
>>> string_to_delta(u'60m')
1913
1021
datetime.timedelta(0, 3600)
1914
>>> string_to_delta('24h')
1022
>>> string_to_delta(u'24h')
1915
1023
datetime.timedelta(1)
1916
>>> string_to_delta('1w')
1024
>>> string_to_delta(u'1w')
1917
1025
datetime.timedelta(7)
1918
>>> string_to_delta('5m 30s')
1026
>>> string_to_delta(u'5m 30s')
1919
1027
datetime.timedelta(0, 330)
1921
1029
timevalue = datetime.timedelta(0)
1971
##################################################################
1125
######################################################################
1972
1126
# Parsing of options, both command line and config file
1974
parser = argparse.ArgumentParser()
1975
parser.add_argument("-v", "--version", action="version",
1976
version = "%%(prog)s %s" % version,
1977
help="show version number and exit")
1978
parser.add_argument("-i", "--interface", metavar="IF",
1979
help="Bind to interface IF")
1980
parser.add_argument("-a", "--address",
1981
help="Address to listen for requests on")
1982
parser.add_argument("-p", "--port", type=int,
1983
help="Port number to receive requests on")
1984
parser.add_argument("--check", action="store_true",
1985
help="Run self-test")
1986
parser.add_argument("--debug", action="store_true",
1987
help="Debug mode; run in foreground and log"
1989
parser.add_argument("--debuglevel", metavar="LEVEL",
1990
help="Debug level for stdout output")
1991
parser.add_argument("--priority", help="GnuTLS"
1992
" priority string (see GnuTLS documentation)")
1993
parser.add_argument("--servicename",
1994
metavar="NAME", help="Zeroconf service name")
1995
parser.add_argument("--configdir",
1996
default="/etc/mandos", metavar="DIR",
1997
help="Directory to search for configuration"
1999
parser.add_argument("--no-dbus", action="store_false",
2000
dest="use_dbus", help="Do not provide D-Bus"
2001
" system bus interface")
2002
parser.add_argument("--no-ipv6", action="store_false",
2003
dest="use_ipv6", help="Do not use IPv6")
2004
parser.add_argument("--no-restore", action="store_false",
2005
dest="restore", help="Do not restore stored"
2007
parser.add_argument("--statedir", metavar="DIR",
2008
help="Directory to save/restore state in")
2010
options = parser.parse_args()
1128
parser = optparse.OptionParser(version = "%%prog %s" % version)
1129
parser.add_option("-i", u"--interface", type=u"string",
1130
metavar="IF", help=u"Bind to interface IF")
1131
parser.add_option("-a", u"--address", type=u"string",
1132
help=u"Address to listen for requests on")
1133
parser.add_option("-p", u"--port", type=u"int",
1134
help=u"Port number to receive requests on")
1135
parser.add_option("--check", action=u"store_true",
1136
help=u"Run self-test")
1137
parser.add_option("--debug", action=u"store_true",
1138
help=u"Debug mode; run in foreground and log to"
1140
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1141
u" priority string (see GnuTLS documentation)")
1142
parser.add_option("--servicename", type=u"string",
1143
metavar=u"NAME", help=u"Zeroconf service name")
1144
parser.add_option("--configdir", type=u"string",
1145
default=u"/etc/mandos", metavar=u"DIR",
1146
help=u"Directory to search for configuration"
1148
parser.add_option("--no-dbus", action=u"store_false",
1149
dest=u"use_dbus", help=u"Do not provide D-Bus"
1150
u" system bus interface")
1151
parser.add_option("--no-ipv6", action=u"store_false",
1152
dest=u"use_ipv6", help=u"Do not use IPv6")
1153
options = parser.parse_args()[0]
2012
1155
if options.check:
2064
1203
##################################################################
2066
1205
# For convenience
2067
debug = server_settings["debug"]
2068
debuglevel = server_settings["debuglevel"]
2069
use_dbus = server_settings["use_dbus"]
2070
use_ipv6 = server_settings["use_ipv6"]
2071
stored_state_path = os.path.join(server_settings["statedir"],
2075
initlogger(debug, logging.DEBUG)
2080
level = getattr(logging, debuglevel.upper())
2081
initlogger(debug, level)
2083
if server_settings["servicename"] != "Mandos":
1206
debug = server_settings[u"debug"]
1207
use_dbus = server_settings[u"use_dbus"]
1208
use_ipv6 = server_settings[u"use_ipv6"]
1211
syslogger.setLevel(logging.WARNING)
1212
console.setLevel(logging.WARNING)
1214
if server_settings[u"servicename"] != u"Mandos":
2084
1215
syslogger.setFormatter(logging.Formatter
2085
('Mandos (%s) [%%(process)d]:'
2086
' %%(levelname)s: %%(message)s'
2087
% server_settings["servicename"]))
1216
(u'Mandos (%s) [%%(process)d]:'
1217
u' %%(levelname)s: %%(message)s'
1218
% server_settings[u"servicename"]))
2089
1220
# Parse config file with clients
2090
client_config = configparser.SafeConfigParser(Client
2092
client_config.read(os.path.join(server_settings["configdir"],
1221
client_defaults = { u"timeout": u"1h",
1223
u"checker": u"fping -q -- %%(host)s",
1226
client_config = configparser.SafeConfigParser(client_defaults)
1227
client_config.read(os.path.join(server_settings[u"configdir"],
2095
1230
global mandos_dbus_service
2096
1231
mandos_dbus_service = None
2098
tcp_server = MandosServer((server_settings["address"],
2099
server_settings["port"]),
2101
interface=(server_settings["interface"]
2105
server_settings["priority"],
2108
pidfilename = "/var/run/mandos.pid"
2110
pidfile = open(pidfilename, "w")
2112
logger.error("Could not open file %r", pidfilename)
1234
tcp_server = IPv6_TCPServer((server_settings[u"address"],
1235
server_settings[u"port"]),
1238
server_settings[u"interface"],
1242
server_settings[u"priority"],
1244
pidfilename = u"/var/run/mandos.pid"
1246
pidfile = open(pidfilename, u"w")
1248
logger.error(u"Could not open file %r", pidfilename)
2115
uid = pwd.getpwnam("_mandos").pw_uid
2116
gid = pwd.getpwnam("_mandos").pw_gid
1251
uid = pwd.getpwnam(u"_mandos").pw_uid
1252
gid = pwd.getpwnam(u"_mandos").pw_gid
2117
1253
except KeyError:
2119
uid = pwd.getpwnam("mandos").pw_uid
2120
gid = pwd.getpwnam("mandos").pw_gid
1255
uid = pwd.getpwnam(u"mandos").pw_uid
1256
gid = pwd.getpwnam(u"mandos").pw_gid
2121
1257
except KeyError:
2123
uid = pwd.getpwnam("nobody").pw_uid
2124
gid = pwd.getpwnam("nobody").pw_gid
1259
uid = pwd.getpwnam(u"nobody").pw_uid
1260
gid = pwd.getpwnam(u"nobody").pw_gid
2125
1261
except KeyError:
2131
except OSError as error:
1267
except OSError, error:
2132
1268
if error[0] != errno.EPERM:
1271
# Enable all possible GnuTLS debugging
2136
# Enable all possible GnuTLS debugging
2138
1273
# "Use a log level over 10 to enable all debugging options."
2139
1274
# - GnuTLS manual
2140
1275
gnutls.library.functions.gnutls_global_set_log_level(11)
2142
1277
@gnutls.library.types.gnutls_log_func
2143
1278
def debug_gnutls(level, string):
2144
logger.debug("GnuTLS: %s", string[:-1])
1279
logger.debug(u"GnuTLS: %s", string[:-1])
2146
1281
(gnutls.library.functions
2147
1282
.gnutls_global_set_log_function(debug_gnutls))
2149
# Redirect stdin so all checkers get /dev/null
2150
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2151
os.dup2(null, sys.stdin.fileno())
2155
# Need to fork before connecting to D-Bus
2157
# Close all input and output, do double fork, etc.
2160
gobject.threads_init()
1285
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1286
service = AvahiService(name = server_settings[u"servicename"],
1287
servicetype = u"_mandos._tcp",
1288
protocol = protocol)
1289
if server_settings["interface"]:
1290
service.interface = (if_nametoindex
1291
(str(server_settings[u"interface"])))
2162
1293
global main_loop
2163
1296
# From the Avahi example code
2164
1297
DBusGMainLoop(set_as_default=True )
2165
1298
main_loop = gobject.MainLoop()
2166
1299
bus = dbus.SystemBus()
1300
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1301
avahi.DBUS_PATH_SERVER),
1302
avahi.DBUS_INTERFACE_SERVER)
2167
1303
# End of Avahi example code
2170
bus_name = dbus.service.BusName("se.recompile.Mandos",
2171
bus, do_not_queue=True)
2172
old_bus_name = (dbus.service.BusName
2173
("se.bsnet.fukt.Mandos", bus,
2175
except dbus.exceptions.NameExistsException as e:
2176
logger.error(unicode(e) + ", disabling D-Bus")
2178
server_settings["use_dbus"] = False
2179
tcp_server.use_dbus = False
2180
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2181
service = AvahiServiceToSyslog(name =
2182
server_settings["servicename"],
2183
servicetype = "_mandos._tcp",
2184
protocol = protocol, bus = bus)
2185
if server_settings["interface"]:
2186
service.interface = (if_nametoindex
2187
(str(server_settings["interface"])))
2189
global multiprocessing_manager
2190
multiprocessing_manager = multiprocessing.Manager()
1305
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2192
1307
client_class = Client
2194
client_class = functools.partial(ClientDBusTransitional,
2197
client_settings = Client.config_parser(client_config)
2198
old_client_settings = {}
2201
# Get client data and settings from last running state.
2202
if server_settings["restore"]:
2204
with open(stored_state_path, "rb") as stored_state:
2205
clients_data, old_client_settings = (pickle.load
2207
os.remove(stored_state_path)
2208
except IOError as e:
2209
logger.warning("Could not load persistent state: {0}"
2211
if e.errno != errno.ENOENT:
2213
except EOFError as e:
2214
logger.warning("Could not load persistent state: "
2215
"EOFError: {0}".format(e))
2217
with PGPEngine() as pgp:
2218
for client_name, client in clients_data.iteritems():
2219
# Decide which value to use after restoring saved state.
2220
# We have three different values: Old config file,
2221
# new config file, and saved state.
2222
# New config value takes precedence if it differs from old
2223
# config value, otherwise use saved state.
2224
for name, value in client_settings[client_name].items():
2226
# For each value in new config, check if it
2227
# differs from the old config value (Except for
2228
# the "secret" attribute)
2229
if (name != "secret" and
2230
value != old_client_settings[client_name]
2232
client[name] = value
2236
# Clients who has passed its expire date can still be
2237
# enabled if its last checker was successful. Clients
2238
# whose checker succeeded before we stored its state is
2239
# assumed to have successfully run all checkers during
2241
if client["enabled"]:
2242
if datetime.datetime.utcnow() >= client["expires"]:
2243
if not client["last_checked_ok"]:
2245
"disabling client {0} - Client never "
2246
"performed a successful checker"
2247
.format(client_name))
2248
client["enabled"] = False
2249
elif client["last_checker_status"] != 0:
2251
"disabling client {0} - Client "
2252
"last checker failed with error code {1}"
2253
.format(client_name,
2254
client["last_checker_status"]))
2255
client["enabled"] = False
2257
client["expires"] = (datetime.datetime
2259
+ client["timeout"])
2260
logger.debug("Last checker succeeded,"
2261
" keeping {0} enabled"
2262
.format(client_name))
2264
client["secret"] = (
2265
pgp.decrypt(client["encrypted_secret"],
2266
client_settings[client_name]
2269
# If decryption fails, we use secret from new settings
2270
logger.debug("Failed to decrypt {0} old secret"
2271
.format(client_name))
2272
client["secret"] = (
2273
client_settings[client_name]["secret"])
2276
# Add/remove clients based on new changes made to config
2277
for client_name in (set(old_client_settings)
2278
- set(client_settings)):
2279
del clients_data[client_name]
2280
for client_name in (set(client_settings)
2281
- set(old_client_settings)):
2282
clients_data[client_name] = client_settings[client_name]
2284
# Create all client objects
2285
for client_name, client in clients_data.iteritems():
2286
tcp_server.clients[client_name] = client_class(
2287
name = client_name, settings = client)
2289
if not tcp_server.clients:
2290
logger.warning("No clients defined")
1309
client_class = ClientDBus
1311
client_class(name = section,
1312
config= dict(client_config.items(section)))
1313
for section in client_config.sections()))
1315
logger.warning(u"No clients defined")
1318
# Redirect stdin so all checkers get /dev/null
1319
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1320
os.dup2(null, sys.stdin.fileno())
1324
# No console logging
1325
logger.removeHandler(console)
1326
# Close all input and output, do double fork, etc.
1330
with closing(pidfile):
1332
pidfile.write(str(pid) + "\n")
1335
logger.error(u"Could not write to file %r with PID %d",
1338
# "pidfile" was never created
1343
"Cleanup function; run on exit"
1345
# From the Avahi example code
1346
if not group is None:
1349
# End of Avahi example code
1352
client = clients.pop()
1353
client.disable_hook = None
1356
atexit.register(cleanup)
2296
pidfile.write(str(pid) + "\n".encode("utf-8"))
2299
logger.error("Could not write to file %r with PID %d",
2302
# "pidfile" was never created
2305
1359
signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
1360
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
1361
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2311
1364
class MandosDBusService(dbus.service.Object):
2312
1365
"""A D-Bus proxy object"""
2313
1366
def __init__(self):
2314
dbus.service.Object.__init__(self, bus, "/")
2315
_interface = "se.recompile.Mandos"
2317
@dbus.service.signal(_interface, signature="o")
2318
def ClientAdded(self, objpath):
2322
@dbus.service.signal(_interface, signature="ss")
2323
def ClientNotFound(self, fingerprint, address):
2327
@dbus.service.signal(_interface, signature="os")
1367
dbus.service.Object.__init__(self, bus, u"/")
1368
_interface = u"se.bsnet.fukt.Mandos"
1370
@dbus.service.signal(_interface, signature=u"oa{sv}")
1371
def ClientAdded(self, objpath, properties):
1375
@dbus.service.signal(_interface, signature=u"s")
1376
def ClientNotFound(self, fingerprint):
1380
@dbus.service.signal(_interface, signature=u"os")
2328
1381
def ClientRemoved(self, objpath, name):
2332
@dbus.service.method(_interface, out_signature="ao")
1385
@dbus.service.method(_interface, out_signature=u"ao")
2333
1386
def GetAllClients(self):
2335
return dbus.Array(c.dbus_object_path
2337
tcp_server.clients.itervalues())
1388
return dbus.Array(c.dbus_object_path for c in clients)
2339
1390
@dbus.service.method(_interface,
2340
out_signature="a{oa{sv}}")
1391
out_signature=u"a{oa{sv}}")
2341
1392
def GetAllClientsWithProperties(self):
2343
1394
return dbus.Dictionary(
2344
((c.dbus_object_path, c.GetAll(""))
2345
for c in tcp_server.clients.itervalues()),
1395
((c.dbus_object_path, c.GetAllProperties())
1397
signature=u"oa{sv}")
2348
@dbus.service.method(_interface, in_signature="o")
1399
@dbus.service.method(_interface, in_signature=u"o")
2349
1400
def RemoveClient(self, object_path):
2351
for c in tcp_server.clients.itervalues():
2352
1403
if c.dbus_object_path == object_path:
2353
del tcp_server.clients[c.name]
2354
1405
c.remove_from_connection()
2355
1406
# Don't signal anything except ClientRemoved
2356
c.disable(quiet=True)
1407
c.disable(signal=False)
2357
1408
# Emit D-Bus signal
2358
1409
self.ClientRemoved(object_path, c.name)
2360
raise KeyError(object_path)
2364
class MandosDBusServiceTransitional(MandosDBusService):
2365
__metaclass__ = AlternateDBusNamesMetaclass
2366
mandos_dbus_service = MandosDBusServiceTransitional()
2369
"Cleanup function; run on exit"
2372
multiprocessing.active_children()
2373
if not (tcp_server.clients or client_settings):
2376
# Store client before exiting. Secrets are encrypted with key
2377
# based on what config file has. If config file is
2378
# removed/edited, old secret will thus be unrecovable.
2380
with PGPEngine() as pgp:
2381
for client in tcp_server.clients.itervalues():
2382
key = client_settings[client.name]["secret"]
2383
client.encrypted_secret = pgp.encrypt(client.secret,
2387
# A list of attributes that can not be pickled
2389
exclude = set(("bus", "changedstate", "secret",
2391
for name, typ in (inspect.getmembers
2392
(dbus.service.Object)):
2395
client_dict["encrypted_secret"] = (client
2397
for attr in client.client_structure:
2398
if attr not in exclude:
2399
client_dict[attr] = getattr(client, attr)
2401
clients[client.name] = client_dict
2402
del client_settings[client.name]["secret"]
2405
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2408
(stored_state_path))
2409
with os.fdopen(tempfd, "wb") as stored_state:
2410
pickle.dump((clients, client_settings), stored_state)
2411
os.rename(tempname, stored_state_path)
2412
except (IOError, OSError) as e:
2413
logger.warning("Could not save persistent state: {0}"
2420
if e.errno not in set((errno.ENOENT, errno.EACCES,
2424
# Delete all clients, and settings from config
2425
while tcp_server.clients:
2426
name, client = tcp_server.clients.popitem()
2428
client.remove_from_connection()
2429
# Don't signal anything except ClientRemoved
2430
client.disable(quiet=True)
2433
mandos_dbus_service.ClientRemoved(client
2436
client_settings.clear()
2438
atexit.register(cleanup)
2440
for client in tcp_server.clients.itervalues():
1415
mandos_dbus_service = MandosDBusService()
1417
for client in clients:
2442
1419
# Emit D-Bus signal
2443
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2444
# Need to initiate checking of clients
2446
client.init_checker()
1420
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1421
client.GetAllProperties())
2448
1424
tcp_server.enable()
2449
1425
tcp_server.server_activate()