86
81
SO_BINDTODEVICE = None
90
stored_state_file = "clients.pickle"
92
logger = logging.getLogger()
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
93
88
syslogger = (logging.handlers.SysLogHandler
94
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
111
return interface_index
114
def initlogger(level=logging.WARNING):
115
"""init logger and add loglevel"""
117
syslogger.setFormatter(logging.Formatter
118
('Mandos [%(process)d]: %(levelname)s:'
120
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',
150
def __exit__ (self, exc_type, exc_value, traceback):
158
if self.tempdir is not None:
159
# Delete contents of tempdir
160
for root, dirs, files in os.walk(self.tempdir,
162
for filename in files:
163
os.remove(os.path.join(root, filename))
165
os.rmdir(os.path.join(root, dirname))
167
os.rmdir(self.tempdir)
170
def password_encode(self, password):
171
# Passphrase can not be empty and can not contain newlines or
172
# NUL bytes. So we prefix it and hex encode it.
173
return b"mandos" + binascii.hexlify(password)
175
def encrypt(self, data, password):
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
189
self.gnupg.passphrase = None
192
def decrypt(self, data, password):
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
206
self.gnupg.passphrase = None
207
return decrypted_plaintext
90
address = "/dev/log"))
91
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
94
logger.addHandler(syslogger)
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
100
logger.addHandler(console)
211
102
class AvahiError(Exception):
212
103
def __init__(self, value, *args, **kwargs):
259
150
self.group = None # our entry group
260
151
self.server = None
262
self.entry_group_state_changed_match = None
263
153
def rename(self):
264
154
"""Derived from the Avahi example code"""
265
155
if self.rename_count >= self.max_renames:
266
logger.critical("No suitable Zeroconf service name found"
267
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
268
158
self.rename_count)
269
raise AvahiServiceError("Too many renames")
270
self.name = unicode(self.server
271
.GetAlternativeServiceName(self.name))
272
logger.info("Changing Zeroconf service name to %r ...",
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
277
except dbus.exceptions.DBusException as error:
278
logger.critical("DBusException: %s", error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
281
174
self.rename_count += 1
282
175
def remove(self):
283
176
"""Derived from the Avahi example code"""
284
if self.entry_group_state_changed_match is not None:
285
self.entry_group_state_changed_match.remove()
286
self.entry_group_state_changed_match = None
287
177
if self.group is not None:
288
178
self.group.Reset()
290
180
"""Derived from the Avahi example code"""
292
181
if self.group is None:
293
182
self.group = dbus.Interface(
294
183
self.bus.get_object(avahi.DBUS_NAME,
295
184
self.server.EntryGroupNew()),
296
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
297
self.entry_group_state_changed_match = (
298
self.group.connect_to_signal(
299
'StateChanged', self.entry_group_state_changed))
300
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
301
190
self.name, self.type)
302
191
self.group.AddService(
310
199
self.group.Commit()
311
200
def entry_group_state_changed(self, state, error):
312
201
"""Derived from the Avahi example code"""
313
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
315
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
316
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
317
206
elif state == avahi.ENTRY_GROUP_COLLISION:
318
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
320
209
elif state == avahi.ENTRY_GROUP_FAILURE:
321
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
323
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
324
213
% unicode(error))
325
214
def cleanup(self):
326
215
"""Derived from the Avahi example code"""
327
216
if self.group is not None:
330
except (dbus.exceptions.UnknownMethodException,
331
dbus.exceptions.DBusException):
333
218
self.group = None
335
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
336
220
"""Derived from the Avahi example code"""
337
logger.debug("Avahi server state change: %i", state)
338
bad_states = { avahi.SERVER_INVALID:
339
"Zeroconf server invalid",
340
avahi.SERVER_REGISTERING: None,
341
avahi.SERVER_COLLISION:
342
"Zeroconf server name collision",
343
avahi.SERVER_FAILURE:
344
"Zeroconf server failure" }
345
if state in bad_states:
346
if bad_states[state] is not None:
348
logger.error(bad_states[state])
350
logger.error(bad_states[state] + ": %r", error)
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
352
225
elif state == avahi.SERVER_RUNNING:
356
logger.debug("Unknown state: %r", state)
358
logger.debug("Unknown state: %r: %r", state, error)
359
227
def activate(self):
360
228
"""Derived from the Avahi example code"""
361
229
if self.server is None:
362
230
self.server = dbus.Interface(
363
231
self.bus.get_object(avahi.DBUS_NAME,
364
avahi.DBUS_PATH_SERVER,
365
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
366
233
avahi.DBUS_INTERFACE_SERVER)
367
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
368
235
self.server_state_changed)
369
236
self.server_state_changed(self.server.GetState())
371
class AvahiServiceToSyslog(AvahiService):
373
"""Add the new name to the syslog messages"""
374
ret = AvahiService.rename(self)
375
syslogger.setFormatter(logging.Formatter
376
('Mandos (%s) [%%(process)d]:'
377
' %%(levelname)s: %%(message)s'
381
def timedelta_to_milliseconds(td):
382
"Convert a datetime.timedelta() to milliseconds"
383
return ((td.days * 24 * 60 * 60 * 1000)
384
+ (td.seconds * 1000)
385
+ (td.microseconds // 1000))
387
239
class Client(object):
388
240
"""A representation of a client host served by this server.
391
approved: bool(); 'None' if not yet approved/disapproved
243
_approved: bool(); 'None' if not yet approved/disapproved
392
244
approval_delay: datetime.timedelta(); Time to wait for approval
393
245
approval_duration: datetime.timedelta(); Duration of one approval
394
246
checker: subprocess.Popen(); a running checker process used
412
263
interval: datetime.timedelta(); How often to start a new checker
413
264
last_approval_request: datetime.datetime(); (UTC) or None
414
265
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
266
last_enabled: datetime.datetime(); (UTC)
420
267
name: string; from the config file, used in log messages and
421
268
D-Bus identifiers
422
269
secret: bytestring; sent verbatim (over TLS) to client
423
270
timeout: datetime.timedelta(); How long from last_checked_ok
424
271
until this client is disabled
425
extended_timeout: extra long timeout when password has been sent
426
272
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")
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
281
def _timedelta_to_milliseconds(td):
282
"Convert a datetime.timedelta() to milliseconds"
283
return ((td.days * 24 * 60 * 60 * 1000)
284
+ (td.seconds * 1000)
285
+ (td.microseconds // 1000))
436
287
def timeout_milliseconds(self):
437
288
"Return the 'timeout' attribute in milliseconds"
438
return timedelta_to_milliseconds(self.timeout)
440
def extended_timeout_milliseconds(self):
441
"Return the 'extended_timeout' attribute in milliseconds"
442
return timedelta_to_milliseconds(self.extended_timeout)
289
return self._timedelta_to_milliseconds(self.timeout)
444
291
def interval_milliseconds(self):
445
292
"Return the 'interval' attribute in milliseconds"
446
return timedelta_to_milliseconds(self.interval)
293
return self._timedelta_to_milliseconds(self.interval)
448
295
def approval_delay_milliseconds(self):
449
return timedelta_to_milliseconds(self.approval_delay)
296
return self._timedelta_to_milliseconds(self.approval_delay)
451
def __init__(self, name = None, config=None):
298
def __init__(self, name = None, disable_hook=None, config=None):
452
299
"""Note: the 'checker' key in 'config' sets the
453
300
'checker_command' attribute and *not* the 'checker'
456
303
if config is None:
458
logger.debug("Creating client %r", self.name)
305
logger.debug(u"Creating client %r", self.name)
459
306
# Uppercase and remove spaces from fingerprint for later
460
307
# comparison purposes with return value from the fingerprint()
462
self.fingerprint = (config["fingerprint"].upper()
464
logger.debug(" Fingerprint: %s", self.fingerprint)
465
if "secret" in config:
466
self.secret = config["secret"].decode("base64")
467
elif "secfile" in config:
309
self.fingerprint = (config[u"fingerprint"].upper()
311
logger.debug(u" Fingerprint: %s", self.fingerprint)
312
if u"secret" in config:
313
self.secret = config[u"secret"].decode(u"base64")
314
elif u"secfile" in config:
468
315
with open(os.path.expanduser(os.path.expandvars
469
(config["secfile"])),
316
(config[u"secfile"])),
470
317
"rb") as secfile:
471
318
self.secret = secfile.read()
473
raise TypeError("No secret or secfile for client %s"
320
raise TypeError(u"No secret or secfile for client %s"
475
self.host = config.get("host", "")
322
self.host = config.get(u"host", u"")
476
323
self.created = datetime.datetime.utcnow()
477
self.enabled = config.get("enabled", True)
478
325
self.last_approval_request = None
480
self.last_enabled = datetime.datetime.utcnow()
482
self.last_enabled = None
326
self.last_enabled = None
483
327
self.last_checked_ok = None
484
self.last_checker_status = None
485
self.timeout = string_to_delta(config["timeout"])
486
self.extended_timeout = string_to_delta(config
487
["extended_timeout"])
488
self.interval = string_to_delta(config["interval"])
328
self.timeout = string_to_delta(config[u"timeout"])
329
self.interval = string_to_delta(config[u"interval"])
330
self.disable_hook = disable_hook
489
331
self.checker = None
490
332
self.checker_initiator_tag = None
491
333
self.disable_initiator_tag = None
493
self.expires = datetime.datetime.utcnow() + self.timeout
496
334
self.checker_callback_tag = None
497
self.checker_command = config["checker"]
335
self.checker_command = config[u"checker"]
498
336
self.current_checker_command = None
500
self.approved_by_default = config.get("approved_by_default",
337
self.last_connect = None
338
self._approved = None
339
self.approved_by_default = config.get(u"approved_by_default",
502
341
self.approvals_pending = 0
503
342
self.approval_delay = string_to_delta(
504
config["approval_delay"])
343
config[u"approval_delay"])
505
344
self.approval_duration = string_to_delta(
506
config["approval_duration"])
507
self.changedstate = (multiprocessing_manager
508
.Condition(multiprocessing_manager
510
self.client_structure = [attr for attr in
511
self.__dict__.iterkeys()
512
if not attr.startswith("_")]
513
self.client_structure.append("client_structure")
515
for name, t in inspect.getmembers(type(self),
519
if not name.startswith("_"):
520
self.client_structure.append(name)
345
config[u"approval_duration"])
346
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
522
# Send notice to process children that client state has changed
523
348
def send_changedstate(self):
524
with self.changedstate:
525
self.changedstate.notify_all()
349
self.changedstate.acquire()
350
self.changedstate.notify_all()
351
self.changedstate.release()
527
353
def enable(self):
528
354
"""Start this client's checker and timeout hooks"""
529
if getattr(self, "enabled", False):
355
if getattr(self, u"enabled", False):
530
356
# Already enabled
532
358
self.send_changedstate()
533
self.expires = datetime.datetime.utcnow() + self.timeout
535
359
self.last_enabled = datetime.datetime.utcnow()
538
def disable(self, quiet=True):
539
"""Disable this client."""
540
if not getattr(self, "enabled", False):
543
self.send_changedstate()
545
logger.info("Disabling client %s", self.name)
546
if getattr(self, "disable_initiator_tag", False):
547
gobject.source_remove(self.disable_initiator_tag)
548
self.disable_initiator_tag = None
550
if getattr(self, "checker_initiator_tag", False):
551
gobject.source_remove(self.checker_initiator_tag)
552
self.checker_initiator_tag = None
555
# Do not run this again if called by a gobject.timeout_add
561
def init_checker(self):
562
360
# Schedule a new checker to be started an 'interval' from now,
563
361
# and every interval from then on.
564
362
self.checker_initiator_tag = (gobject.timeout_add
568
366
self.disable_initiator_tag = (gobject.timeout_add
569
367
(self.timeout_milliseconds(),
571
370
# Also start a new checker *right now*.
572
371
self.start_checker()
373
def disable(self, quiet=True):
374
"""Disable this client."""
375
if not getattr(self, "enabled", False):
378
self.send_changedstate()
380
logger.info(u"Disabling client %s", self.name)
381
if getattr(self, u"disable_initiator_tag", False):
382
gobject.source_remove(self.disable_initiator_tag)
383
self.disable_initiator_tag = None
384
if getattr(self, u"checker_initiator_tag", False):
385
gobject.source_remove(self.checker_initiator_tag)
386
self.checker_initiator_tag = None
388
if self.disable_hook:
389
self.disable_hook(self)
391
# Do not run this again if called by a gobject.timeout_add
395
self.disable_hook = None
574
398
def checker_callback(self, pid, condition, command):
575
399
"""The checker has completed, so take appropriate actions."""
576
400
self.checker_callback_tag = None
577
401
self.checker = None
578
402
if os.WIFEXITED(condition):
579
self.last_checker_status = os.WEXITSTATUS(condition)
580
if self.last_checker_status == 0:
581
logger.info("Checker for %(name)s succeeded",
403
exitstatus = os.WEXITSTATUS(condition)
405
logger.info(u"Checker for %(name)s succeeded",
583
407
self.checked_ok()
585
logger.info("Checker for %(name)s failed",
409
logger.info(u"Checker for %(name)s failed",
588
self.last_checker_status = -1
589
logger.warning("Checker for %(name)s crashed?",
412
logger.warning(u"Checker for %(name)s crashed?",
592
def checked_ok(self, timeout=None):
415
def checked_ok(self):
593
416
"""Bump up the timeout for this client.
595
418
This should only be called when the client has been seen,
599
timeout = self.timeout
600
421
self.last_checked_ok = datetime.datetime.utcnow()
601
if self.disable_initiator_tag is not None:
602
gobject.source_remove(self.disable_initiator_tag)
603
if getattr(self, "enabled", False):
604
self.disable_initiator_tag = (gobject.timeout_add
605
(timedelta_to_milliseconds
606
(timeout), self.disable))
607
self.expires = datetime.datetime.utcnow() + timeout
422
gobject.source_remove(self.disable_initiator_tag)
423
self.disable_initiator_tag = (gobject.timeout_add
424
(self.timeout_milliseconds(),
609
427
def need_approval(self):
610
428
self.last_approval_request = datetime.datetime.utcnow()
764
581
def _is_dbus_property(obj):
765
return getattr(obj, "_dbus_is_property", False)
582
return getattr(obj, u"_dbus_is_property", False)
767
584
def _get_all_dbus_properties(self):
768
585
"""Returns a generator of (name, attribute) pairs
770
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
771
for cls in self.__class__.__mro__
587
return ((prop._dbus_name, prop)
772
588
for name, prop in
773
inspect.getmembers(cls, self._is_dbus_property))
589
inspect.getmembers(self, self._is_dbus_property))
775
591
def _get_dbus_property(self, interface_name, property_name):
776
592
"""Returns a bound method if one exists which is a D-Bus
777
593
property with the specified name and interface.
779
for cls in self.__class__.__mro__:
780
for name, value in (inspect.getmembers
781
(cls, self._is_dbus_property)):
782
if (value._dbus_name == property_name
783
and value._dbus_interface == interface_name):
784
return value.__get__(self)
595
for name in (property_name,
596
property_name + u"_dbus_property"):
597
prop = getattr(self, name, None)
599
or not self._is_dbus_property(prop)
600
or prop._dbus_name != property_name
601
or (interface_name and prop._dbus_interface
602
and interface_name != prop._dbus_interface)):
786
605
# No such property
787
raise DBusPropertyNotFound(self.dbus_object_path + ":"
788
+ interface_name + "."
606
raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
+ interface_name + u"."
791
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
793
612
def Get(self, interface_name, property_name):
794
613
"""Standard D-Bus property Get() method, see D-Bus standard.
796
615
prop = self._get_dbus_property(interface_name, property_name)
797
if prop._dbus_access == "write":
616
if prop._dbus_access == u"write":
798
617
raise DBusPropertyAccessException(property_name)
800
if not hasattr(value, "variant_level"):
619
if not hasattr(value, u"variant_level"):
802
621
return type(value)(value, variant_level=value.variant_level+1)
804
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
805
624
def Set(self, interface_name, property_name, value):
806
625
"""Standard D-Bus property Set() method, see D-Bus standard.
808
627
prop = self._get_dbus_property(interface_name, property_name)
809
if prop._dbus_access == "read":
628
if prop._dbus_access == u"read":
810
629
raise DBusPropertyAccessException(property_name)
811
if prop._dbus_get_args_options["byte_arrays"]:
630
if prop._dbus_get_args_options[u"byte_arrays"]:
812
631
# The byte_arrays option is not supported yet on
813
632
# signatures other than "ay".
814
if prop._dbus_signature != "ay":
633
if prop._dbus_signature != u"ay":
816
635
value = dbus.ByteArray(''.join(unichr(byte)
817
636
for byte in value))
820
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
821
out_signature="a{sv}")
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
822
641
def GetAll(self, interface_name):
823
642
"""Standard D-Bus property GetAll() method, see D-Bus
826
645
Note: Will not include properties with access="write".
829
648
for name, prop in self._get_all_dbus_properties():
830
649
if (interface_name
831
650
and interface_name != prop._dbus_interface):
832
651
# Interface non-empty but did not match
834
653
# Ignore write-only properties
835
if prop._dbus_access == "write":
654
if prop._dbus_access == u"write":
838
if not hasattr(value, "variant_level"):
839
properties[name] = value
657
if not hasattr(value, u"variant_level"):
841
properties[name] = type(value)(value, variant_level=
842
value.variant_level+1)
843
return dbus.Dictionary(properties, signature="sv")
660
all[name] = type(value)(value, variant_level=
661
value.variant_level+1)
662
return dbus.Dictionary(all, signature=u"sv")
845
664
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
847
666
path_keyword='object_path',
848
667
connection_keyword='connection')
849
668
def Introspect(self, object_path, connection):
855
674
document = xml.dom.minidom.parseString(xmlstring)
856
675
def make_tag(document, name, prop):
857
e = document.createElement("property")
858
e.setAttribute("name", name)
859
e.setAttribute("type", prop._dbus_signature)
860
e.setAttribute("access", prop._dbus_access)
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
862
for if_tag in document.getElementsByTagName("interface"):
681
for if_tag in document.getElementsByTagName(u"interface"):
863
682
for tag in (make_tag(document, name, prop)
865
684
in self._get_all_dbus_properties()
866
685
if prop._dbus_interface
867
== if_tag.getAttribute("name")):
686
== if_tag.getAttribute(u"name")):
868
687
if_tag.appendChild(tag)
869
688
# Add the names to the return values for the
870
689
# "org.freedesktop.DBus.Properties" methods
871
if (if_tag.getAttribute("name")
872
== "org.freedesktop.DBus.Properties"):
873
for cn in if_tag.getElementsByTagName("method"):
874
if cn.getAttribute("name") == "Get":
875
for arg in cn.getElementsByTagName("arg"):
876
if (arg.getAttribute("direction")
878
arg.setAttribute("name", "value")
879
elif cn.getAttribute("name") == "GetAll":
880
for arg in cn.getElementsByTagName("arg"):
881
if (arg.getAttribute("direction")
883
arg.setAttribute("name", "props")
884
xmlstring = document.toxml("utf-8")
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
885
704
document.unlink()
886
705
except (AttributeError, xml.dom.DOMException,
887
xml.parsers.expat.ExpatError) as error:
888
logger.error("Failed to override Introspection method",
706
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
893
def datetime_to_dbus (dt, variant_level=0):
894
"""Convert a UTC datetime.datetime() to a D-Bus type."""
896
return dbus.String("", variant_level = variant_level)
897
return dbus.String(dt.isoformat(),
898
variant_level=variant_level)
901
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
903
"""Applied to an empty subclass of a D-Bus object, this metaclass
904
will add additional D-Bus attributes matching a certain pattern.
906
def __new__(mcs, name, bases, attr):
907
# Go through all the base classes which could have D-Bus
908
# methods, signals, or properties in them
909
for base in (b for b in bases
910
if issubclass(b, dbus.service.Object)):
911
# Go though all attributes of the base class
912
for attrname, attribute in inspect.getmembers(base):
913
# Ignore non-D-Bus attributes, and D-Bus attributes
914
# with the wrong interface name
915
if (not hasattr(attribute, "_dbus_interface")
916
or not attribute._dbus_interface
917
.startswith("se.recompile.Mandos")):
919
# Create an alternate D-Bus interface name based on
921
alt_interface = (attribute._dbus_interface
922
.replace("se.recompile.Mandos",
923
"se.bsnet.fukt.Mandos"))
924
# Is this a D-Bus signal?
925
if getattr(attribute, "_dbus_is_signal", False):
926
# Extract the original non-method function by
928
nonmethod_func = (dict(
929
zip(attribute.func_code.co_freevars,
930
attribute.__closure__))["func"]
932
# Create a new, but exactly alike, function
933
# object, and decorate it to be a new D-Bus signal
934
# with the alternate D-Bus interface name
935
new_function = (dbus.service.signal
937
attribute._dbus_signature)
939
nonmethod_func.func_code,
940
nonmethod_func.func_globals,
941
nonmethod_func.func_name,
942
nonmethod_func.func_defaults,
943
nonmethod_func.func_closure)))
944
# Define a creator of a function to call both the
945
# old and new functions, so both the old and new
946
# signals gets sent when the function is called
947
def fixscope(func1, func2):
948
"""This function is a scope container to pass
949
func1 and func2 to the "call_both" function
950
outside of its arguments"""
951
def call_both(*args, **kwargs):
952
"""This function will emit two D-Bus
953
signals by calling func1 and func2"""
954
func1(*args, **kwargs)
955
func2(*args, **kwargs)
957
# Create the "call_both" function and add it to
959
attr[attrname] = fixscope(attribute,
961
# Is this a D-Bus method?
962
elif getattr(attribute, "_dbus_is_method", False):
963
# Create a new, but exactly alike, function
964
# object. Decorate it to be a new D-Bus method
965
# with the alternate D-Bus interface name. Add it
967
attr[attrname] = (dbus.service.method
969
attribute._dbus_in_signature,
970
attribute._dbus_out_signature)
972
(attribute.func_code,
973
attribute.func_globals,
975
attribute.func_defaults,
976
attribute.func_closure)))
977
# Is this a D-Bus property?
978
elif getattr(attribute, "_dbus_is_property", False):
979
# Create a new, but exactly alike, function
980
# object, and decorate it to be a new D-Bus
981
# property with the alternate D-Bus interface
982
# name. Add it to the class.
983
attr[attrname] = (dbus_service_property
985
attribute._dbus_signature,
986
attribute._dbus_access,
988
._dbus_get_args_options
991
(attribute.func_code,
992
attribute.func_globals,
994
attribute.func_defaults,
995
attribute.func_closure)))
996
return type.__new__(mcs, name, bases, attr)
999
712
class ClientDBus(Client, DBusObjectWithProperties):
1000
713
"""A Client class using D-Bus
1007
720
runtime_expansions = (Client.runtime_expansions
1008
+ ("dbus_object_path",))
721
+ (u"dbus_object_path",))
1010
723
# dbus.service.Object doesn't use super(), so we can't either.
1012
725
def __init__(self, bus = None, *args, **kwargs):
726
self._approvals_pending = 0
1014
728
Client.__init__(self, *args, **kwargs)
1016
self._approvals_pending = 0
1017
729
# Only now, when this client is initialized, can it show up on
1019
731
client_object_name = unicode(self.name).translate(
1020
{ord("."): ord("_"),
1021
ord("-"): ord("_")})
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
1022
734
self.dbus_object_path = (dbus.ObjectPath
1023
("/clients/" + client_object_name))
735
(u"/clients/" + client_object_name))
1024
736
DBusObjectWithProperties.__init__(self, self.bus,
1025
737
self.dbus_object_path)
1027
def notifychangeproperty(transform_func,
1028
dbus_name, type_func=lambda x: x,
1030
""" Modify a variable so that it's a property which announces
1031
its changes to DBus.
1033
transform_fun: Function that takes a value and a variant_level
1034
and transforms it to a D-Bus type.
1035
dbus_name: D-Bus name of the variable
1036
type_func: Function that transform the value before sending it
1037
to the D-Bus. Default: no transform
1038
variant_level: D-Bus variant level. Default: 1
1040
attrname = "_{0}".format(dbus_name)
1041
def setter(self, value):
1042
if hasattr(self, "dbus_object_path"):
1043
if (not hasattr(self, attrname) or
1044
type_func(getattr(self, attrname, None))
1045
!= type_func(value)):
1046
dbus_value = transform_func(type_func(value),
1049
self.PropertyChanged(dbus.String(dbus_name),
1051
setattr(self, attrname, value)
1053
return property(lambda self: getattr(self, attrname), setter)
1056
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1057
approvals_pending = notifychangeproperty(dbus.Boolean,
1060
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1061
last_enabled = notifychangeproperty(datetime_to_dbus,
1063
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1064
type_func = lambda checker:
1065
checker is not None)
1066
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1068
last_approval_request = notifychangeproperty(
1069
datetime_to_dbus, "LastApprovalRequest")
1070
approved_by_default = notifychangeproperty(dbus.Boolean,
1071
"ApprovedByDefault")
1072
approval_delay = notifychangeproperty(dbus.UInt64,
1075
timedelta_to_milliseconds)
1076
approval_duration = notifychangeproperty(
1077
dbus.UInt64, "ApprovalDuration",
1078
type_func = timedelta_to_milliseconds)
1079
host = notifychangeproperty(dbus.String, "Host")
1080
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1082
timedelta_to_milliseconds)
1083
extended_timeout = notifychangeproperty(
1084
dbus.UInt64, "ExtendedTimeout",
1085
type_func = timedelta_to_milliseconds)
1086
interval = notifychangeproperty(dbus.UInt64,
1089
timedelta_to_milliseconds)
1090
checker_command = notifychangeproperty(dbus.String, "Checker")
1092
del notifychangeproperty
739
def _get_approvals_pending(self):
740
return self._approvals_pending
741
def _set_approvals_pending(self, value):
742
old_value = self._approvals_pending
743
self._approvals_pending = value
745
if (hasattr(self, "dbus_object_path")
746
and bval is not bool(old_value)):
747
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
751
approvals_pending = property(_get_approvals_pending,
752
_set_approvals_pending)
753
del _get_approvals_pending, _set_approvals_pending
756
def _datetime_to_dbus(dt, variant_level=0):
757
"""Convert a UTC datetime.datetime() to a D-Bus type."""
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
762
oldstate = getattr(self, u"enabled", False)
763
r = Client.enable(self)
764
if oldstate != self.enabled:
766
self.PropertyChanged(dbus.String(u"Enabled"),
767
dbus.Boolean(True, variant_level=1))
768
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
770
self._datetime_to_dbus(self.last_enabled,
774
def disable(self, quiet = False):
775
oldstate = getattr(self, u"enabled", False)
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
779
self.PropertyChanged(dbus.String(u"Enabled"),
780
dbus.Boolean(False, variant_level=1))
1094
783
def __del__(self, *args, **kwargs):
1096
785
self.remove_from_connection()
1097
786
except LookupError:
1099
if hasattr(DBusObjectWithProperties, "__del__"):
788
if hasattr(DBusObjectWithProperties, u"__del__"):
1100
789
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1101
790
Client.__del__(self, *args, **kwargs)
1131
841
and old_checker_pid != self.checker.pid):
1132
842
# Emit D-Bus signal
1133
843
self.CheckerStarted(self.current_checker_command)
844
self.PropertyChanged(
845
dbus.String(u"CheckerRunning"),
846
dbus.Boolean(True, variant_level=1))
849
def stop_checker(self, *args, **kwargs):
850
old_checker = getattr(self, u"checker", None)
851
r = Client.stop_checker(self, *args, **kwargs)
852
if (old_checker is not None
853
and getattr(self, u"checker", None) is None):
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
dbus.Boolean(False, variant_level=1))
1136
858
def _reset_approved(self):
1137
self.approved = None
859
self._approved = None
1140
862
def approve(self, value=True):
1141
863
self.send_changedstate()
1142
self.approved = value
1143
gobject.timeout_add(timedelta_to_milliseconds
864
self._approved = value
865
gobject.timeout_add(self._timedelta_to_milliseconds
1144
866
(self.approval_duration),
1145
867
self._reset_approved)
1148
870
## D-Bus methods, signals & properties
1149
_interface = "se.recompile.Mandos.Client"
871
_interface = u"se.bsnet.fukt.Mandos.Client"
1153
875
# CheckerCompleted - signal
1154
@dbus.service.signal(_interface, signature="nxs")
876
@dbus.service.signal(_interface, signature=u"nxs")
1155
877
def CheckerCompleted(self, exitcode, waitstatus, command):
1159
881
# CheckerStarted - signal
1160
@dbus.service.signal(_interface, signature="s")
882
@dbus.service.signal(_interface, signature=u"s")
1161
883
def CheckerStarted(self, command):
1165
887
# PropertyChanged - signal
1166
@dbus.service.signal(_interface, signature="sv")
888
@dbus.service.signal(_interface, signature=u"sv")
1167
889
def PropertyChanged(self, property, value):
1237
951
# ApprovalPending - property
1238
@dbus_service_property(_interface, signature="b", access="read")
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
1239
953
def ApprovalPending_dbus_property(self):
1240
954
return dbus.Boolean(bool(self.approvals_pending))
1242
956
# ApprovedByDefault - property
1243
@dbus_service_property(_interface, signature="b",
957
@dbus_service_property(_interface, signature=u"b",
1245
959
def ApprovedByDefault_dbus_property(self, value=None):
1246
960
if value is None: # get
1247
961
return dbus.Boolean(self.approved_by_default)
1248
962
self.approved_by_default = bool(value)
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
dbus.Boolean(value, variant_level=1))
1250
967
# ApprovalDelay - property
1251
@dbus_service_property(_interface, signature="t",
968
@dbus_service_property(_interface, signature=u"t",
1253
970
def ApprovalDelay_dbus_property(self, value=None):
1254
971
if value is None: # get
1255
972
return dbus.UInt64(self.approval_delay_milliseconds())
1256
973
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
dbus.UInt64(value, variant_level=1))
1258
978
# ApprovalDuration - property
1259
@dbus_service_property(_interface, signature="t",
979
@dbus_service_property(_interface, signature=u"t",
1261
981
def ApprovalDuration_dbus_property(self, value=None):
1262
982
if value is None: # get
1263
return dbus.UInt64(timedelta_to_milliseconds(
983
return dbus.UInt64(self._timedelta_to_milliseconds(
1264
984
self.approval_duration))
1265
985
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
dbus.UInt64(value, variant_level=1))
1267
990
# Name - property
1268
@dbus_service_property(_interface, signature="s", access="read")
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
1269
992
def Name_dbus_property(self):
1270
993
return dbus.String(self.name)
1272
995
# Fingerprint - property
1273
@dbus_service_property(_interface, signature="s", access="read")
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1274
997
def Fingerprint_dbus_property(self):
1275
998
return dbus.String(self.fingerprint)
1277
1000
# Host - property
1278
@dbus_service_property(_interface, signature="s",
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1280
1003
def Host_dbus_property(self, value=None):
1281
1004
if value is None: # get
1282
1005
return dbus.String(self.host)
1283
self.host = unicode(value)
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
dbus.String(value, variant_level=1))
1285
1011
# Created - property
1286
@dbus_service_property(_interface, signature="s", access="read")
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1287
1013
def Created_dbus_property(self):
1288
return datetime_to_dbus(self.created)
1014
return dbus.String(self._datetime_to_dbus(self.created))
1290
1016
# LastEnabled - property
1291
@dbus_service_property(_interface, signature="s", access="read")
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1292
1018
def LastEnabled_dbus_property(self):
1293
return datetime_to_dbus(self.last_enabled)
1019
if self.last_enabled is None:
1020
return dbus.String(u"")
1021
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1295
1023
# Enabled - property
1296
@dbus_service_property(_interface, signature="b",
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1298
1026
def Enabled_dbus_property(self, value=None):
1299
1027
if value is None: # get
1300
1028
return dbus.Boolean(self.enabled)
1306
1034
# LastCheckedOK - property
1307
@dbus_service_property(_interface, signature="s",
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1309
1037
def LastCheckedOK_dbus_property(self, value=None):
1310
1038
if value is not None:
1311
1039
self.checked_ok()
1313
return datetime_to_dbus(self.last_checked_ok)
1315
# Expires - property
1316
@dbus_service_property(_interface, signature="s", access="read")
1317
def Expires_dbus_property(self):
1318
return datetime_to_dbus(self.expires)
1041
if self.last_checked_ok is None:
1042
return dbus.String(u"")
1043
return dbus.String(self._datetime_to_dbus(self
1320
1046
# LastApprovalRequest - property
1321
@dbus_service_property(_interface, signature="s", access="read")
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1322
1048
def LastApprovalRequest_dbus_property(self):
1323
return datetime_to_dbus(self.last_approval_request)
1049
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1325
1055
# Timeout - property
1326
@dbus_service_property(_interface, signature="t",
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1328
1058
def Timeout_dbus_property(self, value=None):
1329
1059
if value is None: # get
1330
1060
return dbus.UInt64(self.timeout_milliseconds())
1331
1061
self.timeout = datetime.timedelta(0, 0, 0, value)
1332
if getattr(self, "disable_initiator_tag", None) is None:
1063
self.PropertyChanged(dbus.String(u"Timeout"),
1064
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, u"disable_initiator_tag", None) is None:
1334
1067
# Reschedule timeout
1335
1068
gobject.source_remove(self.disable_initiator_tag)
1336
1069
self.disable_initiator_tag = None
1338
time_to_die = timedelta_to_milliseconds((self
1070
time_to_die = (self.
1071
_timedelta_to_milliseconds((self
1343
1076
if time_to_die <= 0:
1344
1077
# The timeout has passed
1347
self.expires = (datetime.datetime.utcnow()
1348
+ datetime.timedelta(milliseconds =
1350
1080
self.disable_initiator_tag = (gobject.timeout_add
1351
1081
(time_to_die, self.disable))
1353
# ExtendedTimeout - property
1354
@dbus_service_property(_interface, signature="t",
1356
def ExtendedTimeout_dbus_property(self, value=None):
1357
if value is None: # get
1358
return dbus.UInt64(self.extended_timeout_milliseconds())
1359
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1361
1083
# Interval - property
1362
@dbus_service_property(_interface, signature="t",
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1364
1086
def Interval_dbus_property(self, value=None):
1365
1087
if value is None: # get
1366
1088
return dbus.UInt64(self.interval_milliseconds())
1367
1089
self.interval = datetime.timedelta(0, 0, 0, value)
1368
if getattr(self, "checker_initiator_tag", None) is None:
1091
self.PropertyChanged(dbus.String(u"Interval"),
1092
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, u"checker_initiator_tag", None) is None:
1371
# Reschedule checker run
1372
gobject.source_remove(self.checker_initiator_tag)
1373
self.checker_initiator_tag = (gobject.timeout_add
1374
(value, self.start_checker))
1375
self.start_checker() # Start one now, too
1095
# Reschedule checker run
1096
gobject.source_remove(self.checker_initiator_tag)
1097
self.checker_initiator_tag = (gobject.timeout_add
1098
(value, self.start_checker))
1099
self.start_checker() # Start one now, too
1377
1101
# Checker - property
1378
@dbus_service_property(_interface, signature="s",
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1380
1104
def Checker_dbus_property(self, value=None):
1381
1105
if value is None: # get
1382
1106
return dbus.String(self.checker_command)
1383
self.checker_command = unicode(value)
1107
self.checker_command = value
1109
self.PropertyChanged(dbus.String(u"Checker"),
1110
dbus.String(self.checker_command,
1385
1113
# CheckerRunning - property
1386
@dbus_service_property(_interface, signature="b",
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1388
1116
def CheckerRunning_dbus_property(self, value=None):
1389
1117
if value is None: # get
1390
1118
return dbus.Boolean(self.checker is not None)
1446
1170
def handle(self):
1447
1171
with contextlib.closing(self.server.child_pipe) as child_pipe:
1448
logger.info("TCP connection from: %s",
1172
logger.info(u"TCP connection from: %s",
1449
1173
unicode(self.client_address))
1450
logger.debug("Pipe FD: %d",
1174
logger.debug(u"Pipe FD: %d",
1451
1175
self.server.child_pipe.fileno())
1453
1177
session = (gnutls.connection
1454
1178
.ClientSession(self.request,
1455
1179
gnutls.connection
1456
1180
.X509Credentials()))
1458
1182
# Note: gnutls.connection.X509Credentials is really a
1459
1183
# generic GnuTLS certificate credentials object so long as
1460
1184
# no X.509 keys are added to it. Therefore, we can use it
1461
1185
# here despite using OpenPGP certificates.
1463
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1464
# "+AES-256-CBC", "+SHA1",
1465
# "+COMP-NULL", "+CTYPE-OPENPGP",
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
# u"+AES-256-CBC", u"+SHA1",
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1467
1191
# Use a fallback default, since this MUST be set.
1468
1192
priority = self.server.gnutls_priority
1469
1193
if priority is None:
1194
priority = u"NORMAL"
1471
1195
(gnutls.library.functions
1472
1196
.gnutls_priority_set_direct(session._c_object,
1473
1197
priority, None))
1475
1199
# Start communication using the Mandos protocol
1476
1200
# Get protocol number
1477
1201
line = self.request.makefile().readline()
1478
logger.debug("Protocol version: %r", line)
1202
logger.debug(u"Protocol version: %r", line)
1480
1204
if int(line.strip().split()[0]) > 1:
1481
1205
raise RuntimeError
1482
except (ValueError, IndexError, RuntimeError) as error:
1483
logger.error("Unknown protocol version: %s", error)
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1486
1210
# Start GnuTLS connection
1488
1212
session.handshake()
1489
except gnutls.errors.GNUTLSError as error:
1490
logger.warning("Handshake failed: %s", error)
1213
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1491
1215
# Do not run session.bye() here: the session is not
1492
1216
# established. Just abandon the request.
1494
logger.debug("Handshake succeeded")
1218
logger.debug(u"Handshake succeeded")
1496
1220
approval_required = False
1499
1223
fpr = self.fingerprint(self.peer_certificate
1502
gnutls.errors.GNUTLSError) as error:
1503
logger.warning("Bad certificate: %s", error)
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1505
logger.debug("Fingerprint: %s", fpr)
1228
logger.debug(u"Fingerprint: %s", fpr)
1508
1231
client = ProxyClient(child_pipe, fpr,
1509
1232
self.client_address)
1510
1233
except KeyError:
1513
if self.server.use_dbus:
1515
client.NewRequest(str(self.client_address))
1517
1236
if client.approval_delay:
1518
1237
delay = client.approval_delay
1519
1238
client.approvals_pending += 1
1786
1499
def server_activate(self):
1787
1500
if self.enabled:
1788
1501
return socketserver.TCPServer.server_activate(self)
1790
1502
def enable(self):
1791
1503
self.enabled = True
1793
def add_pipe(self, parent_pipe, proc):
1504
def add_pipe(self, parent_pipe):
1794
1505
# Call "handle_ipc" for both data and EOF events
1795
1506
gobject.io_add_watch(parent_pipe.fileno(),
1796
1507
gobject.IO_IN | gobject.IO_HUP,
1797
1508
functools.partial(self.handle_ipc,
1509
parent_pipe = parent_pipe))
1802
1511
def handle_ipc(self, source, condition, parent_pipe=None,
1803
proc = None, client_object=None):
1512
client_object=None):
1804
1513
condition_names = {
1805
gobject.IO_IN: "IN", # There is data to read.
1806
gobject.IO_OUT: "OUT", # Data can be written (without
1514
gobject.IO_IN: u"IN", # There is data to read.
1515
gobject.IO_OUT: u"OUT", # Data can be written (without
1808
gobject.IO_PRI: "PRI", # There is urgent data to read.
1809
gobject.IO_ERR: "ERR", # Error condition.
1810
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1517
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
gobject.IO_ERR: u"ERR", # Error condition.
1519
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1811
1520
# broken, usually for pipes and
1829
1536
fpr = request[1]
1830
1537
address = request[2]
1832
for c in self.clients.itervalues():
1539
for c in self.clients:
1833
1540
if c.fingerprint == fpr:
1837
logger.info("Client not found for fingerprint: %s, ad"
1838
"dress: %s", fpr, address)
1544
logger.warning(u"Client not found for fingerprint: %s, ad"
1545
u"dress: %s", fpr, address)
1839
1546
if self.use_dbus:
1840
1547
# Emit D-Bus signal
1841
mandos_dbus_service.ClientNotFound(fpr,
1548
mandos_dbus_service.ClientNotFound(fpr, address[0])
1843
1549
parent_pipe.send(False)
1846
1552
gobject.io_add_watch(parent_pipe.fileno(),
1847
1553
gobject.IO_IN | gobject.IO_HUP,
1848
1554
functools.partial(self.handle_ipc,
1555
parent_pipe = parent_pipe,
1556
client_object = client))
1854
1557
parent_pipe.send(True)
1855
# remove the old hook in favor of the new above hook on
1558
# remove the old hook in favor of the new above hook on same fileno
1858
1560
if command == 'funcall':
1859
1561
funcname = request[1]
1860
1562
args = request[2]
1861
1563
kwargs = request[3]
1863
parent_pipe.send(('data', getattr(client_object,
1565
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1867
1567
if command == 'getattr':
1868
1568
attrname = request[1]
1869
1569
if callable(client_object.__getattribute__(attrname)):
1870
1570
parent_pipe.send(('function',))
1872
parent_pipe.send(('data', client_object
1873
.__getattribute__(attrname)))
1572
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1875
1574
if command == 'setattr':
1876
1575
attrname = request[1]
1877
1576
value = request[2]
1878
1577
setattr(client_object, attrname, value)
1883
1582
def string_to_delta(interval):
1884
1583
"""Parse a string and return a datetime.timedelta
1886
>>> string_to_delta('7d')
1585
>>> string_to_delta(u'7d')
1887
1586
datetime.timedelta(7)
1888
>>> string_to_delta('60s')
1587
>>> string_to_delta(u'60s')
1889
1588
datetime.timedelta(0, 60)
1890
>>> string_to_delta('60m')
1589
>>> string_to_delta(u'60m')
1891
1590
datetime.timedelta(0, 3600)
1892
>>> string_to_delta('24h')
1591
>>> string_to_delta(u'24h')
1893
1592
datetime.timedelta(1)
1894
>>> string_to_delta('1w')
1593
>>> string_to_delta(u'1w')
1895
1594
datetime.timedelta(7)
1896
>>> string_to_delta('5m 30s')
1595
>>> string_to_delta(u'5m 30s')
1897
1596
datetime.timedelta(0, 330)
1899
1598
timevalue = datetime.timedelta(0)
1902
1601
suffix = unicode(s[-1])
1903
1602
value = int(s[:-1])
1905
1604
delta = datetime.timedelta(value)
1605
elif suffix == u"s":
1907
1606
delta = datetime.timedelta(0, value)
1607
elif suffix == u"m":
1909
1608
delta = datetime.timedelta(0, 0, 0, 0, value)
1609
elif suffix == u"h":
1911
1610
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
elif suffix == u"w":
1913
1612
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1915
raise ValueError("Unknown suffix %r" % suffix)
1916
except (ValueError, IndexError) as e:
1917
raise ValueError(*(e.args))
1614
raise ValueError(u"Unknown suffix %r" % suffix)
1615
except (ValueError, IndexError), e:
1616
raise ValueError(e.message)
1918
1617
timevalue += delta
1919
1618
return timevalue
1621
def if_nametoindex(interface):
1622
"""Call the C function if_nametoindex(), or equivalent
1624
Note: This function cannot accept a unicode string."""
1625
global if_nametoindex
1627
if_nametoindex = (ctypes.cdll.LoadLibrary
1628
(ctypes.util.find_library(u"c"))
1630
except (OSError, AttributeError):
1631
logger.warning(u"Doing if_nametoindex the hard way")
1632
def if_nametoindex(interface):
1633
"Get an interface index the hard way, i.e. using fcntl()"
1634
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1635
with contextlib.closing(socket.socket()) as s:
1636
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
struct.pack(str(u"16s16x"),
1639
interface_index = struct.unpack(str(u"I"),
1641
return interface_index
1642
return if_nametoindex(interface)
1922
1645
def daemon(nochdir = False, noclose = False):
1923
1646
"""See daemon(3). Standard BSD Unix function.
1949
1672
##################################################################
1950
1673
# Parsing of options, both command line and config file
1952
parser = argparse.ArgumentParser()
1953
parser.add_argument("-v", "--version", action="version",
1954
version = "%%(prog)s %s" % version,
1955
help="show version number and exit")
1956
parser.add_argument("-i", "--interface", metavar="IF",
1957
help="Bind to interface IF")
1958
parser.add_argument("-a", "--address",
1959
help="Address to listen for requests on")
1960
parser.add_argument("-p", "--port", type=int,
1961
help="Port number to receive requests on")
1962
parser.add_argument("--check", action="store_true",
1963
help="Run self-test")
1964
parser.add_argument("--debug", action="store_true",
1965
help="Debug mode; run in foreground and log"
1967
parser.add_argument("--debuglevel", metavar="LEVEL",
1968
help="Debug level for stdout output")
1969
parser.add_argument("--priority", help="GnuTLS"
1970
" priority string (see GnuTLS documentation)")
1971
parser.add_argument("--servicename",
1972
metavar="NAME", help="Zeroconf service name")
1973
parser.add_argument("--configdir",
1974
default="/etc/mandos", metavar="DIR",
1975
help="Directory to search for configuration"
1977
parser.add_argument("--no-dbus", action="store_false",
1978
dest="use_dbus", help="Do not provide D-Bus"
1979
" system bus interface")
1980
parser.add_argument("--no-ipv6", action="store_false",
1981
dest="use_ipv6", help="Do not use IPv6")
1982
parser.add_argument("--no-restore", action="store_false",
1983
dest="restore", help="Do not restore stored"
1985
parser.add_argument("--statedir", metavar="DIR",
1986
help="Directory to save/restore state in")
1988
options = parser.parse_args()
1675
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", u"--interface", type=u"string",
1677
metavar="IF", help=u"Bind to interface IF")
1678
parser.add_option("-a", u"--address", type=u"string",
1679
help=u"Address to listen for requests on")
1680
parser.add_option("-p", u"--port", type=u"int",
1681
help=u"Port number to receive requests on")
1682
parser.add_option("--check", action=u"store_true",
1683
help=u"Run self-test")
1684
parser.add_option("--debug", action=u"store_true",
1685
help=u"Debug mode; run in foreground and log to"
1687
parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
help=u"Debug level for stdout output")
1689
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
u" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type=u"string",
1692
metavar=u"NAME", help=u"Zeroconf service name")
1693
parser.add_option("--configdir", type=u"string",
1694
default=u"/etc/mandos", metavar=u"DIR",
1695
help=u"Directory to search for configuration"
1697
parser.add_option("--no-dbus", action=u"store_false",
1698
dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
u" system bus interface")
1700
parser.add_option("--no-ipv6", action=u"store_false",
1701
dest=u"use_ipv6", help=u"Do not use IPv6")
1702
options = parser.parse_args()[0]
1990
1704
if options.check:
1995
1709
# Default values for config file for server-global settings
1996
server_defaults = { "interface": "",
2001
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2002
"servicename": "Mandos",
2007
"statedir": "/var/lib/mandos"
1710
server_defaults = { u"interface": u"",
1715
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
u"servicename": u"Mandos",
1717
u"use_dbus": u"True",
1718
u"use_ipv6": u"True",
2010
1722
# Parse config file for server-global settings
2011
1723
server_config = configparser.SafeConfigParser(server_defaults)
2012
1724
del server_defaults
2013
1725
server_config.read(os.path.join(options.configdir,
2015
1727
# Convert the SafeConfigParser object to a dict
2016
1728
server_settings = server_config.defaults()
2017
1729
# Use the appropriate methods on the non-string config options
2018
for option in ("debug", "use_dbus", "use_ipv6"):
2019
server_settings[option] = server_config.getboolean("DEFAULT",
1730
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
server_settings[option] = server_config.getboolean(u"DEFAULT",
2021
1733
if server_settings["port"]:
2022
server_settings["port"] = server_config.getint("DEFAULT",
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
2024
1736
del server_config
2026
1738
# Override the settings from the config file with command line
2027
1739
# options, if set.
2028
for option in ("interface", "address", "port", "debug",
2029
"priority", "servicename", "configdir",
2030
"use_dbus", "use_ipv6", "debuglevel", "restore",
1740
for option in (u"interface", u"address", u"port", u"debug",
1741
u"priority", u"servicename", u"configdir",
1742
u"use_dbus", u"use_ipv6", u"debuglevel"):
2032
1743
value = getattr(options, option)
2033
1744
if value is not None:
2034
1745
server_settings[option] = value
2042
1753
##################################################################
2044
1755
# For convenience
2045
debug = server_settings["debug"]
2046
debuglevel = server_settings["debuglevel"]
2047
use_dbus = server_settings["use_dbus"]
2048
use_ipv6 = server_settings["use_ipv6"]
2049
stored_state_path = os.path.join(server_settings["statedir"],
2053
initlogger(logging.DEBUG)
2058
level = getattr(logging, debuglevel.upper())
2061
if server_settings["servicename"] != "Mandos":
1756
debug = server_settings[u"debug"]
1757
debuglevel = server_settings[u"debuglevel"]
1758
use_dbus = server_settings[u"use_dbus"]
1759
use_ipv6 = server_settings[u"use_ipv6"]
1761
if server_settings[u"servicename"] != u"Mandos":
2062
1762
syslogger.setFormatter(logging.Formatter
2063
('Mandos (%s) [%%(process)d]:'
2064
' %%(levelname)s: %%(message)s'
2065
% server_settings["servicename"]))
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
2067
1767
# Parse config file with clients
2068
client_defaults = { "timeout": "5m",
2069
"extended_timeout": "15m",
2071
"checker": "fping -q -- %%(host)s",
2073
"approval_delay": "0s",
2074
"approval_duration": "1s",
1768
client_defaults = { u"timeout": u"1h",
1770
u"checker": u"fping -q -- %%(host)s",
1772
u"approval_delay": u"0s",
1773
u"approval_duration": u"1s",
2076
1775
client_config = configparser.SafeConfigParser(client_defaults)
2077
client_config.read(os.path.join(server_settings["configdir"],
1776
client_config.read(os.path.join(server_settings[u"configdir"],
2080
1779
global mandos_dbus_service
2081
1780
mandos_dbus_service = None
2083
tcp_server = MandosServer((server_settings["address"],
2084
server_settings["port"]),
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
2086
interface=(server_settings["interface"]
1785
interface=(server_settings[u"interface"]
2088
1787
use_ipv6=use_ipv6,
2089
1788
gnutls_priority=
2090
server_settings["priority"],
1789
server_settings[u"priority"],
2091
1790
use_dbus=use_dbus)
2093
pidfilename = "/var/run/mandos.pid"
1792
pidfilename = u"/var/run/mandos.pid"
2095
pidfile = open(pidfilename, "w")
1794
pidfile = open(pidfilename, u"w")
2096
1795
except IOError:
2097
logger.error("Could not open file %r", pidfilename)
1796
logger.error(u"Could not open file %r", pidfilename)
2100
uid = pwd.getpwnam("_mandos").pw_uid
2101
gid = pwd.getpwnam("_mandos").pw_gid
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
2102
1801
except KeyError:
2104
uid = pwd.getpwnam("mandos").pw_uid
2105
gid = pwd.getpwnam("mandos").pw_gid
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
2106
1805
except KeyError:
2108
uid = pwd.getpwnam("nobody").pw_uid
2109
gid = pwd.getpwnam("nobody").pw_gid
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
2110
1809
except KeyError:
2116
except OSError as error:
1815
except OSError, error:
2117
1816
if error[0] != errno.EPERM:
1819
if not debug and not debuglevel:
1820
syslogger.setLevel(logging.WARNING)
1821
console.setLevel(logging.WARNING)
1823
level = getattr(logging, debuglevel.upper())
1824
syslogger.setLevel(level)
1825
console.setLevel(level)
2121
1828
# Enable all possible GnuTLS debugging
2153
1856
# End of Avahi example code
2156
bus_name = dbus.service.BusName("se.recompile.Mandos",
1859
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2157
1860
bus, do_not_queue=True)
2158
old_bus_name = (dbus.service.BusName
2159
("se.bsnet.fukt.Mandos", bus,
2161
except dbus.exceptions.NameExistsException as e:
2162
logger.error(unicode(e) + ", disabling D-Bus")
1861
except dbus.exceptions.NameExistsException, e:
1862
logger.error(unicode(e) + u", disabling D-Bus")
2163
1863
use_dbus = False
2164
server_settings["use_dbus"] = False
1864
server_settings[u"use_dbus"] = False
2165
1865
tcp_server.use_dbus = False
2166
1866
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2167
service = AvahiServiceToSyslog(name =
2168
server_settings["servicename"],
2169
servicetype = "_mandos._tcp",
2170
protocol = protocol, bus = bus)
1867
service = AvahiService(name = server_settings[u"servicename"],
1868
servicetype = u"_mandos._tcp",
1869
protocol = protocol, bus = bus)
2171
1870
if server_settings["interface"]:
2172
1871
service.interface = (if_nametoindex
2173
(str(server_settings["interface"])))
1872
(str(server_settings[u"interface"])))
1875
# Close all input and output, do double fork, etc.
2175
1878
global multiprocessing_manager
2176
1879
multiprocessing_manager = multiprocessing.Manager()
2178
1881
client_class = Client
2180
client_class = functools.partial(ClientDBusTransitional,
2183
special_settings = {
2184
# Some settings need to be accessd by special methods;
2185
# booleans need .getboolean(), etc. Here is a list of them:
2186
"approved_by_default":
2188
client_config.getboolean(section, "approved_by_default"),
2191
client_config.getboolean(section, "enabled"),
2193
# Construct a new dict of client settings of this form:
2194
# { client_name: {setting_name: value, ...}, ...}
2195
# with exceptions for any special settings as defined above
2196
client_settings = dict((clientname,
2199
if setting not in special_settings
2200
else special_settings[setting]
2202
for setting, value in
2203
client_config.items(clientname)))
2204
for clientname in client_config.sections())
2206
old_client_settings = {}
2209
# Get client data and settings from last running state.
2210
if server_settings["restore"]:
2212
with open(stored_state_path, "rb") as stored_state:
2213
clients_data, old_client_settings = (pickle.load
2215
os.remove(stored_state_path)
2216
except IOError as e:
2217
logger.warning("Could not load persistent state: {0}"
2219
if e.errno != errno.ENOENT:
2222
with PGPEngine() as pgp:
2223
for client in clients_data:
2224
client_name = client["name"]
2226
# Decide which value to use after restoring saved state.
2227
# We have three different values: Old config file,
2228
# new config file, and saved state.
2229
# New config value takes precedence if it differs from old
2230
# config value, otherwise use saved state.
2231
for name, value in client_settings[client_name].items():
2233
# For each value in new config, check if it
2234
# differs from the old config value (Except for
2235
# the "secret" attribute)
2236
if (name != "secret" and
2237
value != old_client_settings[client_name]
2239
client[name] = value
2243
# Clients who has passed its expire date can still be
2244
# enabled if its last checker was sucessful. Clients
2245
# whose checker failed before we stored its state is
2246
# assumed to have failed all checkers during downtime.
2247
if client["enabled"]:
2248
if client["expires"] <= (datetime.datetime
2250
# Client has expired
2251
if client["last_checker_status"] != 0:
2252
client["enabled"] = False
2254
client["expires"] = (datetime.datetime
2256
+ client["timeout"])
2258
client["changedstate"] = (multiprocessing_manager
2260
(multiprocessing_manager
2263
new_client = (ClientDBusTransitional.__new__
2264
(ClientDBusTransitional))
2265
tcp_server.clients[client_name] = new_client
2266
new_client.bus = bus
2267
for name, value in client.iteritems():
2268
setattr(new_client, name, value)
2269
client_object_name = unicode(client_name).translate(
2270
{ord("."): ord("_"),
2271
ord("-"): ord("_")})
2272
new_client.dbus_object_path = (dbus.ObjectPath
2274
+ client_object_name))
2275
DBusObjectWithProperties.__init__(new_client,
2280
tcp_server.clients[client_name] = (Client.__new__
2282
for name, value in client.iteritems():
2283
setattr(tcp_server.clients[client_name],
1883
client_class = functools.partial(ClientDBus, bus = bus)
1884
def client_config_items(config, section):
1885
special_settings = {
1886
"approved_by_default":
1887
lambda: config.getboolean(section,
1888
"approved_by_default"),
1890
for name, value in config.items(section):
2287
tcp_server.clients[client_name].secret = (
2288
pgp.decrypt(tcp_server.clients[client_name]
2290
client_settings[client_name]
2293
# If decryption fails, we use secret from new settings
2294
logger.debug("Failed to decrypt {0} old secret"
2295
.format(client_name))
2296
tcp_server.clients[client_name].secret = (
2297
client_settings[client_name]["secret"])
2299
# Create/remove clients based on new changes made to config
2300
for clientname in set(old_client_settings) - set(client_settings):
2301
del tcp_server.clients[clientname]
2302
for clientname in set(client_settings) - set(old_client_settings):
2303
tcp_server.clients[clientname] = (client_class(name
1892
yield (name, special_settings[name]())
1896
tcp_server.clients.update(set(
1897
client_class(name = section,
1898
config= dict(client_config_items(
1899
client_config, section)))
1900
for section in client_config.sections()))
2309
1901
if not tcp_server.clients:
2310
logger.warning("No clients defined")
1902
logger.warning(u"No clients defined")
2315
1907
pid = os.getpid()
2316
pidfile.write(str(pid) + "\n".encode("utf-8"))
1908
pidfile.write(str(pid) + "\n")
2318
1910
except IOError:
2319
logger.error("Could not write to file %r with PID %d",
1911
logger.error(u"Could not write to file %r with PID %d",
2320
1912
pidfilename, pid)
2321
1913
except NameError:
2322
1914
# "pidfile" was never created
2332
1924
class MandosDBusService(dbus.service.Object):
2333
1925
"""A D-Bus proxy object"""
2334
1926
def __init__(self):
2335
dbus.service.Object.__init__(self, bus, "/")
2336
_interface = "se.recompile.Mandos"
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
2338
@dbus.service.signal(_interface, signature="o")
1930
@dbus.service.signal(_interface, signature=u"o")
2339
1931
def ClientAdded(self, objpath):
2343
@dbus.service.signal(_interface, signature="ss")
1935
@dbus.service.signal(_interface, signature=u"ss")
2344
1936
def ClientNotFound(self, fingerprint, address):
2348
@dbus.service.signal(_interface, signature="os")
1940
@dbus.service.signal(_interface, signature=u"os")
2349
1941
def ClientRemoved(self, objpath, name):
2353
@dbus.service.method(_interface, out_signature="ao")
1945
@dbus.service.method(_interface, out_signature=u"ao")
2354
1946
def GetAllClients(self):
2356
1948
return dbus.Array(c.dbus_object_path
2358
tcp_server.clients.itervalues())
1949
for c in tcp_server.clients)
2360
1951
@dbus.service.method(_interface,
2361
out_signature="a{oa{sv}}")
1952
out_signature=u"a{oa{sv}}")
2362
1953
def GetAllClientsWithProperties(self):
2364
1955
return dbus.Dictionary(
2365
((c.dbus_object_path, c.GetAll(""))
2366
for c in tcp_server.clients.itervalues()),
1956
((c.dbus_object_path, c.GetAll(u""))
1957
for c in tcp_server.clients),
1958
signature=u"oa{sv}")
2369
@dbus.service.method(_interface, in_signature="o")
1960
@dbus.service.method(_interface, in_signature=u"o")
2370
1961
def RemoveClient(self, object_path):
2372
for c in tcp_server.clients.itervalues():
1963
for c in tcp_server.clients:
2373
1964
if c.dbus_object_path == object_path:
2374
del tcp_server.clients[c.name]
1965
tcp_server.clients.remove(c)
2375
1966
c.remove_from_connection()
2376
1967
# Don't signal anything except ClientRemoved
2377
1968
c.disable(quiet=True)
2385
class MandosDBusServiceTransitional(MandosDBusService):
2386
__metaclass__ = AlternateDBusNamesMetaclass
2387
mandos_dbus_service = MandosDBusServiceTransitional()
1976
mandos_dbus_service = MandosDBusService()
2390
1979
"Cleanup function; run on exit"
2391
1980
service.cleanup()
2393
multiprocessing.active_children()
2394
if not (tcp_server.clients or client_settings):
2397
# Store client before exiting. Secrets are encrypted with key
2398
# based on what config file has. If config file is
2399
# removed/edited, old secret will thus be unrecovable.
2401
with PGPEngine() as pgp:
2402
for client in tcp_server.clients.itervalues():
2403
key = client_settings[client.name]["secret"]
2404
client.encrypted_secret = pgp.encrypt(client.secret,
2408
# A list of attributes that will not be stored when
2410
exclude = set(("bus", "changedstate", "secret"))
2411
for name, typ in (inspect.getmembers
2412
(dbus.service.Object)):
2415
client_dict["encrypted_secret"] = (client
2417
for attr in client.client_structure:
2418
if attr not in exclude:
2419
client_dict[attr] = getattr(client, attr)
2421
clients.append(client_dict)
2422
del client_settings[client.name]["secret"]
2425
with os.fdopen(os.open(stored_state_path,
2426
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2427
0600), "wb") as stored_state:
2428
pickle.dump((clients, client_settings), stored_state)
2429
except (IOError, OSError) as e:
2430
logger.warning("Could not save persistent state: {0}"
2432
if e.errno not in (errno.ENOENT, errno.EACCES):
2435
# Delete all clients, and settings from config
2436
1982
while tcp_server.clients:
2437
name, client = tcp_server.clients.popitem()
1983
client = tcp_server.clients.pop()
2439
1985
client.remove_from_connection()
1986
client.disable_hook = None
2440
1987
# Don't signal anything except ClientRemoved
2441
1988
client.disable(quiet=True)
2443
1990
# Emit D-Bus signal
2444
mandos_dbus_service.ClientRemoved(client
1991
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2447
client_settings.clear()
2449
1994
atexit.register(cleanup)
2451
for client in tcp_server.clients.itervalues():
1996
for client in tcp_server.clients:
2453
1998
# Emit D-Bus signal
2454
1999
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2455
# Need to initiate checking of clients
2457
client.init_checker()
2459
2002
tcp_server.enable()
2460
2003
tcp_server.server_activate()