124
256
self.rename_count = 0
125
257
self.max_renames = max_renames
258
self.protocol = protocol
259
self.group = None # our entry group
262
self.entry_group_state_changed_match = None
126
263
def rename(self):
127
264
"""Derived from the Avahi example code"""
128
265
if self.rename_count >= self.max_renames:
129
logger.critical(u"No suitable Zeroconf service name found"
130
u" after %i retries, exiting.",
266
logger.critical("No suitable Zeroconf service name found"
267
" after %i retries, exiting.",
131
268
self.rename_count)
132
raise AvahiServiceError(u"Too many renames")
133
self.name = server.GetAlternativeServiceName(self.name)
134
logger.info(u"Changing Zeroconf service name to %r ...",
136
syslogger.setFormatter(logging.Formatter
137
('Mandos (%s): %%(levelname)s:'
138
' %%(message)s' % self.name))
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 ...",
277
except dbus.exceptions.DBusException as error:
278
logger.critical("DBusException: %s", error)
141
281
self.rename_count += 1
142
282
def remove(self):
143
283
"""Derived from the Avahi example code"""
144
if group is not None:
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
if self.group is not None:
147
290
"""Derived from the Avahi example code"""
150
group = dbus.Interface(bus.get_object
152
server.EntryGroupNew()),
153
avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
group.connect_to_signal('StateChanged',
155
entry_group_state_changed)
156
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
157
service.name, service.type)
159
self.interface, # interface
160
avahi.PROTO_INET6, # protocol
161
dbus.UInt32(0), # flags
162
self.name, self.type,
163
self.domain, self.host,
164
dbus.UInt16(self.port),
165
avahi.string_array_to_txt_array(self.TXT))
168
# From the Avahi example code:
169
group = None # our entry group
170
# End of Avahi example code
173
def _datetime_to_dbus(dt, variant_level=0):
174
"""Convert a UTC datetime.datetime() to a D-Bus type."""
175
return dbus.String(dt.isoformat(), variant_level=variant_level)
178
class Client(dbus.service.Object):
292
if self.group is None:
293
self.group = dbus.Interface(
294
self.bus.get_object(avahi.DBUS_NAME,
295
self.server.EntryGroupNew()),
296
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' ...",
301
self.name, self.type)
302
self.group.AddService(
305
dbus.UInt32(0), # flags
306
self.name, self.type,
307
self.domain, self.host,
308
dbus.UInt16(self.port),
309
avahi.string_array_to_txt_array(self.TXT))
311
def entry_group_state_changed(self, state, error):
312
"""Derived from the Avahi example code"""
313
logger.debug("Avahi entry group state change: %i", state)
315
if state == avahi.ENTRY_GROUP_ESTABLISHED:
316
logger.debug("Zeroconf service established.")
317
elif state == avahi.ENTRY_GROUP_COLLISION:
318
logger.info("Zeroconf service name collision.")
320
elif state == avahi.ENTRY_GROUP_FAILURE:
321
logger.critical("Avahi: Error in group state changed %s",
323
raise AvahiGroupError("State changed: %s"
326
"""Derived from the Avahi example code"""
327
if self.group is not None:
330
except (dbus.exceptions.UnknownMethodException,
331
dbus.exceptions.DBusException):
335
def server_state_changed(self, state, error=None):
336
"""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)
352
elif state == avahi.SERVER_RUNNING:
356
logger.debug("Unknown state: %r", state)
358
logger.debug("Unknown state: %r: %r", state, error)
360
"""Derived from the Avahi example code"""
361
if self.server is None:
362
self.server = dbus.Interface(
363
self.bus.get_object(avahi.DBUS_NAME,
364
avahi.DBUS_PATH_SERVER,
365
follow_name_owner_changes=True),
366
avahi.DBUS_INTERFACE_SERVER)
367
self.server.connect_to_signal("StateChanged",
368
self.server_state_changed)
369
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
class Client(object):
179
388
"""A representation of a client host served by this server.
181
name: string; from the config file, used in log messages
391
approved: bool(); 'None' if not yet approved/disapproved
392
approval_delay: datetime.timedelta(); Time to wait for approval
393
approval_duration: datetime.timedelta(); Duration of one approval
394
checker: subprocess.Popen(); a running checker process used
395
to see if the client lives.
396
'None' if no process is running.
397
checker_callback_tag: a gobject event source tag, or None
398
checker_command: string; External command which is run to check
399
if client lives. %() expansions are done at
400
runtime with vars(self) as dict, so that for
401
instance %(name)s can be used in the command.
402
checker_initiator_tag: a gobject event source tag, or None
403
created: datetime.datetime(); (UTC) object creation
404
client_structure: Object describing what attributes a client has
405
and is used for storing the client at exit
406
current_checker_command: string; current running checker_command
407
disable_initiator_tag: a gobject event source tag, or None
182
409
fingerprint: string (40 or 32 hexadecimal digits); used to
183
410
uniquely identify the client
184
secret: bytestring; sent verbatim (over TLS) to client
185
411
host: string; available for use by the checker command
186
created: datetime.datetime(); (UTC) object creation
187
last_enabled: datetime.datetime(); (UTC)
412
interval: datetime.timedelta(); How often to start a new checker
413
last_approval_request: datetime.datetime(); (UTC) or None
189
414
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
190
423
timeout: datetime.timedelta(); How long from last_checked_ok
191
until this client is invalid
192
interval: datetime.timedelta(); How often to start a new checker
193
disable_hook: If set, called by disable() as disable_hook(self)
194
checker: subprocess.Popen(); a running checker process used
195
to see if the client lives.
196
'None' if no process is running.
197
checker_initiator_tag: a gobject event source tag, or None
198
disable_initiator_tag: - '' -
199
checker_callback_tag: - '' -
200
checker_command: string; External command which is run to check if
201
client lives. %() expansions are done at
202
runtime with vars(self) as dict, so that for
203
instance %(name)s can be used in the command.
204
use_dbus: bool(); Whether to provide D-Bus interface and signals
205
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
424
until this client is disabled
425
extended_timeout: extra long timeout when password 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")
207
436
def timeout_milliseconds(self):
208
437
"Return the 'timeout' attribute in milliseconds"
209
return ((self.timeout.days * 24 * 60 * 60 * 1000)
210
+ (self.timeout.seconds * 1000)
211
+ (self.timeout.microseconds // 1000))
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)
213
444
def interval_milliseconds(self):
214
445
"Return the 'interval' attribute in milliseconds"
215
return ((self.interval.days * 24 * 60 * 60 * 1000)
216
+ (self.interval.seconds * 1000)
217
+ (self.interval.microseconds // 1000))
219
def __init__(self, name = None, disable_hook=None, config=None,
446
return timedelta_to_milliseconds(self.interval)
448
def approval_delay_milliseconds(self):
449
return timedelta_to_milliseconds(self.approval_delay)
451
def __init__(self, name = None, config=None):
221
452
"""Note: the 'checker' key in 'config' sets the
222
453
'checker_command' attribute and *not* the 'checker'
225
456
if config is None:
227
logger.debug(u"Creating client %r", self.name)
228
self.use_dbus = use_dbus
230
self.dbus_object_path = (dbus.ObjectPath
232
+ self.name.replace(".", "_")))
233
dbus.service.Object.__init__(self, bus,
234
self.dbus_object_path)
458
logger.debug("Creating client %r", self.name)
235
459
# Uppercase and remove spaces from fingerprint for later
236
460
# comparison purposes with return value from the fingerprint()
238
462
self.fingerprint = (config["fingerprint"].upper()
240
logger.debug(u" Fingerprint: %s", self.fingerprint)
464
logger.debug(" Fingerprint: %s", self.fingerprint)
241
465
if "secret" in config:
242
self.secret = config["secret"].decode(u"base64")
466
self.secret = config["secret"].decode("base64")
243
467
elif "secfile" in config:
244
with closing(open(os.path.expanduser
246
(config["secfile"])))) as secfile:
468
with open(os.path.expanduser(os.path.expandvars
469
(config["secfile"])),
247
471
self.secret = secfile.read()
249
raise TypeError(u"No secret or secfile for client %s"
473
raise TypeError("No secret or secfile for client %s"
251
475
self.host = config.get("host", "")
252
476
self.created = datetime.datetime.utcnow()
254
self.last_enabled = None
477
self.enabled = config.get("enabled", True)
478
self.last_approval_request = None
480
self.last_enabled = datetime.datetime.utcnow()
482
self.last_enabled = None
255
483
self.last_checked_ok = None
484
self.last_checker_status = None
256
485
self.timeout = string_to_delta(config["timeout"])
486
self.extended_timeout = string_to_delta(config
487
["extended_timeout"])
257
488
self.interval = string_to_delta(config["interval"])
258
self.disable_hook = disable_hook
259
489
self.checker = None
260
490
self.checker_initiator_tag = None
261
491
self.disable_initiator_tag = None
493
self.expires = datetime.datetime.utcnow() + self.timeout
262
496
self.checker_callback_tag = None
263
497
self.checker_command = config["checker"]
498
self.current_checker_command = None
500
self.approved_by_default = config.get("approved_by_default",
502
self.approvals_pending = 0
503
self.approval_delay = string_to_delta(
504
config["approval_delay"])
505
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)
522
# Send notice to process children that client state has changed
523
def send_changedstate(self):
524
with self.changedstate:
525
self.changedstate.notify_all()
265
527
def enable(self):
266
528
"""Start this client's checker and timeout hooks"""
529
if getattr(self, "enabled", False):
532
self.send_changedstate()
533
self.expires = datetime.datetime.utcnow() + self.timeout
267
535
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):
268
562
# Schedule a new checker to be started an 'interval' from now,
269
563
# and every interval from then on.
270
564
self.checker_initiator_tag = (gobject.timeout_add
271
565
(self.interval_milliseconds(),
272
566
self.start_checker))
273
# Also start a new checker *right now*.
275
567
# Schedule a disable() when 'timeout' has passed
276
568
self.disable_initiator_tag = (gobject.timeout_add
277
569
(self.timeout_milliseconds(),
282
self.PropertyChanged(dbus.String(u"enabled"),
283
dbus.Boolean(True, variant_level=1))
284
self.PropertyChanged(dbus.String(u"last_enabled"),
285
(_datetime_to_dbus(self.last_enabled,
289
"""Disable this client."""
290
if not getattr(self, "enabled", False):
292
logger.info(u"Disabling client %s", self.name)
293
if getattr(self, "disable_initiator_tag", False):
294
gobject.source_remove(self.disable_initiator_tag)
295
self.disable_initiator_tag = None
296
if getattr(self, "checker_initiator_tag", False):
297
gobject.source_remove(self.checker_initiator_tag)
298
self.checker_initiator_tag = None
300
if self.disable_hook:
301
self.disable_hook(self)
305
self.PropertyChanged(dbus.String(u"enabled"),
306
dbus.Boolean(False, variant_level=1))
307
# Do not run this again if called by a gobject.timeout_add
311
self.disable_hook = None
571
# Also start a new checker *right now*.
314
574
def checker_callback(self, pid, condition, command):
315
575
"""The checker has completed, so take appropriate actions."""
316
576
self.checker_callback_tag = None
317
577
self.checker = None
320
self.PropertyChanged(dbus.String(u"checker_running"),
321
dbus.Boolean(False, variant_level=1))
322
if (os.WIFEXITED(condition)
323
and (os.WEXITSTATUS(condition) == 0)):
324
logger.info(u"Checker for %(name)s succeeded",
328
self.CheckerCompleted(dbus.Boolean(True),
329
dbus.UInt16(condition),
330
dbus.String(command))
332
elif not os.WIFEXITED(condition):
333
logger.warning(u"Checker for %(name)s crashed?",
578
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",
585
logger.info("Checker for %(name)s failed",
588
self.last_checker_status = -1
589
logger.warning("Checker for %(name)s crashed?",
337
self.CheckerCompleted(dbus.Boolean(False),
338
dbus.UInt16(condition),
339
dbus.String(command))
341
logger.info(u"Checker for %(name)s failed",
345
self.CheckerCompleted(dbus.Boolean(False),
346
dbus.UInt16(condition),
347
dbus.String(command))
349
def bump_timeout(self):
592
def checked_ok(self, timeout=None):
350
593
"""Bump up the timeout for this client.
351
595
This should only be called when the client has been seen,
599
timeout = self.timeout
354
600
self.last_checked_ok = datetime.datetime.utcnow()
355
gobject.source_remove(self.disable_initiator_tag)
356
self.disable_initiator_tag = (gobject.timeout_add
357
(self.timeout_milliseconds(),
361
self.PropertyChanged(
362
dbus.String(u"last_checked_ok"),
363
(_datetime_to_dbus(self.last_checked_ok,
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
609
def need_approval(self):
610
self.last_approval_request = datetime.datetime.utcnow()
366
612
def start_checker(self):
367
613
"""Start a new checker subprocess if one is not running.
368
615
If a checker already exists, leave it running and do
370
617
# The reason for not killing a running checker is that if we
423
691
self.checker_callback_tag = None
424
692
if getattr(self, "checker", None) is None:
426
logger.debug(u"Stopping checker for %(name)s", vars(self))
694
logger.debug("Stopping checker for %(name)s", vars(self))
428
696
os.kill(self.checker.pid, signal.SIGTERM)
430
698
#if self.checker.poll() is None:
431
699
# os.kill(self.checker.pid, signal.SIGKILL)
432
except OSError, error:
700
except OSError as error:
433
701
if error.errno != errno.ESRCH: # No such process
435
703
self.checker = None
437
self.PropertyChanged(dbus.String(u"checker_running"),
438
dbus.Boolean(False, variant_level=1))
440
def still_valid(self):
441
"""Has the timeout not yet passed for this client?"""
442
if not getattr(self, "enabled", False):
444
now = datetime.datetime.utcnow()
445
if self.last_checked_ok is None:
446
return now < (self.created + self.timeout)
448
return now < (self.last_checked_ok + self.timeout)
450
## D-Bus methods & signals
451
_interface = u"org.mandos_system.Mandos.Client"
453
# BumpTimeout - method
454
BumpTimeout = dbus.service.method(_interface)(bump_timeout)
455
BumpTimeout.__name__ = "BumpTimeout"
706
def dbus_service_property(dbus_interface, signature="v",
707
access="readwrite", byte_arrays=False):
708
"""Decorators for marking methods of a DBusObjectWithProperties to
709
become properties on the D-Bus.
711
The decorated method will be called with no arguments by "Get"
712
and with one argument by "Set".
714
The parameters, where they are supported, are the same as
715
dbus.service.method, except there is only "signature", since the
716
type from Get() and the type sent to Set() is the same.
718
# Encoding deeply encoded byte arrays is not supported yet by the
719
# "Set" method, so we fail early here:
720
if byte_arrays and signature != "ay":
721
raise ValueError("Byte arrays not supported for non-'ay'"
722
" signature %r" % signature)
724
func._dbus_is_property = True
725
func._dbus_interface = dbus_interface
726
func._dbus_signature = signature
727
func._dbus_access = access
728
func._dbus_name = func.__name__
729
if func._dbus_name.endswith("_dbus_property"):
730
func._dbus_name = func._dbus_name[:-14]
731
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
736
class DBusPropertyException(dbus.exceptions.DBusException):
737
"""A base class for D-Bus property-related exceptions
739
def __unicode__(self):
740
return unicode(str(self))
743
class DBusPropertyAccessException(DBusPropertyException):
744
"""A property's access permissions disallows an operation.
749
class DBusPropertyNotFound(DBusPropertyException):
750
"""An attempt was made to access a non-existing property.
755
class DBusObjectWithProperties(dbus.service.Object):
756
"""A D-Bus object with properties.
758
Classes inheriting from this can use the dbus_service_property
759
decorator to expose methods as D-Bus properties. It exposes the
760
standard Get(), Set(), and GetAll() methods on the D-Bus.
764
def _is_dbus_property(obj):
765
return getattr(obj, "_dbus_is_property", False)
767
def _get_all_dbus_properties(self):
768
"""Returns a generator of (name, attribute) pairs
770
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
771
for cls in self.__class__.__mro__
773
inspect.getmembers(cls, self._is_dbus_property))
775
def _get_dbus_property(self, interface_name, property_name):
776
"""Returns a bound method if one exists which is a D-Bus
777
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)
787
raise DBusPropertyNotFound(self.dbus_object_path + ":"
788
+ interface_name + "."
791
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
793
def Get(self, interface_name, property_name):
794
"""Standard D-Bus property Get() method, see D-Bus standard.
796
prop = self._get_dbus_property(interface_name, property_name)
797
if prop._dbus_access == "write":
798
raise DBusPropertyAccessException(property_name)
800
if not hasattr(value, "variant_level"):
802
return type(value)(value, variant_level=value.variant_level+1)
804
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
805
def Set(self, interface_name, property_name, value):
806
"""Standard D-Bus property Set() method, see D-Bus standard.
808
prop = self._get_dbus_property(interface_name, property_name)
809
if prop._dbus_access == "read":
810
raise DBusPropertyAccessException(property_name)
811
if prop._dbus_get_args_options["byte_arrays"]:
812
# The byte_arrays option is not supported yet on
813
# signatures other than "ay".
814
if prop._dbus_signature != "ay":
816
value = dbus.ByteArray(''.join(unichr(byte)
820
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
821
out_signature="a{sv}")
822
def GetAll(self, interface_name):
823
"""Standard D-Bus property GetAll() method, see D-Bus
826
Note: Will not include properties with access="write".
829
for name, prop in self._get_all_dbus_properties():
831
and interface_name != prop._dbus_interface):
832
# Interface non-empty but did not match
834
# Ignore write-only properties
835
if prop._dbus_access == "write":
838
if not hasattr(value, "variant_level"):
839
properties[name] = value
841
properties[name] = type(value)(value, variant_level=
842
value.variant_level+1)
843
return dbus.Dictionary(properties, signature="sv")
845
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
847
path_keyword='object_path',
848
connection_keyword='connection')
849
def Introspect(self, object_path, connection):
850
"""Standard D-Bus method, overloaded to insert property tags.
852
xmlstring = dbus.service.Object.Introspect(self, object_path,
855
document = xml.dom.minidom.parseString(xmlstring)
856
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)
862
for if_tag in document.getElementsByTagName("interface"):
863
for tag in (make_tag(document, name, prop)
865
in self._get_all_dbus_properties()
866
if prop._dbus_interface
867
== if_tag.getAttribute("name")):
868
if_tag.appendChild(tag)
869
# Add the names to the return values for the
870
# "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")
886
except (AttributeError, xml.dom.DOMException,
887
xml.parsers.expat.ExpatError) as error:
888
logger.error("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
class ClientDBus(Client, DBusObjectWithProperties):
1000
"""A Client class using D-Bus
1003
dbus_object_path: dbus.ObjectPath
1004
bus: dbus.SystemBus()
1007
runtime_expansions = (Client.runtime_expansions
1008
+ ("dbus_object_path",))
1010
# dbus.service.Object doesn't use super(), so we can't either.
1012
def __init__(self, bus = None, *args, **kwargs):
1014
Client.__init__(self, *args, **kwargs)
1016
self._approvals_pending = 0
1017
# Only now, when this client is initialized, can it show up on
1019
client_object_name = unicode(self.name).translate(
1020
{ord("."): ord("_"),
1021
ord("-"): ord("_")})
1022
self.dbus_object_path = (dbus.ObjectPath
1023
("/clients/" + client_object_name))
1024
DBusObjectWithProperties.__init__(self, self.bus,
1025
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.UInt16,
1075
timedelta_to_milliseconds)
1076
approval_duration = notifychangeproperty(
1077
dbus.UInt16, "ApprovalDuration",
1078
type_func = timedelta_to_milliseconds)
1079
host = notifychangeproperty(dbus.String, "Host")
1080
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1082
timedelta_to_milliseconds)
1083
extended_timeout = notifychangeproperty(
1084
dbus.UInt16, "ExtendedTimeout",
1085
type_func = timedelta_to_milliseconds)
1086
interval = notifychangeproperty(dbus.UInt16,
1089
timedelta_to_milliseconds)
1090
checker_command = notifychangeproperty(dbus.String, "Checker")
1092
del notifychangeproperty
1094
def __del__(self, *args, **kwargs):
1096
self.remove_from_connection()
1099
if hasattr(DBusObjectWithProperties, "__del__"):
1100
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1101
Client.__del__(self, *args, **kwargs)
1103
def checker_callback(self, pid, condition, command,
1105
self.checker_callback_tag = None
1107
if os.WIFEXITED(condition):
1108
exitstatus = os.WEXITSTATUS(condition)
1110
self.CheckerCompleted(dbus.Int16(exitstatus),
1111
dbus.Int64(condition),
1112
dbus.String(command))
1115
self.CheckerCompleted(dbus.Int16(-1),
1116
dbus.Int64(condition),
1117
dbus.String(command))
1119
return Client.checker_callback(self, pid, condition, command,
1122
def start_checker(self, *args, **kwargs):
1123
old_checker = self.checker
1124
if self.checker is not None:
1125
old_checker_pid = self.checker.pid
1127
old_checker_pid = None
1128
r = Client.start_checker(self, *args, **kwargs)
1129
# Only if new checker process was started
1130
if (self.checker is not None
1131
and old_checker_pid != self.checker.pid):
1133
self.CheckerStarted(self.current_checker_command)
1136
def _reset_approved(self):
1137
self.approved = None
1140
def approve(self, value=True):
1141
self.send_changedstate()
1142
self.approved = value
1143
gobject.timeout_add(timedelta_to_milliseconds
1144
(self.approval_duration),
1145
self._reset_approved)
1148
## D-Bus methods, signals & properties
1149
_interface = "se.recompile.Mandos.Client"
457
1153
# CheckerCompleted - signal
458
@dbus.service.signal(_interface, signature="bqs")
459
def CheckerCompleted(self, success, condition, command):
1154
@dbus.service.signal(_interface, signature="nxs")
1155
def CheckerCompleted(self, exitcode, waitstatus, command):
579
1230
# StopChecker - method
580
StopChecker = dbus.service.method(_interface)(stop_checker)
581
StopChecker.__name__ = "StopChecker"
1231
@dbus.service.method(_interface)
1232
def StopChecker(self):
1237
# ApprovalPending - property
1238
@dbus_service_property(_interface, signature="b", access="read")
1239
def ApprovalPending_dbus_property(self):
1240
return dbus.Boolean(bool(self.approvals_pending))
1242
# ApprovedByDefault - property
1243
@dbus_service_property(_interface, signature="b",
1245
def ApprovedByDefault_dbus_property(self, value=None):
1246
if value is None: # get
1247
return dbus.Boolean(self.approved_by_default)
1248
self.approved_by_default = bool(value)
1250
# ApprovalDelay - property
1251
@dbus_service_property(_interface, signature="t",
1253
def ApprovalDelay_dbus_property(self, value=None):
1254
if value is None: # get
1255
return dbus.UInt64(self.approval_delay_milliseconds())
1256
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1258
# ApprovalDuration - property
1259
@dbus_service_property(_interface, signature="t",
1261
def ApprovalDuration_dbus_property(self, value=None):
1262
if value is None: # get
1263
return dbus.UInt64(timedelta_to_milliseconds(
1264
self.approval_duration))
1265
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1268
@dbus_service_property(_interface, signature="s", access="read")
1269
def Name_dbus_property(self):
1270
return dbus.String(self.name)
1272
# Fingerprint - property
1273
@dbus_service_property(_interface, signature="s", access="read")
1274
def Fingerprint_dbus_property(self):
1275
return dbus.String(self.fingerprint)
1278
@dbus_service_property(_interface, signature="s",
1280
def Host_dbus_property(self, value=None):
1281
if value is None: # get
1282
return dbus.String(self.host)
1285
# Created - property
1286
@dbus_service_property(_interface, signature="s", access="read")
1287
def Created_dbus_property(self):
1288
return datetime_to_dbus(self.created)
1290
# LastEnabled - property
1291
@dbus_service_property(_interface, signature="s", access="read")
1292
def LastEnabled_dbus_property(self):
1293
return datetime_to_dbus(self.last_enabled)
1295
# Enabled - property
1296
@dbus_service_property(_interface, signature="b",
1298
def Enabled_dbus_property(self, value=None):
1299
if value is None: # get
1300
return dbus.Boolean(self.enabled)
1306
# LastCheckedOK - property
1307
@dbus_service_property(_interface, signature="s",
1309
def LastCheckedOK_dbus_property(self, value=None):
1310
if value is not None:
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)
1320
# LastApprovalRequest - property
1321
@dbus_service_property(_interface, signature="s", access="read")
1322
def LastApprovalRequest_dbus_property(self):
1323
return datetime_to_dbus(self.last_approval_request)
1325
# Timeout - property
1326
@dbus_service_property(_interface, signature="t",
1328
def Timeout_dbus_property(self, value=None):
1329
if value is None: # get
1330
return dbus.UInt64(self.timeout_milliseconds())
1331
self.timeout = datetime.timedelta(0, 0, 0, value)
1332
if getattr(self, "disable_initiator_tag", None) is None:
1334
# Reschedule timeout
1335
gobject.source_remove(self.disable_initiator_tag)
1336
self.disable_initiator_tag = None
1338
time_to_die = timedelta_to_milliseconds((self
1343
if time_to_die <= 0:
1344
# The timeout has passed
1347
self.expires = (datetime.datetime.utcnow()
1348
+ datetime.timedelta(milliseconds =
1350
self.disable_initiator_tag = (gobject.timeout_add
1351
(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
# Interval - property
1362
@dbus_service_property(_interface, signature="t",
1364
def Interval_dbus_property(self, value=None):
1365
if value is None: # get
1366
return dbus.UInt64(self.interval_milliseconds())
1367
self.interval = datetime.timedelta(0, 0, 0, value)
1368
if getattr(self, "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
1377
# Checker - property
1378
@dbus_service_property(_interface, signature="s",
1380
def Checker_dbus_property(self, value=None):
1381
if value is None: # get
1382
return dbus.String(self.checker_command)
1383
self.checker_command = value
1385
# CheckerRunning - property
1386
@dbus_service_property(_interface, signature="b",
1388
def CheckerRunning_dbus_property(self, value=None):
1389
if value is None: # get
1390
return dbus.Boolean(self.checker is not None)
1392
self.start_checker()
1396
# ObjectPath - property
1397
@dbus_service_property(_interface, signature="o", access="read")
1398
def ObjectPath_dbus_property(self):
1399
return self.dbus_object_path # is already a dbus.ObjectPath
1402
@dbus_service_property(_interface, signature="ay",
1403
access="write", byte_arrays=True)
1404
def Secret_dbus_property(self, value):
1405
self.secret = str(value)
586
def peer_certificate(session):
587
"Return the peer's OpenPGP certificate as a bytestring"
588
# If not an OpenPGP certificate...
589
if (gnutls.library.functions
590
.gnutls_certificate_type_get(session._c_object)
591
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
592
# ...do the normal thing
593
return session.peer_certificate
594
list_size = ctypes.c_uint()
595
cert_list = (gnutls.library.functions
596
.gnutls_certificate_get_peers
597
(session._c_object, ctypes.byref(list_size)))
598
if list_size.value == 0:
601
return ctypes.string_at(cert.data, cert.size)
604
def fingerprint(openpgp):
605
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
606
# New GnuTLS "datum" with the OpenPGP public key
607
datum = (gnutls.library.types
608
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
611
ctypes.c_uint(len(openpgp))))
612
# New empty GnuTLS certificate
613
crt = gnutls.library.types.gnutls_openpgp_crt_t()
614
(gnutls.library.functions
615
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
616
# Import the OpenPGP public key into the certificate
617
(gnutls.library.functions
618
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
619
gnutls.library.constants
620
.GNUTLS_OPENPGP_FMT_RAW))
621
# Verify the self signature in the key
622
crtverify = ctypes.c_uint()
623
(gnutls.library.functions
624
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
625
if crtverify.value != 0:
626
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
627
raise gnutls.errors.CertificateSecurityError("Verify failed")
628
# New buffer for the fingerprint
629
buf = ctypes.create_string_buffer(20)
630
buf_len = ctypes.c_size_t()
631
# Get the fingerprint from the certificate into the buffer
632
(gnutls.library.functions
633
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
634
ctypes.byref(buf_len)))
635
# Deinit the certificate
636
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
637
# Convert the buffer to a Python bytestring
638
fpr = ctypes.string_at(buf, buf_len.value)
639
# Convert the bytestring to hexadecimal notation
640
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
644
class TCP_handler(SocketServer.BaseRequestHandler, object):
645
"""A TCP request handler class.
646
Instantiated by IPv6_TCPServer for each request to handle it.
1410
class ProxyClient(object):
1411
def __init__(self, child_pipe, fpr, address):
1412
self._pipe = child_pipe
1413
self._pipe.send(('init', fpr, address))
1414
if not self._pipe.recv():
1417
def __getattribute__(self, name):
1419
return super(ProxyClient, self).__getattribute__(name)
1420
self._pipe.send(('getattr', name))
1421
data = self._pipe.recv()
1422
if data[0] == 'data':
1424
if data[0] == 'function':
1425
def func(*args, **kwargs):
1426
self._pipe.send(('funcall', name, args, kwargs))
1427
return self._pipe.recv()[1]
1430
def __setattr__(self, name, value):
1432
return super(ProxyClient, self).__setattr__(name, value)
1433
self._pipe.send(('setattr', name, value))
1436
class ClientDBusTransitional(ClientDBus):
1437
__metaclass__ = AlternateDBusNamesMetaclass
1440
class ClientHandler(socketserver.BaseRequestHandler, object):
1441
"""A class to handle client connections.
1443
Instantiated once for each connection to handle it.
647
1444
Note: This will run in its own forked process."""
649
1446
def handle(self):
650
logger.info(u"TCP connection from: %s",
651
unicode(self.client_address))
652
session = (gnutls.connection
653
.ClientSession(self.request,
657
line = self.request.makefile().readline()
658
logger.debug(u"Protocol version: %r", line)
660
if int(line.strip().split()[0]) > 1:
662
except (ValueError, IndexError, RuntimeError), error:
663
logger.error(u"Unknown protocol version: %s", error)
666
# Note: gnutls.connection.X509Credentials is really a generic
667
# GnuTLS certificate credentials object so long as no X.509
668
# keys are added to it. Therefore, we can use it here despite
669
# using OpenPGP certificates.
671
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
672
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
674
# Use a fallback default, since this MUST be set.
675
priority = self.server.settings.get("priority", "NORMAL")
676
(gnutls.library.functions
677
.gnutls_priority_set_direct(session._c_object,
682
except gnutls.errors.GNUTLSError, error:
683
logger.warning(u"Handshake failed: %s", error)
684
# Do not run session.bye() here: the session is not
685
# established. Just abandon the request.
688
fpr = fingerprint(peer_certificate(session))
689
except (TypeError, gnutls.errors.GNUTLSError), error:
690
logger.warning(u"Bad certificate: %s", error)
693
logger.debug(u"Fingerprint: %s", fpr)
694
for c in self.server.clients:
695
if c.fingerprint == fpr:
699
logger.warning(u"Client not found for fingerprint: %s",
703
# Have to check if client.still_valid(), since it is possible
704
# that the client timed out while establishing the GnuTLS
706
if not client.still_valid():
707
logger.warning(u"Client %(name)s is invalid",
711
## This won't work here, since we're in a fork.
712
# client.bump_timeout()
714
while sent_size < len(client.secret):
715
sent = session.send(client.secret[sent_size:])
716
logger.debug(u"Sent: %d, remaining: %d",
717
sent, len(client.secret)
718
- (sent_size + sent))
723
class IPv6_TCPServer(SocketServer.ForkingMixIn,
724
SocketServer.TCPServer, object):
725
"""IPv6 TCP server. Accepts 'None' as address and/or port.
1447
with contextlib.closing(self.server.child_pipe) as child_pipe:
1448
logger.info("TCP connection from: %s",
1449
unicode(self.client_address))
1450
logger.debug("Pipe FD: %d",
1451
self.server.child_pipe.fileno())
1453
session = (gnutls.connection
1454
.ClientSession(self.request,
1456
.X509Credentials()))
1458
# Note: gnutls.connection.X509Credentials is really a
1459
# generic GnuTLS certificate credentials object so long as
1460
# no X.509 keys are added to it. Therefore, we can use it
1461
# here despite using OpenPGP certificates.
1463
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1464
# "+AES-256-CBC", "+SHA1",
1465
# "+COMP-NULL", "+CTYPE-OPENPGP",
1467
# Use a fallback default, since this MUST be set.
1468
priority = self.server.gnutls_priority
1469
if priority is None:
1471
(gnutls.library.functions
1472
.gnutls_priority_set_direct(session._c_object,
1475
# Start communication using the Mandos protocol
1476
# Get protocol number
1477
line = self.request.makefile().readline()
1478
logger.debug("Protocol version: %r", line)
1480
if int(line.strip().split()[0]) > 1:
1482
except (ValueError, IndexError, RuntimeError) as error:
1483
logger.error("Unknown protocol version: %s", error)
1486
# Start GnuTLS connection
1489
except gnutls.errors.GNUTLSError as error:
1490
logger.warning("Handshake failed: %s", error)
1491
# Do not run session.bye() here: the session is not
1492
# established. Just abandon the request.
1494
logger.debug("Handshake succeeded")
1496
approval_required = False
1499
fpr = self.fingerprint(self.peer_certificate
1502
gnutls.errors.GNUTLSError) as error:
1503
logger.warning("Bad certificate: %s", error)
1505
logger.debug("Fingerprint: %s", fpr)
1508
client = ProxyClient(child_pipe, fpr,
1509
self.client_address)
1513
if self.server.use_dbus:
1515
client.NewRequest(str(self.client_address))
1517
if client.approval_delay:
1518
delay = client.approval_delay
1519
client.approvals_pending += 1
1520
approval_required = True
1523
if not client.enabled:
1524
logger.info("Client %s is disabled",
1526
if self.server.use_dbus:
1528
client.Rejected("Disabled")
1531
if client.approved or not client.approval_delay:
1532
#We are approved or approval is disabled
1534
elif client.approved is None:
1535
logger.info("Client %s needs approval",
1537
if self.server.use_dbus:
1539
client.NeedApproval(
1540
client.approval_delay_milliseconds(),
1541
client.approved_by_default)
1543
logger.warning("Client %s was not approved",
1545
if self.server.use_dbus:
1547
client.Rejected("Denied")
1550
#wait until timeout or approved
1551
time = datetime.datetime.now()
1552
client.changedstate.acquire()
1553
(client.changedstate.wait
1554
(float(client.timedelta_to_milliseconds(delay)
1556
client.changedstate.release()
1557
time2 = datetime.datetime.now()
1558
if (time2 - time) >= delay:
1559
if not client.approved_by_default:
1560
logger.warning("Client %s timed out while"
1561
" waiting for approval",
1563
if self.server.use_dbus:
1565
client.Rejected("Approval timed out")
1570
delay -= time2 - time
1573
while sent_size < len(client.secret):
1575
sent = session.send(client.secret[sent_size:])
1576
except gnutls.errors.GNUTLSError as error:
1577
logger.warning("gnutls send failed")
1579
logger.debug("Sent: %d, remaining: %d",
1580
sent, len(client.secret)
1581
- (sent_size + sent))
1584
logger.info("Sending secret to %s", client.name)
1585
# bump the timeout using extended_timeout
1586
client.checked_ok(client.extended_timeout)
1587
if self.server.use_dbus:
1592
if approval_required:
1593
client.approvals_pending -= 1
1596
except gnutls.errors.GNUTLSError as error:
1597
logger.warning("GnuTLS bye failed")
1600
def peer_certificate(session):
1601
"Return the peer's OpenPGP certificate as a bytestring"
1602
# If not an OpenPGP certificate...
1603
if (gnutls.library.functions
1604
.gnutls_certificate_type_get(session._c_object)
1605
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1606
# ...do the normal thing
1607
return session.peer_certificate
1608
list_size = ctypes.c_uint(1)
1609
cert_list = (gnutls.library.functions
1610
.gnutls_certificate_get_peers
1611
(session._c_object, ctypes.byref(list_size)))
1612
if not bool(cert_list) and list_size.value != 0:
1613
raise gnutls.errors.GNUTLSError("error getting peer"
1615
if list_size.value == 0:
1618
return ctypes.string_at(cert.data, cert.size)
1621
def fingerprint(openpgp):
1622
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1623
# New GnuTLS "datum" with the OpenPGP public key
1624
datum = (gnutls.library.types
1625
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1628
ctypes.c_uint(len(openpgp))))
1629
# New empty GnuTLS certificate
1630
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1631
(gnutls.library.functions
1632
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1633
# Import the OpenPGP public key into the certificate
1634
(gnutls.library.functions
1635
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1636
gnutls.library.constants
1637
.GNUTLS_OPENPGP_FMT_RAW))
1638
# Verify the self signature in the key
1639
crtverify = ctypes.c_uint()
1640
(gnutls.library.functions
1641
.gnutls_openpgp_crt_verify_self(crt, 0,
1642
ctypes.byref(crtverify)))
1643
if crtverify.value != 0:
1644
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1645
raise (gnutls.errors.CertificateSecurityError
1647
# New buffer for the fingerprint
1648
buf = ctypes.create_string_buffer(20)
1649
buf_len = ctypes.c_size_t()
1650
# Get the fingerprint from the certificate into the buffer
1651
(gnutls.library.functions
1652
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1653
ctypes.byref(buf_len)))
1654
# Deinit the certificate
1655
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1656
# Convert the buffer to a Python bytestring
1657
fpr = ctypes.string_at(buf, buf_len.value)
1658
# Convert the bytestring to hexadecimal notation
1659
hex_fpr = binascii.hexlify(fpr).upper()
1663
class MultiprocessingMixIn(object):
1664
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1665
def sub_process_main(self, request, address):
1667
self.finish_request(request, address)
1669
self.handle_error(request, address)
1670
self.close_request(request)
1672
def process_request(self, request, address):
1673
"""Start a new process to process the request."""
1674
proc = multiprocessing.Process(target = self.sub_process_main,
1681
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1682
""" adds a pipe to the MixIn """
1683
def process_request(self, request, client_address):
1684
"""Overrides and wraps the original process_request().
1686
This function creates a new pipe in self.pipe
1688
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1690
proc = MultiprocessingMixIn.process_request(self, request,
1692
self.child_pipe.close()
1693
self.add_pipe(parent_pipe, proc)
1695
def add_pipe(self, parent_pipe, proc):
1696
"""Dummy function; override as necessary"""
1697
raise NotImplementedError
1700
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1701
socketserver.TCPServer, object):
1702
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
727
settings: Server settings
728
clients: Set() of Client objects
729
1705
enabled: Boolean; whether this server is activated yet
1706
interface: None or a network interface name (string)
1707
use_ipv6: Boolean; to use IPv6 or not
731
address_family = socket.AF_INET6
732
def __init__(self, *args, **kwargs):
733
if "settings" in kwargs:
734
self.settings = kwargs["settings"]
735
del kwargs["settings"]
736
if "clients" in kwargs:
737
self.clients = kwargs["clients"]
738
del kwargs["clients"]
740
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1709
def __init__(self, server_address, RequestHandlerClass,
1710
interface=None, use_ipv6=True):
1711
self.interface = interface
1713
self.address_family = socket.AF_INET6
1714
socketserver.TCPServer.__init__(self, server_address,
1715
RequestHandlerClass)
741
1716
def server_bind(self):
742
1717
"""This overrides the normal server_bind() function
743
1718
to bind to an interface if one was specified, and also NOT to
744
1719
bind to an address or port if they were not specified."""
745
if self.settings["interface"]:
746
# 25 is from /usr/include/asm-i486/socket.h
747
SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
749
self.socket.setsockopt(socket.SOL_SOCKET,
751
self.settings["interface"])
752
except socket.error, error:
753
if error[0] == errno.EPERM:
754
logger.error(u"No permission to"
755
u" bind to interface %s",
756
self.settings["interface"])
1720
if self.interface is not None:
1721
if SO_BINDTODEVICE is None:
1722
logger.error("SO_BINDTODEVICE does not exist;"
1723
" cannot bind to interface %s",
1727
self.socket.setsockopt(socket.SOL_SOCKET,
1731
except socket.error as error:
1732
if error[0] == errno.EPERM:
1733
logger.error("No permission to"
1734
" bind to interface %s",
1736
elif error[0] == errno.ENOPROTOOPT:
1737
logger.error("SO_BINDTODEVICE not available;"
1738
" cannot bind to interface %s",
759
1742
# Only bind(2) the socket if we really need to.
760
1743
if self.server_address[0] or self.server_address[1]:
761
1744
if not self.server_address[0]:
763
self.server_address = (in6addr_any,
1745
if self.address_family == socket.AF_INET6:
1746
any_address = "::" # in6addr_any
1748
any_address = socket.INADDR_ANY
1749
self.server_address = (any_address,
764
1750
self.server_address[1])
765
1751
elif not self.server_address[1]:
766
1752
self.server_address = (self.server_address[0],
768
# if self.settings["interface"]:
1754
# if self.interface:
769
1755
# self.server_address = (self.server_address[0],
772
1758
# if_nametoindex
775
return super(IPv6_TCPServer, self).server_bind()
1760
return socketserver.TCPServer.server_bind(self)
1763
class MandosServer(IPv6_TCPServer):
1767
clients: set of Client objects
1768
gnutls_priority GnuTLS priority string
1769
use_dbus: Boolean; to emit D-Bus signals or not
1771
Assumes a gobject.MainLoop event loop.
1773
def __init__(self, server_address, RequestHandlerClass,
1774
interface=None, use_ipv6=True, clients=None,
1775
gnutls_priority=None, use_dbus=True):
1776
self.enabled = False
1777
self.clients = clients
1778
if self.clients is None:
1780
self.use_dbus = use_dbus
1781
self.gnutls_priority = gnutls_priority
1782
IPv6_TCPServer.__init__(self, server_address,
1783
RequestHandlerClass,
1784
interface = interface,
1785
use_ipv6 = use_ipv6)
776
1786
def server_activate(self):
777
1787
if self.enabled:
778
return super(IPv6_TCPServer, self).server_activate()
1788
return socketserver.TCPServer.server_activate(self)
779
1790
def enable(self):
780
1791
self.enabled = True
1793
def add_pipe(self, parent_pipe, proc):
1794
# Call "handle_ipc" for both data and EOF events
1795
gobject.io_add_watch(parent_pipe.fileno(),
1796
gobject.IO_IN | gobject.IO_HUP,
1797
functools.partial(self.handle_ipc,
1802
def handle_ipc(self, source, condition, parent_pipe=None,
1803
proc = None, client_object=None):
1805
gobject.IO_IN: "IN", # There is data to read.
1806
gobject.IO_OUT: "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
1811
# broken, usually for pipes and
1814
conditions_string = ' | '.join(name
1816
condition_names.iteritems()
1817
if cond & condition)
1818
# error, or the other end of multiprocessing.Pipe has closed
1819
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1820
# Wait for other process to exit
1824
# Read a request from the child
1825
request = parent_pipe.recv()
1826
command = request[0]
1828
if command == 'init':
1830
address = request[2]
1832
for c in self.clients.itervalues():
1833
if c.fingerprint == fpr:
1837
logger.info("Client not found for fingerprint: %s, ad"
1838
"dress: %s", fpr, address)
1841
mandos_dbus_service.ClientNotFound(fpr,
1843
parent_pipe.send(False)
1846
gobject.io_add_watch(parent_pipe.fileno(),
1847
gobject.IO_IN | gobject.IO_HUP,
1848
functools.partial(self.handle_ipc,
1854
parent_pipe.send(True)
1855
# remove the old hook in favor of the new above hook on
1858
if command == 'funcall':
1859
funcname = request[1]
1863
parent_pipe.send(('data', getattr(client_object,
1867
if command == 'getattr':
1868
attrname = request[1]
1869
if callable(client_object.__getattribute__(attrname)):
1870
parent_pipe.send(('function',))
1872
parent_pipe.send(('data', client_object
1873
.__getattribute__(attrname)))
1875
if command == 'setattr':
1876
attrname = request[1]
1878
setattr(client_object, attrname, value)
783
1883
def string_to_delta(interval):
784
1884
"""Parse a string and return a datetime.timedelta
786
1886
>>> string_to_delta('7d')
787
1887
datetime.timedelta(7)
788
1888
>>> string_to_delta('60s')
929
2001
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
930
2002
"servicename": "Mandos",
931
2003
"use_dbus": "True",
2007
"statedir": "/var/lib/mandos"
934
2010
# Parse config file for server-global settings
935
server_config = ConfigParser.SafeConfigParser(server_defaults)
2011
server_config = configparser.SafeConfigParser(server_defaults)
936
2012
del server_defaults
937
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2013
server_config.read(os.path.join(options.configdir,
938
2015
# Convert the SafeConfigParser object to a dict
939
2016
server_settings = server_config.defaults()
940
# Use getboolean on the boolean config options
941
server_settings["debug"] = (server_config.getboolean
942
("DEFAULT", "debug"))
943
server_settings["use_dbus"] = (server_config.getboolean
944
("DEFAULT", "use_dbus"))
2017
# 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",
2021
if server_settings["port"]:
2022
server_settings["port"] = server_config.getint("DEFAULT",
945
2024
del server_config
947
2026
# Override the settings from the config file with command line
948
2027
# options, if set.
949
2028
for option in ("interface", "address", "port", "debug",
950
2029
"priority", "servicename", "configdir",
2030
"use_dbus", "use_ipv6", "debuglevel", "restore",
952
2032
value = getattr(options, option)
953
2033
if value is not None:
954
2034
server_settings[option] = value
2036
# Force all strings to be unicode
2037
for option in server_settings.keys():
2038
if type(server_settings[option]) is str:
2039
server_settings[option] = unicode(server_settings[option])
956
2040
# Now we have our good server settings in "server_settings"
2042
##################################################################
958
2044
# For convenience
959
2045
debug = server_settings["debug"]
2046
debuglevel = server_settings["debuglevel"]
960
2047
use_dbus = server_settings["use_dbus"]
2048
use_ipv6 = server_settings["use_ipv6"]
2049
stored_state_path = os.path.join(server_settings["statedir"],
963
syslogger.setLevel(logging.WARNING)
964
console.setLevel(logging.WARNING)
2053
initlogger(logging.DEBUG)
2058
level = getattr(logging, debuglevel.upper())
966
2061
if server_settings["servicename"] != "Mandos":
967
2062
syslogger.setFormatter(logging.Formatter
968
('Mandos (%s): %%(levelname)s:'
2063
('Mandos (%s) [%%(process)d]:'
2064
' %%(levelname)s: %%(message)s'
970
2065
% server_settings["servicename"]))
972
2067
# Parse config file with clients
973
client_defaults = { "timeout": "1h",
975
"checker": "fping -q -- %(host)s",
2068
client_defaults = { "timeout": "5m",
2069
"extended_timeout": "15m",
2071
"checker": "fping -q -- %%(host)s",
2073
"approval_delay": "0s",
2074
"approval_duration": "1s",
978
client_config = ConfigParser.SafeConfigParser(client_defaults)
2076
client_config = configparser.SafeConfigParser(client_defaults)
979
2077
client_config.read(os.path.join(server_settings["configdir"],
980
2078
"clients.conf"))
983
tcp_server = IPv6_TCPServer((server_settings["address"],
984
server_settings["port"]),
986
settings=server_settings,
988
pidfilename = "/var/run/mandos.pid"
990
pidfile = open(pidfilename, "w")
991
except IOError, error:
992
logger.error("Could not open file %r", pidfilename)
2080
global mandos_dbus_service
2081
mandos_dbus_service = None
2083
tcp_server = MandosServer((server_settings["address"],
2084
server_settings["port"]),
2086
interface=(server_settings["interface"]
2090
server_settings["priority"],
2093
pidfilename = "/var/run/mandos.pid"
2095
pidfile = open(pidfilename, "w")
2097
logger.error("Could not open file %r", pidfilename)
995
2100
uid = pwd.getpwnam("_mandos").pw_uid
2101
gid = pwd.getpwnam("_mandos").pw_gid
996
2102
except KeyError:
998
2104
uid = pwd.getpwnam("mandos").pw_uid
2105
gid = pwd.getpwnam("mandos").pw_gid
999
2106
except KeyError:
1001
2108
uid = pwd.getpwnam("nobody").pw_uid
2109
gid = pwd.getpwnam("nobody").pw_gid
1002
2110
except KeyError:
1005
gid = pwd.getpwnam("_mandos").pw_gid
1008
gid = pwd.getpwnam("mandos").pw_gid
1011
gid = pwd.getpwnam("nogroup").pw_gid
1017
except OSError, error:
2116
except OSError as error:
1018
2117
if error[0] != errno.EPERM:
1022
service = AvahiService(name = server_settings["servicename"],
1023
servicetype = "_mandos._tcp", )
1024
if server_settings["interface"]:
1025
service.interface = (if_nametoindex
1026
(server_settings["interface"]))
2121
# Enable all possible GnuTLS debugging
2123
# "Use a log level over 10 to enable all debugging options."
2125
gnutls.library.functions.gnutls_global_set_log_level(11)
2127
@gnutls.library.types.gnutls_log_func
2128
def debug_gnutls(level, string):
2129
logger.debug("GnuTLS: %s", string[:-1])
2131
(gnutls.library.functions
2132
.gnutls_global_set_log_function(debug_gnutls))
2134
# Redirect stdin so all checkers get /dev/null
2135
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2136
os.dup2(null, sys.stdin.fileno())
2140
# No console logging
2141
logger.removeHandler(console)
2143
# Need to fork before connecting to D-Bus
2145
# Close all input and output, do double fork, etc.
1028
2148
global main_loop
1031
2149
# From the Avahi example code
1032
2150
DBusGMainLoop(set_as_default=True )
1033
2151
main_loop = gobject.MainLoop()
1034
2152
bus = dbus.SystemBus()
1035
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1036
avahi.DBUS_PATH_SERVER),
1037
avahi.DBUS_INTERFACE_SERVER)
1038
2153
# End of Avahi example code
1040
bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
1043
clients.update(Set(Client(name = section,
1045
= dict(client_config.items(section)),
1046
use_dbus = use_dbus)
1047
for section in client_config.sections()))
1049
logger.warning(u"No clients defined")
1052
# Redirect stdin so all checkers get /dev/null
1053
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1054
os.dup2(null, sys.stdin.fileno())
1058
# No console logging
1059
logger.removeHandler(console)
1060
# Close all input and output, do double fork, etc.
1065
pidfile.write(str(pid) + "\n")
1069
logger.error(u"Could not write to file %r with PID %d",
1072
# "pidfile" was never created
1077
"Cleanup function; run on exit"
1079
# From the Avahi example code
1080
if not group is None:
1083
# End of Avahi example code
2156
bus_name = dbus.service.BusName("se.recompile.Mandos",
2157
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")
2164
server_settings["use_dbus"] = False
2165
tcp_server.use_dbus = False
2166
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)
2171
if server_settings["interface"]:
2172
service.interface = (if_nametoindex
2173
(str(server_settings["interface"])))
2175
global multiprocessing_manager
2176
multiprocessing_manager = multiprocessing.Manager()
2178
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
setattr(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"] and client["last_checked_ok"]:
2248
if ((datetime.datetime.utcnow()
2249
- client["last_checked_ok"])
2250
> client["interval"]):
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],
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
2309
if not tcp_server.clients:
2310
logger.warning("No clients defined")
1086
client = clients.pop()
1087
client.disable_hook = None
1090
atexit.register(cleanup)
2316
pidfile.write(str(pid) + "\n".encode("utf-8"))
2319
logger.error("Could not write to file %r with PID %d",
2322
# "pidfile" was never created
1093
2326
signal.signal(signal.SIGINT, signal.SIG_IGN)
1094
2328
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1095
2329
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1098
class MandosServer(dbus.service.Object):
2332
class MandosDBusService(dbus.service.Object):
1099
2333
"""A D-Bus proxy object"""
1100
2334
def __init__(self):
1101
dbus.service.Object.__init__(self, bus,
1103
_interface = u"org.mandos_system.Mandos"
1105
@dbus.service.signal(_interface, signature="oa{sv}")
1106
def ClientAdded(self, objpath, properties):
2335
dbus.service.Object.__init__(self, bus, "/")
2336
_interface = "se.recompile.Mandos"
1110
2338
@dbus.service.signal(_interface, signature="o")
1111
def ClientRemoved(self, objpath):
2339
def ClientAdded(self, objpath):
2343
@dbus.service.signal(_interface, signature="ss")
2344
def ClientNotFound(self, fingerprint, address):
2348
@dbus.service.signal(_interface, signature="os")
2349
def ClientRemoved(self, objpath, name):
1115
2353
@dbus.service.method(_interface, out_signature="ao")
1116
2354
def GetAllClients(self):
1117
return dbus.Array(c.dbus_object_path for c in clients)
1119
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
2356
return dbus.Array(c.dbus_object_path
2358
tcp_server.clients.itervalues())
2360
@dbus.service.method(_interface,
2361
out_signature="a{oa{sv}}")
1120
2362
def GetAllClientsWithProperties(self):
1121
2364
return dbus.Dictionary(
1122
((c.dbus_object_path, c.GetAllProperties())
2365
((c.dbus_object_path, c.GetAll(""))
2366
for c in tcp_server.clients.itervalues()),
1124
2367
signature="oa{sv}")
1126
2369
@dbus.service.method(_interface, in_signature="o")
1127
2370
def RemoveClient(self, object_path):
2372
for c in tcp_server.clients.itervalues():
1129
2373
if c.dbus_object_path == object_path:
2374
del tcp_server.clients[c.name]
2375
c.remove_from_connection()
1131
2376
# Don't signal anything except ClientRemoved
2377
c.disable(quiet=True)
1134
2378
# Emit D-Bus signal
1135
self.ClientRemoved(object_path)
2379
self.ClientRemoved(object_path, c.name)
1138
@dbus.service.method(_interface)
2381
raise KeyError(object_path)
1144
mandos_server = MandosServer()
1146
for client in clients:
2385
class MandosDBusServiceTransitional(MandosDBusService):
2386
__metaclass__ = AlternateDBusNamesMetaclass
2387
mandos_dbus_service = MandosDBusServiceTransitional()
2390
"Cleanup function; run on exit"
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
while tcp_server.clients:
2437
name, client = tcp_server.clients.popitem()
2439
client.remove_from_connection()
2440
# Don't signal anything except ClientRemoved
2441
client.disable(quiet=True)
2444
mandos_dbus_service.ClientRemoved(client
2447
client_settings.clear()
2449
atexit.register(cleanup)
2451
for client in tcp_server.clients.itervalues():
1148
2453
# Emit D-Bus signal
1149
mandos_server.ClientAdded(client.dbus_object_path,
1150
client.GetAllProperties())
2454
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2455
# Need to initiate checking of clients
2457
client.init_checker()
1153
2459
tcp_server.enable()
1154
2460
tcp_server.server_activate()
1156
2462
# Find out what port we got
1157
2463
service.port = tcp_server.socket.getsockname()[1]
1158
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1159
u" scope_id %d" % tcp_server.socket.getsockname())
2465
logger.info("Now listening on address %r, port %d,"
2466
" flowinfo %d, scope_id %d"
2467
% tcp_server.socket.getsockname())
2469
logger.info("Now listening on address %r, port %d"
2470
% tcp_server.socket.getsockname())
1161
2472
#service.interface = tcp_server.socket.getsockname()[3]
1164
2475
# From the Avahi example code
1165
server.connect_to_signal("StateChanged", server_state_changed)
1167
server_state_changed(server.GetState())
1168
except dbus.exceptions.DBusException, error:
1169
logger.critical(u"DBusException: %s", error)
2478
except dbus.exceptions.DBusException as error:
2479
logger.critical("DBusException: %s", error)
1171
2482
# End of Avahi example code