80
101
except ImportError:
81
102
SO_BINDTODEVICE = None
86
logger = logging.Logger(u'mandos')
87
syslogger = (logging.handlers.SysLogHandler
88
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
address = "/dev/log"))
90
syslogger.setFormatter(logging.Formatter
91
(u'Mandos [%(process)d]: %(levelname)s:'
93
logger.addHandler(syslogger)
95
console = logging.StreamHandler()
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
99
logger.addHandler(console)
101
multiprocessing_manager = multiprocessing.Manager()
104
if sys.version_info.major == 2:
108
stored_state_file = "clients.pickle"
110
logger = logging.getLogger()
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
116
except (OSError, AttributeError):
118
def if_nametoindex(interface):
119
"Get an interface index the hard way, i.e. using fcntl()"
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
with contextlib.closing(socket.socket()) as s:
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
125
return interface_index
128
def initlogger(debug, level=logging.WARNING):
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
syslogger.setFormatter(logging.Formatter
136
('Mandos [%(process)d]: %(levelname)s:'
138
logger.addHandler(syslogger)
141
console = logging.StreamHandler()
142
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
146
logger.addHandler(console)
147
logger.setLevel(level)
150
class PGPError(Exception):
151
"""Exception if encryption/decryption fails"""
155
class PGPEngine(object):
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
169
def __exit__(self, exc_type, exc_value, traceback):
177
if self.tempdir is not None:
178
# Delete contents of tempdir
179
for root, dirs, files in os.walk(self.tempdir,
181
for filename in files:
182
os.remove(os.path.join(root, filename))
184
os.rmdir(os.path.join(root, dirname))
186
os.rmdir(self.tempdir)
189
def password_encode(self, password):
190
# Passphrase can not be empty and can not contain newlines or
191
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
200
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
218
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
234
return decrypted_plaintext
103
237
class AvahiError(Exception):
104
238
def __init__(self, value, *args, **kwargs):
105
239
self.value = value
106
super(AvahiError, self).__init__(value, *args, **kwargs)
107
def __unicode__(self):
108
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
110
244
class AvahiServiceError(AvahiError):
113
248
class AvahiGroupError(AvahiError):
193
352
dbus.UInt16(self.port),
194
353
avahi.string_array_to_txt_array(self.TXT))
195
354
self.group.Commit()
196
356
def entry_group_state_changed(self, state, error):
197
357
"""Derived from the Avahi example code"""
198
logger.debug(u"Avahi state change: %i", state)
358
logger.debug("Avahi entry group state change: %i", state)
200
360
if state == avahi.ENTRY_GROUP_ESTABLISHED:
201
logger.debug(u"Zeroconf service established.")
361
logger.debug("Zeroconf service established.")
202
362
elif state == avahi.ENTRY_GROUP_COLLISION:
203
logger.warning(u"Zeroconf service name collision.")
363
logger.info("Zeroconf service name collision.")
205
365
elif state == avahi.ENTRY_GROUP_FAILURE:
206
logger.critical(u"Avahi: Error in group state changed %s",
208
raise AvahiGroupError(u"State changed: %s"
366
logger.critical("Avahi: Error in group state changed %s",
368
raise AvahiGroupError("State changed: {!s}".format(error))
210
370
def cleanup(self):
211
371
"""Derived from the Avahi example code"""
212
372
if self.group is not None:
375
except (dbus.exceptions.UnknownMethodException,
376
dbus.exceptions.DBusException):
214
378
self.group = None
215
def server_state_changed(self, state):
381
def server_state_changed(self, state, error=None):
216
382
"""Derived from the Avahi example code"""
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
383
logger.debug("Avahi server state change: %i", state)
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
390
if state in bad_states:
391
if bad_states[state] is not None:
393
logger.error(bad_states[state])
395
logger.error(bad_states[state] + ": %r", error)
220
397
elif state == avahi.SERVER_RUNNING:
400
except dbus.exceptions.DBusException as error:
401
if (error.get_dbus_name()
402
== "org.freedesktop.Avahi.CollisionError"):
403
logger.info("Local Zeroconf service name"
405
return self.rename(remove=False)
407
logger.critical("D-Bus Exception", exc_info=error)
412
logger.debug("Unknown state: %r", state)
414
logger.debug("Unknown state: %r: %r", state, error)
222
416
def activate(self):
223
417
"""Derived from the Avahi example code"""
224
418
if self.server is None:
225
419
self.server = dbus.Interface(
226
420
self.bus.get_object(avahi.DBUS_NAME,
227
avahi.DBUS_PATH_SERVER),
421
avahi.DBUS_PATH_SERVER,
422
follow_name_owner_changes=True),
228
423
avahi.DBUS_INTERFACE_SERVER)
229
self.server.connect_to_signal(u"StateChanged",
230
self.server_state_changed)
424
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
231
426
self.server_state_changed(self.server.GetState())
429
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
431
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
445
connection.send(func(*args, **kwargs))
234
448
class Client(object):
235
449
"""A representation of a client host served by this server.
238
name: string; from the config file, used in log messages and
452
approved: bool(); 'None' if not yet approved/disapproved
453
approval_delay: datetime.timedelta(); Time to wait for approval
454
approval_duration: datetime.timedelta(); Duration of one approval
455
checker: subprocess.Popen(); a running checker process used
456
to see if the client lives.
457
'None' if no process is running.
458
checker_callback_tag: a gobject event source tag, or None
459
checker_command: string; External command which is run to check
460
if client lives. %() expansions are done at
461
runtime with vars(self) as dict, so that for
462
instance %(name)s can be used in the command.
463
checker_initiator_tag: a gobject event source tag, or None
464
created: datetime.datetime(); (UTC) object creation
465
client_structure: Object describing what attributes a client has
466
and is used for storing the client at exit
467
current_checker_command: string; current running checker_command
468
disable_initiator_tag: a gobject event source tag, or None
240
470
fingerprint: string (40 or 32 hexadecimal digits); used to
241
471
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
472
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
245
last_enabled: datetime.datetime(); (UTC)
473
interval: datetime.timedelta(); How often to start a new checker
474
last_approval_request: datetime.datetime(); (UTC) or None
247
475
last_checked_ok: datetime.datetime(); (UTC) or None
476
last_checker_status: integer between 0 and 255 reflecting exit
477
status of last checker. -1 reflects crashed
478
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
481
last_enabled: datetime.datetime(); (UTC) or None
482
name: string; from the config file, used in log messages and
484
secret: bytestring; sent verbatim (over TLS) to client
248
485
timeout: datetime.timedelta(); How long from last_checked_ok
249
486
until this client is disabled
250
interval: datetime.timedelta(); How often to start a new checker
251
disable_hook: If set, called by disable() as disable_hook(self)
252
checker: subprocess.Popen(); a running checker process used
253
to see if the client lives.
254
'None' if no process is running.
255
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
257
checker_callback_tag: - '' -
258
checker_command: string; External command which is run to check if
259
client lives. %() expansions are done at
260
runtime with vars(self) as dict, so that for
261
instance %(name)s can be used in the command.
262
current_checker_command: string; current running checker_command
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
487
extended_timeout: extra long timeout when secret has been sent
488
runtime_expansions: Allowed attributes for runtime expansion.
489
expires: datetime.datetime(); time (UTC) when a client will be
491
server_settings: The server_settings dict from main()
494
runtime_expansions = ("approval_delay", "approval_duration",
495
"created", "enabled", "expires",
496
"fingerprint", "host", "interval",
497
"last_approval_request", "last_checked_ok",
498
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
275
def timeout_milliseconds(self):
276
"Return the 'timeout' attribute in milliseconds"
277
return self._timedelta_to_milliseconds(self.timeout)
279
def interval_milliseconds(self):
280
"Return the 'interval' attribute in milliseconds"
281
return self._timedelta_to_milliseconds(self.interval)
283
def approved_delay_milliseconds(self):
284
return self._timedelta_to_milliseconds(self.approved_delay)
286
def __init__(self, name = None, disable_hook=None, config=None):
287
"""Note: the 'checker' key in 'config' sets the
288
'checker_command' attribute and *not* the 'checker'
512
def config_parser(config):
513
"""Construct a new dict of client settings of this form:
514
{ client_name: {setting_name: value, ...}, ...}
515
with exceptions for any special settings as defined above.
516
NOTE: Must be a pure function. Must return the same result
517
value given the same arguments.
520
for client_name in config.sections():
521
section = dict(config.items(client_name))
522
client = settings[client_name] = {}
524
client["host"] = section["host"]
525
# Reformat values from string types to Python types
526
client["approved_by_default"] = config.getboolean(
527
client_name, "approved_by_default")
528
client["enabled"] = config.getboolean(client_name,
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
534
client["fingerprint"] = (section["fingerprint"].upper()
536
if "secret" in section:
537
client["secret"] = section["secret"].decode("base64")
538
elif "secfile" in section:
539
with open(os.path.expanduser(os.path.expandvars
540
(section["secfile"])),
542
client["secret"] = secfile.read()
544
raise TypeError("No secret or secfile for section {}"
546
client["timeout"] = string_to_delta(section["timeout"])
547
client["extended_timeout"] = string_to_delta(
548
section["extended_timeout"])
549
client["interval"] = string_to_delta(section["interval"])
550
client["approval_delay"] = string_to_delta(
551
section["approval_delay"])
552
client["approval_duration"] = string_to_delta(
553
section["approval_duration"])
554
client["checker_command"] = section["checker"]
555
client["last_approval_request"] = None
556
client["last_checked_ok"] = None
557
client["last_checker_status"] = -2
561
def __init__(self, settings, name = None, server_settings=None):
293
logger.debug(u"Creating client %r", self.name)
294
# Uppercase and remove spaces from fingerprint for later
295
# comparison purposes with return value from the fingerprint()
297
self.fingerprint = (config[u"fingerprint"].upper()
299
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
303
with open(os.path.expanduser(os.path.expandvars
304
(config[u"secfile"])),
306
self.secret = secfile.read()
563
if server_settings is None:
565
self.server_settings = server_settings
566
# adding all client settings
567
for setting, value in settings.items():
568
setattr(self, setting, value)
571
if not hasattr(self, "last_enabled"):
572
self.last_enabled = datetime.datetime.utcnow()
573
if not hasattr(self, "expires"):
574
self.expires = (datetime.datetime.utcnow()
308
#XXX Need to allow secret on demand!
309
raise TypeError(u"No secret or secfile for client %s"
311
self.host = config.get(u"host", u"")
312
self.created = datetime.datetime.utcnow()
314
self.last_enabled = None
315
self.last_checked_ok = None
316
self.timeout = string_to_delta(config[u"timeout"])
317
self.interval = string_to_delta(config[u"interval"])
318
self.disable_hook = disable_hook
577
self.last_enabled = None
580
logger.debug("Creating client %r", self.name)
581
logger.debug(" Fingerprint: %s", self.fingerprint)
582
self.created = settings.get("created",
583
datetime.datetime.utcnow())
585
# attributes specific for this server instance
319
586
self.checker = None
320
587
self.checker_initiator_tag = None
321
588
self.disable_initiator_tag = None
322
589
self.checker_callback_tag = None
323
self.checker_command = config[u"checker"]
324
590
self.current_checker_command = None
325
self.last_connect = None
326
592
self.approvals_pending = 0
327
self._approved = None
328
self.approved_by_default = config.get(u"approved_by_default",
330
self.approved_delay = string_to_delta(
331
config[u"approved_delay"])
332
self.approved_duration = string_to_delta(
333
config[u"approved_duration"])
334
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
597
if not attr.startswith("_")]
598
self.client_structure.append("client_structure")
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
602
if not name.startswith("_"):
603
self.client_structure.append(name)
605
# Send notice to process children that client state has changed
336
606
def send_changedstate(self):
337
self.changedstate.acquire()
338
self.changedstate.notify_all()
339
self.changedstate.release()
607
with self.changedstate:
608
self.changedstate.notify_all()
341
610
def enable(self):
342
611
"""Start this client's checker and timeout hooks"""
343
if getattr(self, u"enabled", False):
612
if getattr(self, "enabled", False):
344
613
# Already enabled
346
self.send_changedstate()
615
self.expires = datetime.datetime.utcnow() + self.timeout
347
617
self.last_enabled = datetime.datetime.utcnow()
348
# Schedule a new checker to be started an 'interval' from now,
349
# and every interval from then on.
350
self.checker_initiator_tag = (gobject.timeout_add
351
(self.interval_milliseconds(),
353
# Schedule a disable() when 'timeout' has passed
354
self.disable_initiator_tag = (gobject.timeout_add
355
(self.timeout_milliseconds(),
358
# Also start a new checker *right now*.
619
self.send_changedstate()
361
621
def disable(self, quiet=True):
362
622
"""Disable this client."""
363
623
if not getattr(self, "enabled", False):
626
logger.info("Disabling client %s", self.name)
627
if getattr(self, "disable_initiator_tag", None) is not None:
628
gobject.source_remove(self.disable_initiator_tag)
629
self.disable_initiator_tag = None
631
if getattr(self, "checker_initiator_tag", None) is not None:
632
gobject.source_remove(self.checker_initiator_tag)
633
self.checker_initiator_tag = None
366
637
self.send_changedstate()
368
logger.info(u"Disabling client %s", self.name)
369
if getattr(self, u"disable_initiator_tag", False):
370
gobject.source_remove(self.disable_initiator_tag)
371
self.disable_initiator_tag = None
372
if getattr(self, u"checker_initiator_tag", False):
373
gobject.source_remove(self.checker_initiator_tag)
374
self.checker_initiator_tag = None
376
if self.disable_hook:
377
self.disable_hook(self)
379
638
# Do not run this again if called by a gobject.timeout_add
382
641
def __del__(self):
383
self.disable_hook = None
386
def checker_callback(self, pid, condition, command):
644
def init_checker(self):
645
# Schedule a new checker to be started an 'interval' from now,
646
# and every interval from then on.
647
if self.checker_initiator_tag is not None:
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
652
# Schedule a disable() when 'timeout' has passed
653
if self.disable_initiator_tag is not None:
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
657
# Also start a new checker *right now*.
660
def checker_callback(self, source, condition, connection,
387
662
"""The checker has completed, so take appropriate actions."""
388
663
self.checker_callback_tag = None
389
664
self.checker = None
390
if os.WIFEXITED(condition):
391
exitstatus = os.WEXITSTATUS(condition)
393
logger.info(u"Checker for %(name)s succeeded",
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
672
if self.last_checker_status == 0:
673
logger.info("Checker for %(name)s succeeded",
395
675
self.checked_ok()
397
logger.info(u"Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
400
logger.warning(u"Checker for %(name)s crashed?",
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
logger.warning("Checker for %(name)s crashed?",
403
685
def checked_ok(self):
404
"""Bump up the timeout for this client.
406
This should only be called when the client has been seen,
686
"""Assert that the client has been seen, alive and well."""
409
687
self.last_checked_ok = datetime.datetime.utcnow()
410
gobject.source_remove(self.disable_initiator_tag)
411
self.disable_initiator_tag = (gobject.timeout_add
412
(self.timeout_milliseconds(),
688
self.last_checker_status = 0
689
self.last_checker_signal = None
692
def bump_timeout(self, timeout=None):
693
"""Bump up the timeout for this client."""
695
timeout = self.timeout
696
if self.disable_initiator_tag is not None:
697
gobject.source_remove(self.disable_initiator_tag)
698
self.disable_initiator_tag = None
699
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
702
self.expires = datetime.datetime.utcnow() + timeout
704
def need_approval(self):
705
self.last_approval_request = datetime.datetime.utcnow()
415
707
def start_checker(self):
416
708
"""Start a new checker subprocess if one is not running.
418
710
If a checker already exists, leave it running and do
420
712
# The reason for not killing a running checker is that if we
421
# did that, then if a checker (for some reason) started
422
# running slowly and taking more than 'interval' time, the
423
# client would inevitably timeout, since no checker would get
424
# a chance to run to completion. If we instead leave running
713
# did that, and if a checker (for some reason) started running
714
# slowly and taking more than 'interval' time, then the client
715
# would inevitably timeout, since no checker would get a
716
# chance to run to completion. If we instead leave running
425
717
# checkers alone, the checker would have to take more time
426
718
# than 'timeout' for the client to be disabled, which is as it
429
# If a checker exists, make sure it is not a zombie
431
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
432
except (AttributeError, OSError), error:
433
if (isinstance(error, OSError)
434
and error.errno != errno.ECHILD):
438
logger.warning(u"Checker was a zombie")
439
gobject.source_remove(self.checker_callback_tag)
440
self.checker_callback(pid, status,
441
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
442
725
# Start a new checker if needed
443
726
if self.checker is None:
727
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
445
# In case checker_command has exactly one % operator
446
command = self.checker_command % self.host
448
# Escape attributes for the shell
449
escaped_attrs = dict((key,
450
re.escape(unicode(str(val),
454
vars(self).iteritems())
456
command = self.checker_command % escaped_attrs
457
except TypeError, error:
458
logger.error(u'Could not format string "%s":'
459
u' %s', self.checker_command, error)
460
return True # Try again later
732
command = self.checker_command % escaped_attrs
733
except TypeError as error:
734
logger.error('Could not format string "%s"',
735
self.checker_command,
737
return True # Try again later
461
738
self.current_checker_command = command
463
logger.info(u"Starting checker %r for %s",
465
# We don't need to redirect stdout and stderr, since
466
# in normal mode, that is already done by daemon(),
467
# and in debug mode we don't want to. (Stdin is
468
# always replaced by /dev/null.)
469
self.checker = subprocess.Popen(command,
471
shell=True, cwd=u"/")
472
self.checker_callback_tag = (gobject.child_watch_add
474
self.checker_callback,
476
# The checker may have completed before the gobject
477
# watch was added. Check for this.
478
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
480
gobject.source_remove(self.checker_callback_tag)
481
self.checker_callback(pid, status, command)
482
except OSError, error:
483
logger.error(u"Failed to start subprocess: %s",
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
485
764
# Re-run this periodically if run by gobject.timeout_add
555
872
class DBusObjectWithProperties(dbus.service.Object):
556
873
"""A D-Bus object with properties.
558
875
Classes inheriting from this can use the dbus_service_property
559
876
decorator to expose methods as D-Bus properties. It exposes the
560
877
standard Get(), Set(), and GetAll() methods on the D-Bus.
564
def _is_dbus_property(obj):
565
return getattr(obj, u"_dbus_is_property", False)
881
def _is_dbus_thing(thing):
882
"""Returns a function testing if an attribute is a D-Bus thing
884
If called like _is_dbus_thing("method") it returns a function
885
suitable for use as predicate to inspect.getmembers().
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
567
def _get_all_dbus_properties(self):
890
def _get_all_dbus_things(self, thing):
568
891
"""Returns a generator of (name, attribute) pairs
570
return ((prop._dbus_name, prop)
572
inspect.getmembers(self, self._is_dbus_property))
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
894
athing.__get__(self))
895
for cls in self.__class__.__mro__
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
574
899
def _get_dbus_property(self, interface_name, property_name):
575
900
"""Returns a bound method if one exists which is a D-Bus
576
901
property with the specified name and interface.
578
for name in (property_name,
579
property_name + u"_dbus_property"):
580
prop = getattr(self, name, None)
582
or not self._is_dbus_property(prop)
583
or prop._dbus_name != property_name
584
or (interface_name and prop._dbus_interface
585
and interface_name != prop._dbus_interface)):
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
906
if (value._dbus_name == property_name
907
and value._dbus_interface == interface_name):
908
return value.__get__(self)
588
910
# No such property
589
raise DBusPropertyNotFound(self.dbus_object_path + u":"
590
+ interface_name + u"."
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
593
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
595
917
def Get(self, interface_name, property_name):
596
918
"""Standard D-Bus property Get() method, see D-Bus standard.
598
920
prop = self._get_dbus_property(interface_name, property_name)
599
if prop._dbus_access == u"write":
921
if prop._dbus_access == "write":
600
922
raise DBusPropertyAccessException(property_name)
602
if not hasattr(value, u"variant_level"):
924
if not hasattr(value, "variant_level"):
604
926
return type(value)(value, variant_level=value.variant_level+1)
606
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
928
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
607
929
def Set(self, interface_name, property_name, value):
608
930
"""Standard D-Bus property Set() method, see D-Bus standard.
610
932
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"read":
933
if prop._dbus_access == "read":
612
934
raise DBusPropertyAccessException(property_name)
613
if prop._dbus_get_args_options[u"byte_arrays"]:
935
if prop._dbus_get_args_options["byte_arrays"]:
614
936
# The byte_arrays option is not supported yet on
615
937
# signatures other than "ay".
616
if prop._dbus_signature != u"ay":
618
value = dbus.ByteArray(''.join(unichr(byte)
938
if prop._dbus_signature != "ay":
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
.format(prop._dbus_signature))
942
value = dbus.ByteArray(b''.join(chr(byte)
622
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
623
out_signature=u"a{sv}")
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
948
out_signature="a{sv}")
624
949
def GetAll(self, interface_name):
625
950
"""Standard D-Bus property GetAll() method, see D-Bus
628
953
Note: Will not include properties with access="write".
631
for name, prop in self._get_all_dbus_properties():
956
for name, prop in self._get_all_dbus_things("property"):
632
957
if (interface_name
633
958
and interface_name != prop._dbus_interface):
634
959
# Interface non-empty but did not match
636
961
# Ignore write-only properties
637
if prop._dbus_access == u"write":
962
if prop._dbus_access == "write":
640
if not hasattr(value, u"variant_level"):
965
if not hasattr(value, "variant_level"):
966
properties[name] = value
643
all[name] = type(value)(value, variant_level=
644
value.variant_level+1)
645
return dbus.Dictionary(all, signature=u"sv")
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
970
return dbus.Dictionary(properties, signature="sv")
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
647
980
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
649
982
path_keyword='object_path',
650
983
connection_keyword='connection')
651
984
def Introspect(self, object_path, connection):
652
"""Standard D-Bus method, overloaded to insert property tags.
985
"""Overloading of standard D-Bus method.
987
Inserts property tags and interface annotation tags.
654
989
xmlstring = dbus.service.Object.Introspect(self, object_path,
657
992
document = xml.dom.minidom.parseString(xmlstring)
658
994
def make_tag(document, name, prop):
659
e = document.createElement(u"property")
660
e.setAttribute(u"name", name)
661
e.setAttribute(u"type", prop._dbus_signature)
662
e.setAttribute(u"access", prop._dbus_access)
995
e = document.createElement("property")
996
e.setAttribute("name", name)
997
e.setAttribute("type", prop._dbus_signature)
998
e.setAttribute("access", prop._dbus_access)
664
for if_tag in document.getElementsByTagName(u"interface"):
1001
for if_tag in document.getElementsByTagName("interface"):
665
1003
for tag in (make_tag(document, name, prop)
667
in self._get_all_dbus_properties()
1005
in self._get_all_dbus_things("property")
668
1006
if prop._dbus_interface
669
== if_tag.getAttribute(u"name")):
1007
== if_tag.getAttribute("name")):
670
1008
if_tag.appendChild(tag)
1009
# Add annotation tags
1010
for typ in ("method", "signal", "property"):
1011
for tag in if_tag.getElementsByTagName(typ):
1013
for name, prop in (self.
1014
_get_all_dbus_things(typ)):
1015
if (name == tag.getAttribute("name")
1016
and prop._dbus_interface
1017
== if_tag.getAttribute("name")):
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
1021
ann_tag = document.createElement(
1023
ann_tag.setAttribute("name", name)
1024
ann_tag.setAttribute("value", value)
1025
tag.appendChild(ann_tag)
1026
# Add interface annotation tags
1027
for annotation, value in dict(
1028
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1032
if name == if_tag.getAttribute("name")
1034
ann_tag = document.createElement("annotation")
1035
ann_tag.setAttribute("name", annotation)
1036
ann_tag.setAttribute("value", value)
1037
if_tag.appendChild(ann_tag)
671
1038
# Add the names to the return values for the
672
1039
# "org.freedesktop.DBus.Properties" methods
673
if (if_tag.getAttribute(u"name")
674
== u"org.freedesktop.DBus.Properties"):
675
for cn in if_tag.getElementsByTagName(u"method"):
676
if cn.getAttribute(u"name") == u"Get":
677
for arg in cn.getElementsByTagName(u"arg"):
678
if (arg.getAttribute(u"direction")
680
arg.setAttribute(u"name", u"value")
681
elif cn.getAttribute(u"name") == u"GetAll":
682
for arg in cn.getElementsByTagName(u"arg"):
683
if (arg.getAttribute(u"direction")
685
arg.setAttribute(u"name", u"props")
686
xmlstring = document.toxml(u"utf-8")
1040
if (if_tag.getAttribute("name")
1041
== "org.freedesktop.DBus.Properties"):
1042
for cn in if_tag.getElementsByTagName("method"):
1043
if cn.getAttribute("name") == "Get":
1044
for arg in cn.getElementsByTagName("arg"):
1045
if (arg.getAttribute("direction")
1047
arg.setAttribute("name", "value")
1048
elif cn.getAttribute("name") == "GetAll":
1049
for arg in cn.getElementsByTagName("arg"):
1050
if (arg.getAttribute("direction")
1052
arg.setAttribute("name", "props")
1053
xmlstring = document.toxml("utf-8")
687
1054
document.unlink()
688
1055
except (AttributeError, xml.dom.DOMException,
689
xml.parsers.expat.ExpatError), error:
690
logger.error(u"Failed to override Introspection method",
1056
xml.parsers.expat.ExpatError) as error:
1057
logger.error("Failed to override Introspection method",
692
1059
return xmlstring
1062
def datetime_to_dbus(dt, variant_level=0):
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1065
return dbus.String("", variant_level = variant_level)
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1070
"""A class decorator; applied to a subclass of
1071
dbus.service.Object, it will add alternate D-Bus attributes with
1072
interface names according to the "alt_interface_names" mapping.
1075
@alternate_dbus_interfaces({"org.example.Interface":
1076
"net.example.AlternateInterface"})
1077
class SampleDBusObject(dbus.service.Object):
1078
@dbus.service.method("org.example.Interface")
1079
def SampleDBusMethod():
1082
The above "SampleDBusMethod" on "SampleDBusObject" will be
1083
reachable via two interfaces: "org.example.Interface" and
1084
"net.example.AlternateInterface", the latter of which will have
1085
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1086
"true", unless "deprecate" is passed with a False value.
1088
This works for methods and signals, and also for D-Bus properties
1089
(from DBusObjectWithProperties) and interfaces (from the
1090
dbus_interface_annotations decorator).
1094
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1097
interface_names = set()
1098
# Go though all attributes of the class
1099
for attrname, attribute in inspect.getmembers(cls):
1100
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
# with the wrong interface name
1102
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1106
# Create an alternate D-Bus interface name based on
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1110
interface_names.add(alt_interface)
1111
# Is this a D-Bus signal?
1112
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1117
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
1122
# Create a new, but exactly alike, function
1123
# object, and decorate it to be a new D-Bus signal
1124
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1141
attribute._dbus_signature)(new_function))
1142
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1146
except AttributeError:
1148
# Define a creator of a function to call both the
1149
# original and alternate functions, so both the
1150
# original and alternate signals gets sent when
1151
# the function is called
1152
def fixscope(func1, func2):
1153
"""This function is a scope container to pass
1154
func1 and func2 to the "call_both" function
1155
outside of its arguments"""
1157
def call_both(*args, **kwargs):
1158
"""This function will emit two D-Bus
1159
signals by calling func1 and func2"""
1160
func1(*args, **kwargs)
1161
func2(*args, **kwargs)
1164
# Create the "call_both" function and add it to
1166
attr[attrname] = fixscope(attribute, new_function)
1167
# Is this a D-Bus method?
1168
elif getattr(attribute, "_dbus_is_method", False):
1169
# Create a new, but exactly alike, function
1170
# object. Decorate it to be a new D-Bus method
1171
# with the alternate D-Bus interface name. Add it
1174
dbus.service.method(
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1183
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1187
except AttributeError:
1189
# Is this a D-Bus property?
1190
elif getattr(attribute, "_dbus_is_property", False):
1191
# Create a new, but exactly alike, function
1192
# object, and decorate it to be a new D-Bus
1193
# property with the alternate D-Bus interface
1194
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1206
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1210
except AttributeError:
1212
# Is this a D-Bus interface?
1213
elif getattr(attribute, "_dbus_is_interface", False):
1214
# Create a new, but exactly alike, function
1215
# object. Decorate it to be a new D-Bus interface
1216
# with the alternate D-Bus interface name. Add it
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1226
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1228
for interface_name in interface_names:
1230
@dbus_interface_annotations(interface_name)
1232
return { "org.freedesktop.DBus.Deprecated":
1234
# Find an unused name
1235
for aname in (iname.format(i)
1236
for i in itertools.count()):
1237
if aname not in attr:
1241
# Replace the class with a new subclass of it with
1242
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
695
1252
class ClientDBus(Client, DBusObjectWithProperties):
696
1253
"""A Client class using D-Bus
706
1269
Client.__init__(self, *args, **kwargs)
707
1270
# Only now, when this client is initialized, can it show up on
709
self.dbus_object_path = (dbus.ObjectPath
711
+ self.name.replace(u".", u"_")))
1272
client_object_name = str(self.name).translate(
1273
{ord("."): ord("_"),
1274
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
712
1277
DBusObjectWithProperties.__init__(self, self.bus,
713
1278
self.dbus_object_path)
716
def _datetime_to_dbus(dt, variant_level=0):
717
"""Convert a UTC datetime.datetime() to a D-Bus type."""
718
return dbus.String(dt.isoformat(),
719
variant_level=variant_level)
722
oldstate = getattr(self, u"enabled", False)
723
r = Client.enable(self)
724
if oldstate != self.enabled:
726
self.PropertyChanged(dbus.String(u"enabled"),
727
dbus.Boolean(True, variant_level=1))
728
self.PropertyChanged(
729
dbus.String(u"last_enabled"),
730
self._datetime_to_dbus(self.last_enabled,
734
def disable(self, quiet = False):
735
oldstate = getattr(self, u"enabled", False)
736
r = Client.disable(self, quiet=quiet)
737
if not quiet and oldstate != self.enabled:
739
self.PropertyChanged(dbus.String(u"enabled"),
740
dbus.Boolean(False, variant_level=1))
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1283
invalidate_only=False,
1284
_interface=_interface):
1285
""" Modify a variable so that it's a property which announces
1286
its changes to DBus.
1288
transform_fun: Function that takes a value and a variant_level
1289
and transforms it to a D-Bus type.
1290
dbus_name: D-Bus name of the variable
1291
type_func: Function that transform the value before sending it
1292
to the D-Bus. Default: no transform
1293
variant_level: D-Bus variant level. Default: 1
1295
attrname = "_{}".format(dbus_name)
1297
def setter(self, value):
1298
if hasattr(self, "dbus_object_path"):
1299
if (not hasattr(self, attrname) or
1300
type_func(getattr(self, attrname, None))
1301
!= type_func(value)):
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1307
dbus_value = transform_func(
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1312
self.PropertiesChanged(
1314
dbus.Dictionary({ dbus.String(dbus_name):
1317
setattr(self, attrname, value)
1319
return property(lambda self: getattr(self, attrname), setter)
1321
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1322
approvals_pending = notifychangeproperty(dbus.Boolean,
1325
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
last_enabled = notifychangeproperty(datetime_to_dbus,
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1331
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1333
last_checker_status = notifychangeproperty(dbus.Int16,
1334
"LastCheckerStatus")
1335
last_approval_request = notifychangeproperty(
1336
datetime_to_dbus, "LastApprovalRequest")
1337
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1342
approval_duration = notifychangeproperty(
1343
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1345
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1349
extended_timeout = notifychangeproperty(
1350
dbus.UInt64, "ExtendedTimeout",
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1355
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
del notifychangeproperty
743
1361
def __del__(self, *args, **kwargs):
745
1363
self.remove_from_connection()
746
1364
except LookupError:
748
if hasattr(DBusObjectWithProperties, u"__del__"):
1366
if hasattr(DBusObjectWithProperties, "__del__"):
749
1367
DBusObjectWithProperties.__del__(self, *args, **kwargs)
750
1368
Client.__del__(self, *args, **kwargs)
752
def checker_callback(self, pid, condition, command,
754
self.checker_callback_tag = None
757
self.PropertyChanged(dbus.String(u"checker_running"),
758
dbus.Boolean(False, variant_level=1))
759
if os.WIFEXITED(condition):
760
exitstatus = os.WEXITSTATUS(condition)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1375
exitstatus = self.last_checker_status
761
1377
# Emit D-Bus signal
762
1378
self.CheckerCompleted(dbus.Int16(exitstatus),
763
dbus.Int64(condition),
764
1380
dbus.String(command))
766
1382
# Emit D-Bus signal
767
1383
self.CheckerCompleted(dbus.Int16(-1),
768
dbus.Int64(condition),
1385
self.last_checker_signal),
769
1386
dbus.String(command))
771
return Client.checker_callback(self, pid, condition, command,
774
def checked_ok(self, *args, **kwargs):
775
r = Client.checked_ok(self, *args, **kwargs)
777
self.PropertyChanged(
778
dbus.String(u"last_checked_ok"),
779
(self._datetime_to_dbus(self.last_checked_ok,
783
1389
def start_checker(self, *args, **kwargs):
784
old_checker = self.checker
785
if self.checker is not None:
786
old_checker_pid = self.checker.pid
788
old_checker_pid = None
1390
old_checker_pid = getattr(self.checker, "pid", None)
789
1391
r = Client.start_checker(self, *args, **kwargs)
790
1392
# Only if new checker process was started
791
1393
if (self.checker is not None
792
1394
and old_checker_pid != self.checker.pid):
793
1395
# Emit D-Bus signal
794
1396
self.CheckerStarted(self.current_checker_command)
795
self.PropertyChanged(
796
dbus.String(u"checker_running"),
797
dbus.Boolean(True, variant_level=1))
800
def stop_checker(self, *args, **kwargs):
801
old_checker = getattr(self, u"checker", None)
802
r = Client.stop_checker(self, *args, **kwargs)
803
if (old_checker is not None
804
and getattr(self, u"checker", None) is None):
805
self.PropertyChanged(dbus.String(u"checker_running"),
806
dbus.Boolean(False, variant_level=1))
809
1399
def _reset_approved(self):
810
self._approved = None
1400
self.approved = None
813
1403
def approve(self, value=True):
814
self._approved = value
815
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
817
def approved_pending(self):
818
return self.approvals_pending > 0
1404
self.approved = value
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1407
self.send_changedstate()
821
1409
## D-Bus methods, signals & properties
822
_interface = u"se.bsnet.fukt.Mandos.Client"
826
1415
# CheckerCompleted - signal
827
@dbus.service.signal(_interface, signature=u"nxs")
1416
@dbus.service.signal(_interface, signature="nxs")
828
1417
def CheckerCompleted(self, exitcode, waitstatus, command):
832
1421
# CheckerStarted - signal
833
@dbus.service.signal(_interface, signature=u"s")
1422
@dbus.service.signal(_interface, signature="s")
834
1423
def CheckerStarted(self, command):
838
1427
# PropertyChanged - signal
839
@dbus.service.signal(_interface, signature=u"sv")
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
@dbus.service.signal(_interface, signature="sv")
840
1430
def PropertyChanged(self, property, value):
899
# approved_pending - property
900
@dbus_service_property(_interface, signature=u"b", access=u"read")
901
def approved_pending_dbus_property(self):
902
return dbus.Boolean(self.approved_pending())
904
# approved_by_default - property
905
@dbus_service_property(_interface, signature=u"b",
907
def approved_by_default_dbus_property(self):
908
return dbus.Boolean(self.approved_by_default)
910
# approved_delay - property
911
@dbus_service_property(_interface, signature=u"t",
913
def approved_delay_dbus_property(self):
914
return dbus.UInt64(self.approved_delay_milliseconds())
916
# approved_duration - property
917
@dbus_service_property(_interface, signature=u"t",
919
def approved_duration_dbus_property(self):
920
return dbus.UInt64(self._timedelta_to_milliseconds(
921
self.approved_duration))
924
@dbus_service_property(_interface, signature=u"s", access=u"read")
925
def name_dbus_property(self):
1492
# ApprovalPending - property
1493
@dbus_service_property(_interface, signature="b", access="read")
1494
def ApprovalPending_dbus_property(self):
1495
return dbus.Boolean(bool(self.approvals_pending))
1497
# ApprovedByDefault - property
1498
@dbus_service_property(_interface,
1501
def ApprovedByDefault_dbus_property(self, value=None):
1502
if value is None: # get
1503
return dbus.Boolean(self.approved_by_default)
1504
self.approved_by_default = bool(value)
1506
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1510
def ApprovalDelay_dbus_property(self, value=None):
1511
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1514
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1516
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1520
def ApprovalDuration_dbus_property(self, value=None):
1521
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1524
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1528
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1529
@dbus_service_property(_interface, signature="s", access="read")
1530
def Name_dbus_property(self):
926
1531
return dbus.String(self.name)
928
# fingerprint - property
929
@dbus_service_property(_interface, signature=u"s", access=u"read")
930
def fingerprint_dbus_property(self):
1533
# Fingerprint - property
1535
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1536
@dbus_service_property(_interface, signature="s", access="read")
1537
def Fingerprint_dbus_property(self):
931
1538
return dbus.String(self.fingerprint)
934
@dbus_service_property(_interface, signature=u"s",
936
def host_dbus_property(self, value=None):
1541
@dbus_service_property(_interface,
1544
def Host_dbus_property(self, value=None):
937
1545
if value is None: # get
938
1546
return dbus.String(self.host)
941
self.PropertyChanged(dbus.String(u"host"),
942
dbus.String(value, variant_level=1))
945
@dbus_service_property(_interface, signature=u"s", access=u"read")
946
def created_dbus_property(self):
947
return dbus.String(self._datetime_to_dbus(self.created))
949
# last_enabled - property
950
@dbus_service_property(_interface, signature=u"s", access=u"read")
951
def last_enabled_dbus_property(self):
952
if self.last_enabled is None:
953
return dbus.String(u"")
954
return dbus.String(self._datetime_to_dbus(self.last_enabled))
957
@dbus_service_property(_interface, signature=u"b",
959
def enabled_dbus_property(self, value=None):
1547
self.host = str(value)
1549
# Created - property
1551
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1552
@dbus_service_property(_interface, signature="s", access="read")
1553
def Created_dbus_property(self):
1554
return datetime_to_dbus(self.created)
1556
# LastEnabled - property
1557
@dbus_service_property(_interface, signature="s", access="read")
1558
def LastEnabled_dbus_property(self):
1559
return datetime_to_dbus(self.last_enabled)
1561
# Enabled - property
1562
@dbus_service_property(_interface,
1565
def Enabled_dbus_property(self, value=None):
960
1566
if value is None: # get
961
1567
return dbus.Boolean(self.enabled)
967
# last_checked_ok - property
968
@dbus_service_property(_interface, signature=u"s",
970
def last_checked_ok_dbus_property(self, value=None):
1573
# LastCheckedOK - property
1574
@dbus_service_property(_interface,
1577
def LastCheckedOK_dbus_property(self, value=None):
971
1578
if value is not None:
972
1579
self.checked_ok()
974
if self.last_checked_ok is None:
975
return dbus.String(u"")
976
return dbus.String(self._datetime_to_dbus(self
980
@dbus_service_property(_interface, signature=u"t",
982
def timeout_dbus_property(self, value=None):
1581
return datetime_to_dbus(self.last_checked_ok)
1583
# LastCheckerStatus - property
1584
@dbus_service_property(_interface, signature="n", access="read")
1585
def LastCheckerStatus_dbus_property(self):
1586
return dbus.Int16(self.last_checker_status)
1588
# Expires - property
1589
@dbus_service_property(_interface, signature="s", access="read")
1590
def Expires_dbus_property(self):
1591
return datetime_to_dbus(self.expires)
1593
# LastApprovalRequest - property
1594
@dbus_service_property(_interface, signature="s", access="read")
1595
def LastApprovalRequest_dbus_property(self):
1596
return datetime_to_dbus(self.last_approval_request)
1598
# Timeout - property
1599
@dbus_service_property(_interface,
1602
def Timeout_dbus_property(self, value=None):
983
1603
if value is None: # get
984
return dbus.UInt64(self.timeout_milliseconds())
1604
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1605
old_timeout = self.timeout
985
1606
self.timeout = datetime.timedelta(0, 0, 0, value)
987
self.PropertyChanged(dbus.String(u"timeout"),
988
dbus.UInt64(value, variant_level=1))
989
if getattr(self, u"disable_initiator_tag", None) is None:
992
gobject.source_remove(self.disable_initiator_tag)
993
self.disable_initiator_tag = None
995
_timedelta_to_milliseconds((self
1000
if time_to_die <= 0:
1001
# The timeout has passed
1004
self.disable_initiator_tag = (gobject.timeout_add
1005
(time_to_die, self.disable))
1007
# interval - property
1008
@dbus_service_property(_interface, signature=u"t",
1009
access=u"readwrite")
1010
def interval_dbus_property(self, value=None):
1011
if value is None: # get
1012
return dbus.UInt64(self.interval_milliseconds())
1607
# Reschedule disabling
1609
now = datetime.datetime.utcnow()
1610
self.expires += self.timeout - old_timeout
1611
if self.expires <= now:
1612
# The timeout has passed
1615
if (getattr(self, "disable_initiator_tag", None)
1618
gobject.source_remove(self.disable_initiator_tag)
1619
self.disable_initiator_tag = gobject.timeout_add(
1620
int((self.expires - now).total_seconds() * 1000),
1623
# ExtendedTimeout - property
1624
@dbus_service_property(_interface,
1627
def ExtendedTimeout_dbus_property(self, value=None):
1628
if value is None: # get
1629
return dbus.UInt64(self.extended_timeout.total_seconds()
1631
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1633
# Interval - property
1634
@dbus_service_property(_interface,
1637
def Interval_dbus_property(self, value=None):
1638
if value is None: # get
1639
return dbus.UInt64(self.interval.total_seconds() * 1000)
1013
1640
self.interval = datetime.timedelta(0, 0, 0, value)
1015
self.PropertyChanged(dbus.String(u"interval"),
1016
dbus.UInt64(value, variant_level=1))
1017
if getattr(self, u"checker_initiator_tag", None) is None:
1641
if getattr(self, "checker_initiator_tag", None) is None:
1019
# Reschedule checker run
1020
gobject.source_remove(self.checker_initiator_tag)
1021
self.checker_initiator_tag = (gobject.timeout_add
1022
(value, self.start_checker))
1023
self.start_checker() # Start one now, too
1025
# checker - property
1026
@dbus_service_property(_interface, signature=u"s",
1027
access=u"readwrite")
1028
def checker_dbus_property(self, value=None):
1644
# Reschedule checker run
1645
gobject.source_remove(self.checker_initiator_tag)
1646
self.checker_initiator_tag = gobject.timeout_add(
1647
value, self.start_checker)
1648
self.start_checker() # Start one now, too
1650
# Checker - property
1651
@dbus_service_property(_interface,
1654
def Checker_dbus_property(self, value=None):
1029
1655
if value is None: # get
1030
1656
return dbus.String(self.checker_command)
1031
self.checker_command = value
1033
self.PropertyChanged(dbus.String(u"checker"),
1034
dbus.String(self.checker_command,
1657
self.checker_command = str(value)
1037
# checker_running - property
1038
@dbus_service_property(_interface, signature=u"b",
1039
access=u"readwrite")
1040
def checker_running_dbus_property(self, value=None):
1659
# CheckerRunning - property
1660
@dbus_service_property(_interface,
1663
def CheckerRunning_dbus_property(self, value=None):
1041
1664
if value is None: # get
1042
1665
return dbus.Boolean(self.checker is not None)
1094
1726
def handle(self):
1095
1727
with contextlib.closing(self.server.child_pipe) as child_pipe:
1096
logger.info(u"TCP connection from: %s",
1097
unicode(self.client_address))
1098
logger.debug(u"Pipe FD: %d",
1728
logger.info("TCP connection from: %s",
1729
str(self.client_address))
1730
logger.debug("Pipe FD: %d",
1099
1731
self.server.child_pipe.fileno())
1101
session = (gnutls.connection
1102
.ClientSession(self.request,
1104
.X509Credentials()))
1733
session = gnutls.connection.ClientSession(
1734
self.request, gnutls.connection .X509Credentials())
1106
1736
# Note: gnutls.connection.X509Credentials is really a
1107
1737
# generic GnuTLS certificate credentials object so long as
1108
1738
# no X.509 keys are added to it. Therefore, we can use it
1109
1739
# here despite using OpenPGP certificates.
1111
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1112
# u"+AES-256-CBC", u"+SHA1",
1113
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1741
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1742
# "+AES-256-CBC", "+SHA1",
1743
# "+COMP-NULL", "+CTYPE-OPENPGP",
1115
1745
# Use a fallback default, since this MUST be set.
1116
1746
priority = self.server.gnutls_priority
1117
1747
if priority is None:
1118
priority = u"NORMAL"
1119
(gnutls.library.functions
1120
.gnutls_priority_set_direct(session._c_object,
1749
gnutls.library.functions.gnutls_priority_set_direct(
1750
session._c_object, priority, None)
1123
1752
# Start communication using the Mandos protocol
1124
1753
# Get protocol number
1125
1754
line = self.request.makefile().readline()
1126
logger.debug(u"Protocol version: %r", line)
1755
logger.debug("Protocol version: %r", line)
1128
1757
if int(line.strip().split()[0]) > 1:
1130
except (ValueError, IndexError, RuntimeError), error:
1131
logger.error(u"Unknown protocol version: %s", error)
1758
raise RuntimeError(line)
1759
except (ValueError, IndexError, RuntimeError) as error:
1760
logger.error("Unknown protocol version: %s", error)
1134
1763
# Start GnuTLS connection
1136
1765
session.handshake()
1137
except gnutls.errors.GNUTLSError, error:
1138
logger.warning(u"Handshake failed: %s", error)
1766
except gnutls.errors.GNUTLSError as error:
1767
logger.warning("Handshake failed: %s", error)
1139
1768
# Do not run session.bye() here: the session is not
1140
1769
# established. Just abandon the request.
1142
logger.debug(u"Handshake succeeded")
1771
logger.debug("Handshake succeeded")
1144
1773
approval_required = False
1147
fpr = self.fingerprint(self.peer_certificate
1149
except (TypeError, gnutls.errors.GNUTLSError), error:
1150
logger.warning(u"Bad certificate: %s", error)
1776
fpr = self.fingerprint(
1777
self.peer_certificate(session))
1779
gnutls.errors.GNUTLSError) as error:
1780
logger.warning("Bad certificate: %s", error)
1152
logger.debug(u"Fingerprint: %s", fpr)
1782
logger.debug("Fingerprint: %s", fpr)
1155
1785
client = ProxyClient(child_pipe, fpr,
1156
1786
self.client_address)
1157
1787
except KeyError:
1160
if client.approved_delay:
1161
delay = client.approved_delay
1790
if client.approval_delay:
1791
delay = client.approval_delay
1162
1792
client.approvals_pending += 1
1163
1793
approval_required = True
1166
1796
if not client.enabled:
1167
logger.warning(u"Client %s is disabled",
1797
logger.info("Client %s is disabled",
1169
1799
if self.server.use_dbus:
1170
1800
# Emit D-Bus signal
1171
client.Rejected("Disabled")
1801
client.Rejected("Disabled")
1174
if client._approved or not client.approved_delay:
1804
if client.approved or not client.approval_delay:
1175
1805
#We are approved or approval is disabled
1177
elif client._approved is None:
1178
logger.info(u"Client %s need approval",
1807
elif client.approved is None:
1808
logger.info("Client %s needs approval",
1180
1810
if self.server.use_dbus:
1181
1811
# Emit D-Bus signal
1182
1812
client.NeedApproval(
1183
client.approved_delay_milliseconds(),
1184
client.approved_by_default)
1813
client.approval_delay.total_seconds()
1814
* 1000, client.approved_by_default)
1186
logger.warning(u"Client %s was not approved",
1816
logger.warning("Client %s was not approved",
1188
1818
if self.server.use_dbus:
1189
1819
# Emit D-Bus signal
1190
client.Rejected("Disapproved")
1820
client.Rejected("Denied")
1193
1823
#wait until timeout or approved
1194
#x = float(client._timedelta_to_milliseconds(delay))
1195
1824
time = datetime.datetime.now()
1196
1825
client.changedstate.acquire()
1197
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1826
client.changedstate.wait(delay.total_seconds())
1198
1827
client.changedstate.release()
1199
1828
time2 = datetime.datetime.now()
1200
1829
if (time2 - time) >= delay:
1257
1894
def fingerprint(openpgp):
1258
1895
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1259
1896
# New GnuTLS "datum" with the OpenPGP public key
1260
datum = (gnutls.library.types
1261
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1264
ctypes.c_uint(len(openpgp))))
1897
datum = gnutls.library.types.gnutls_datum_t(
1898
ctypes.cast(ctypes.c_char_p(openpgp),
1899
ctypes.POINTER(ctypes.c_ubyte)),
1900
ctypes.c_uint(len(openpgp)))
1265
1901
# New empty GnuTLS certificate
1266
1902
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1267
(gnutls.library.functions
1268
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1903
gnutls.library.functions.gnutls_openpgp_crt_init(
1269
1905
# Import the OpenPGP public key into the certificate
1270
(gnutls.library.functions
1271
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1272
gnutls.library.constants
1273
.GNUTLS_OPENPGP_FMT_RAW))
1906
gnutls.library.functions.gnutls_openpgp_crt_import(
1907
crt, ctypes.byref(datum),
1908
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1274
1909
# Verify the self signature in the key
1275
1910
crtverify = ctypes.c_uint()
1276
(gnutls.library.functions
1277
.gnutls_openpgp_crt_verify_self(crt, 0,
1278
ctypes.byref(crtverify)))
1911
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1912
crt, 0, ctypes.byref(crtverify))
1279
1913
if crtverify.value != 0:
1280
1914
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1281
raise (gnutls.errors.CertificateSecurityError
1915
raise gnutls.errors.CertificateSecurityError(
1283
1917
# New buffer for the fingerprint
1284
1918
buf = ctypes.create_string_buffer(20)
1285
1919
buf_len = ctypes.c_size_t()
1286
1920
# Get the fingerprint from the certificate into the buffer
1287
(gnutls.library.functions
1288
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1289
ctypes.byref(buf_len)))
1921
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1922
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1290
1923
# Deinit the certificate
1291
1924
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1292
1925
# Convert the buffer to a Python bytestring
1293
1926
fpr = ctypes.string_at(buf, buf_len.value)
1294
1927
# Convert the bytestring to hexadecimal notation
1295
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1928
hex_fpr = binascii.hexlify(fpr).upper()
1299
1932
class MultiprocessingMixIn(object):
1300
1933
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1301
1935
def sub_process_main(self, request, address):
1303
1937
self.finish_request(request, address)
1305
1939
self.handle_error(request, address)
1306
1940
self.close_request(request)
1308
1942
def process_request(self, request, address):
1309
1943
"""Start a new process to process the request."""
1310
multiprocessing.Process(target = self.sub_process_main,
1311
args = (request, address)).start()
1944
proc = multiprocessing.Process(target = self.sub_process_main,
1945
args = (request, address))
1313
1950
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1314
1951
""" adds a pipe to the MixIn """
1315
1953
def process_request(self, request, client_address):
1316
1954
"""Overrides and wraps the original process_request().
1318
1956
This function creates a new pipe in self.pipe
1320
1958
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1322
super(MultiprocessingMixInWithPipe,
1323
self).process_request(request, client_address)
1324
self.add_pipe(parent_pipe)
1325
def add_pipe(self, parent_pipe):
1960
proc = MultiprocessingMixIn.process_request(self, request,
1962
self.child_pipe.close()
1963
self.add_pipe(parent_pipe, proc)
1965
def add_pipe(self, parent_pipe, proc):
1326
1966
"""Dummy function; override as necessary"""
1967
raise NotImplementedError()
1329
1970
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1330
1971
socketserver.TCPServer, object):
1451
2127
fpr = request[1]
1452
2128
address = request[2]
1454
for c in self.clients:
2130
for c in self.clients.itervalues():
1455
2131
if c.fingerprint == fpr:
1459
logger.warning(u"Client not found for fingerprint: %s, ad"
1460
u"dress: %s", fpr, address)
2135
logger.info("Client not found for fingerprint: %s, ad"
2136
"dress: %s", fpr, address)
1461
2137
if self.use_dbus:
1462
2138
# Emit D-Bus signal
1463
mandos_dbus_service.ClientNotFound(fpr, address)
2139
mandos_dbus_service.ClientNotFound(fpr,
1464
2141
parent_pipe.send(False)
1467
gobject.io_add_watch(parent_pipe.fileno(),
1468
gobject.IO_IN | gobject.IO_HUP,
1469
functools.partial(self.handle_ipc,
1470
parent_pipe = parent_pipe,
1471
client_object = client))
2144
gobject.io_add_watch(
2145
parent_pipe.fileno(),
2146
gobject.IO_IN | gobject.IO_HUP,
2147
functools.partial(self.handle_ipc,
2148
parent_pipe = parent_pipe,
2150
client_object = client))
1472
2151
parent_pipe.send(True)
1473
# remove the old hook in favor of the new above hook on same fileno
2152
# remove the old hook in favor of the new above hook on
1475
2155
if command == 'funcall':
1476
2156
funcname = request[1]
1477
2157
args = request[2]
1478
2158
kwargs = request[3]
1480
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2160
parent_pipe.send(('data', getattr(client_object,
1482
2164
if command == 'getattr':
1483
2165
attrname = request[1]
1484
if callable(client_object.__getattribute__(attrname)):
1485
parent_pipe.send(('function',))
2166
if isinstance(client_object.__getattribute__(attrname),
2167
collections.Callable):
2168
parent_pipe.send(('function', ))
1487
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2171
'data', client_object.__getattribute__(attrname)))
1489
2173
if command == 'setattr':
1490
2174
attrname = request[1]
1491
2175
value = request[2]
1492
2176
setattr(client_object, attrname, value)
2181
def rfc3339_duration_to_delta(duration):
2182
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2184
>>> rfc3339_duration_to_delta("P7D")
2185
datetime.timedelta(7)
2186
>>> rfc3339_duration_to_delta("PT60S")
2187
datetime.timedelta(0, 60)
2188
>>> rfc3339_duration_to_delta("PT60M")
2189
datetime.timedelta(0, 3600)
2190
>>> rfc3339_duration_to_delta("PT24H")
2191
datetime.timedelta(1)
2192
>>> rfc3339_duration_to_delta("P1W")
2193
datetime.timedelta(7)
2194
>>> rfc3339_duration_to_delta("PT5M30S")
2195
datetime.timedelta(0, 330)
2196
>>> rfc3339_duration_to_delta("P1DT3M20S")
2197
datetime.timedelta(1, 200)
2200
# Parsing an RFC 3339 duration with regular expressions is not
2201
# possible - there would have to be multiple places for the same
2202
# values, like seconds. The current code, while more esoteric, is
2203
# cleaner without depending on a parsing library. If Python had a
2204
# built-in library for parsing we would use it, but we'd like to
2205
# avoid excessive use of external libraries.
2207
# New type for defining tokens, syntax, and semantics all-in-one
2208
Token = collections.namedtuple("Token", (
2209
"regexp", # To match token; if "value" is not None, must have
2210
# a "group" containing digits
2211
"value", # datetime.timedelta or None
2212
"followers")) # Tokens valid after this token
2213
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2214
# the "duration" ABNF definition in RFC 3339, Appendix A.
2215
token_end = Token(re.compile(r"$"), None, frozenset())
2216
token_second = Token(re.compile(r"(\d+)S"),
2217
datetime.timedelta(seconds=1),
2218
frozenset((token_end, )))
2219
token_minute = Token(re.compile(r"(\d+)M"),
2220
datetime.timedelta(minutes=1),
2221
frozenset((token_second, token_end)))
2222
token_hour = Token(re.compile(r"(\d+)H"),
2223
datetime.timedelta(hours=1),
2224
frozenset((token_minute, token_end)))
2225
token_time = Token(re.compile(r"T"),
2227
frozenset((token_hour, token_minute,
2229
token_day = Token(re.compile(r"(\d+)D"),
2230
datetime.timedelta(days=1),
2231
frozenset((token_time, token_end)))
2232
token_month = Token(re.compile(r"(\d+)M"),
2233
datetime.timedelta(weeks=4),
2234
frozenset((token_day, token_end)))
2235
token_year = Token(re.compile(r"(\d+)Y"),
2236
datetime.timedelta(weeks=52),
2237
frozenset((token_month, token_end)))
2238
token_week = Token(re.compile(r"(\d+)W"),
2239
datetime.timedelta(weeks=1),
2240
frozenset((token_end, )))
2241
token_duration = Token(re.compile(r"P"), None,
2242
frozenset((token_year, token_month,
2243
token_day, token_time,
2245
# Define starting values
2246
value = datetime.timedelta() # Value so far
2248
followers = frozenset((token_duration, )) # Following valid tokens
2249
s = duration # String left to parse
2250
# Loop until end token is found
2251
while found_token is not token_end:
2252
# Search for any currently valid tokens
2253
for token in followers:
2254
match = token.regexp.match(s)
2255
if match is not None:
2257
if token.value is not None:
2258
# Value found, parse digits
2259
factor = int(match.group(1), 10)
2260
# Add to value so far
2261
value += factor * token.value
2262
# Strip token from string
2263
s = token.regexp.sub("", s, 1)
2266
# Set valid next tokens
2267
followers = found_token.followers
2270
# No currently valid tokens were found
2271
raise ValueError("Invalid RFC 3339 duration: {!r}"
1497
2277
def string_to_delta(interval):
1498
2278
"""Parse a string and return a datetime.timedelta
1500
>>> string_to_delta(u'7d')
2280
>>> string_to_delta('7d')
1501
2281
datetime.timedelta(7)
1502
>>> string_to_delta(u'60s')
2282
>>> string_to_delta('60s')
1503
2283
datetime.timedelta(0, 60)
1504
>>> string_to_delta(u'60m')
2284
>>> string_to_delta('60m')
1505
2285
datetime.timedelta(0, 3600)
1506
>>> string_to_delta(u'24h')
2286
>>> string_to_delta('24h')
1507
2287
datetime.timedelta(1)
1508
>>> string_to_delta(u'1w')
2288
>>> string_to_delta('1w')
1509
2289
datetime.timedelta(7)
1510
>>> string_to_delta(u'5m 30s')
2290
>>> string_to_delta('5m 30s')
1511
2291
datetime.timedelta(0, 330)
2295
return rfc3339_duration_to_delta(interval)
1513
2299
timevalue = datetime.timedelta(0)
1514
2300
for s in interval.split():
1516
suffix = unicode(s[-1])
1517
2303
value = int(s[:-1])
1519
2305
delta = datetime.timedelta(value)
1520
elif suffix == u"s":
1521
2307
delta = datetime.timedelta(0, value)
1522
elif suffix == u"m":
1523
2309
delta = datetime.timedelta(0, 0, 0, 0, value)
1524
elif suffix == u"h":
1525
2311
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1526
elif suffix == u"w":
1527
2313
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1529
raise ValueError(u"Unknown suffix %r" % suffix)
1530
except (ValueError, IndexError), e:
1531
raise ValueError(e.message)
2315
raise ValueError("Unknown suffix {!r}".format(suffix))
2316
except IndexError as e:
2317
raise ValueError(*(e.args))
1532
2318
timevalue += delta
1533
2319
return timevalue
1536
def if_nametoindex(interface):
1537
"""Call the C function if_nametoindex(), or equivalent
1539
Note: This function cannot accept a unicode string."""
1540
global if_nametoindex
1542
if_nametoindex = (ctypes.cdll.LoadLibrary
1543
(ctypes.util.find_library(u"c"))
1545
except (OSError, AttributeError):
1546
logger.warning(u"Doing if_nametoindex the hard way")
1547
def if_nametoindex(interface):
1548
"Get an interface index the hard way, i.e. using fcntl()"
1549
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1550
with contextlib.closing(socket.socket()) as s:
1551
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1552
struct.pack(str(u"16s16x"),
1554
interface_index = struct.unpack(str(u"I"),
1556
return interface_index
1557
return if_nametoindex(interface)
1560
2322
def daemon(nochdir = False, noclose = False):
1561
2323
"""See daemon(3). Standard BSD Unix function.
1587
2349
##################################################################
1588
2350
# Parsing of options, both command line and config file
1590
parser = optparse.OptionParser(version = "%%prog %s" % version)
1591
parser.add_option("-i", u"--interface", type=u"string",
1592
metavar="IF", help=u"Bind to interface IF")
1593
parser.add_option("-a", u"--address", type=u"string",
1594
help=u"Address to listen for requests on")
1595
parser.add_option("-p", u"--port", type=u"int",
1596
help=u"Port number to receive requests on")
1597
parser.add_option("--check", action=u"store_true",
1598
help=u"Run self-test")
1599
parser.add_option("--debug", action=u"store_true",
1600
help=u"Debug mode; run in foreground and log to"
1602
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1603
u" priority string (see GnuTLS documentation)")
1604
parser.add_option("--servicename", type=u"string",
1605
metavar=u"NAME", help=u"Zeroconf service name")
1606
parser.add_option("--configdir", type=u"string",
1607
default=u"/etc/mandos", metavar=u"DIR",
1608
help=u"Directory to search for configuration"
1610
parser.add_option("--no-dbus", action=u"store_false",
1611
dest=u"use_dbus", help=u"Do not provide D-Bus"
1612
u" system bus interface")
1613
parser.add_option("--no-ipv6", action=u"store_false",
1614
dest=u"use_ipv6", help=u"Do not use IPv6")
1615
options = parser.parse_args()[0]
2352
parser = argparse.ArgumentParser()
2353
parser.add_argument("-v", "--version", action="version",
2354
version = "%(prog)s {}".format(version),
2355
help="show version number and exit")
2356
parser.add_argument("-i", "--interface", metavar="IF",
2357
help="Bind to interface IF")
2358
parser.add_argument("-a", "--address",
2359
help="Address to listen for requests on")
2360
parser.add_argument("-p", "--port", type=int,
2361
help="Port number to receive requests on")
2362
parser.add_argument("--check", action="store_true",
2363
help="Run self-test")
2364
parser.add_argument("--debug", action="store_true",
2365
help="Debug mode; run in foreground and log"
2366
" to terminal", default=None)
2367
parser.add_argument("--debuglevel", metavar="LEVEL",
2368
help="Debug level for stdout output")
2369
parser.add_argument("--priority", help="GnuTLS"
2370
" priority string (see GnuTLS documentation)")
2371
parser.add_argument("--servicename",
2372
metavar="NAME", help="Zeroconf service name")
2373
parser.add_argument("--configdir",
2374
default="/etc/mandos", metavar="DIR",
2375
help="Directory to search for configuration"
2377
parser.add_argument("--no-dbus", action="store_false",
2378
dest="use_dbus", help="Do not provide D-Bus"
2379
" system bus interface", default=None)
2380
parser.add_argument("--no-ipv6", action="store_false",
2381
dest="use_ipv6", help="Do not use IPv6",
2383
parser.add_argument("--no-restore", action="store_false",
2384
dest="restore", help="Do not restore stored"
2385
" state", default=None)
2386
parser.add_argument("--socket", type=int,
2387
help="Specify a file descriptor to a network"
2388
" socket to use instead of creating one")
2389
parser.add_argument("--statedir", metavar="DIR",
2390
help="Directory to save/restore state in")
2391
parser.add_argument("--foreground", action="store_true",
2392
help="Run in foreground", default=None)
2393
parser.add_argument("--no-zeroconf", action="store_false",
2394
dest="zeroconf", help="Do not use Zeroconf",
2397
options = parser.parse_args()
1617
2399
if options.check:
2401
fail_count, test_count = doctest.testmod()
2402
sys.exit(os.EX_OK if fail_count == 0 else 1)
1622
2404
# Default values for config file for server-global settings
1623
server_defaults = { u"interface": u"",
1628
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1629
u"servicename": u"Mandos",
1630
u"use_dbus": u"True",
1631
u"use_ipv6": u"True",
2405
server_defaults = { "interface": "",
2410
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2411
":+SIGN-DSA-SHA256",
2412
"servicename": "Mandos",
2418
"statedir": "/var/lib/mandos",
2419
"foreground": "False",
1634
2423
# Parse config file for server-global settings
1635
2424
server_config = configparser.SafeConfigParser(server_defaults)
1636
2425
del server_defaults
1637
server_config.read(os.path.join(options.configdir,
2426
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1639
2427
# Convert the SafeConfigParser object to a dict
1640
2428
server_settings = server_config.defaults()
1641
2429
# Use the appropriate methods on the non-string config options
1642
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1643
server_settings[option] = server_config.getboolean(u"DEFAULT",
2430
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2431
server_settings[option] = server_config.getboolean("DEFAULT",
1645
2433
if server_settings["port"]:
1646
server_settings["port"] = server_config.getint(u"DEFAULT",
2434
server_settings["port"] = server_config.getint("DEFAULT",
2436
if server_settings["socket"]:
2437
server_settings["socket"] = server_config.getint("DEFAULT",
2439
# Later, stdin will, and stdout and stderr might, be dup'ed
2440
# over with an opened os.devnull. But we don't want this to
2441
# happen with a supplied network socket.
2442
if 0 <= server_settings["socket"] <= 2:
2443
server_settings["socket"] = os.dup(server_settings
1648
2445
del server_config
1650
2447
# Override the settings from the config file with command line
1651
2448
# options, if set.
1652
for option in (u"interface", u"address", u"port", u"debug",
1653
u"priority", u"servicename", u"configdir",
1654
u"use_dbus", u"use_ipv6"):
2449
for option in ("interface", "address", "port", "debug",
2450
"priority", "servicename", "configdir", "use_dbus",
2451
"use_ipv6", "debuglevel", "restore", "statedir",
2452
"socket", "foreground", "zeroconf"):
1655
2453
value = getattr(options, option)
1656
2454
if value is not None:
1657
2455
server_settings[option] = value
1659
2457
# Force all strings to be unicode
1660
2458
for option in server_settings.keys():
1661
if type(server_settings[option]) is str:
1662
server_settings[option] = unicode(server_settings[option])
2459
if isinstance(server_settings[option], bytes):
2460
server_settings[option] = (server_settings[option]
2462
# Force all boolean options to be boolean
2463
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2464
"foreground", "zeroconf"):
2465
server_settings[option] = bool(server_settings[option])
2466
# Debug implies foreground
2467
if server_settings["debug"]:
2468
server_settings["foreground"] = True
1663
2469
# Now we have our good server settings in "server_settings"
1665
2471
##################################################################
2473
if (not server_settings["zeroconf"]
2474
and not (server_settings["port"]
2475
or server_settings["socket"] != "")):
2476
parser.error("Needs port or socket to work without Zeroconf")
1667
2478
# For convenience
1668
debug = server_settings[u"debug"]
1669
use_dbus = server_settings[u"use_dbus"]
1670
use_ipv6 = server_settings[u"use_ipv6"]
1673
syslogger.setLevel(logging.WARNING)
1674
console.setLevel(logging.WARNING)
1676
if server_settings[u"servicename"] != u"Mandos":
1677
syslogger.setFormatter(logging.Formatter
1678
(u'Mandos (%s) [%%(process)d]:'
1679
u' %%(levelname)s: %%(message)s'
1680
% server_settings[u"servicename"]))
2479
debug = server_settings["debug"]
2480
debuglevel = server_settings["debuglevel"]
2481
use_dbus = server_settings["use_dbus"]
2482
use_ipv6 = server_settings["use_ipv6"]
2483
stored_state_path = os.path.join(server_settings["statedir"],
2485
foreground = server_settings["foreground"]
2486
zeroconf = server_settings["zeroconf"]
2489
initlogger(debug, logging.DEBUG)
2494
level = getattr(logging, debuglevel.upper())
2495
initlogger(debug, level)
2497
if server_settings["servicename"] != "Mandos":
2498
syslogger.setFormatter(
2499
logging.Formatter('Mandos ({}) [%(process)d]:'
2500
' %(levelname)s: %(message)s'.format(
2501
server_settings["servicename"])))
1682
2503
# Parse config file with clients
1683
client_defaults = { u"timeout": u"1h",
1685
u"checker": u"fping -q -- %%(host)s",
1687
u"approved_delay": u"5m",
1688
u"approved_duration": u"1s",
1690
client_config = configparser.SafeConfigParser(client_defaults)
1691
client_config.read(os.path.join(server_settings[u"configdir"],
2504
client_config = configparser.SafeConfigParser(Client
2506
client_config.read(os.path.join(server_settings["configdir"],
1694
2509
global mandos_dbus_service
1695
2510
mandos_dbus_service = None
1697
tcp_server = MandosServer((server_settings[u"address"],
1698
server_settings[u"port"]),
1700
interface=server_settings[u"interface"],
1703
server_settings[u"priority"],
1705
pidfilename = u"/var/run/mandos.pid"
1707
pidfile = open(pidfilename, u"w")
1709
logger.error(u"Could not open file %r", pidfilename)
2513
if server_settings["socket"] != "":
2514
socketfd = server_settings["socket"]
2515
tcp_server = MandosServer(
2516
(server_settings["address"], server_settings["port"]),
2518
interface=(server_settings["interface"] or None),
2520
gnutls_priority=server_settings["priority"],
2524
pidfilename = "/run/mandos.pid"
2525
if not os.path.isdir("/run/."):
2526
pidfilename = "/var/run/mandos.pid"
2529
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2530
except IOError as e:
2531
logger.error("Could not open file %r", pidfilename,
1712
uid = pwd.getpwnam(u"_mandos").pw_uid
1713
gid = pwd.getpwnam(u"_mandos").pw_gid
2534
for name in ("_mandos", "mandos", "nobody"):
1716
uid = pwd.getpwnam(u"mandos").pw_uid
1717
gid = pwd.getpwnam(u"mandos").pw_gid
2536
uid = pwd.getpwnam(name).pw_uid
2537
gid = pwd.getpwnam(name).pw_gid
1718
2539
except KeyError:
1720
uid = pwd.getpwnam(u"nobody").pw_uid
1721
gid = pwd.getpwnam(u"nobody").pw_gid
1728
except OSError, error:
1729
if error[0] != errno.EPERM:
2547
except OSError as error:
2548
if error.errno != errno.EPERM:
1732
# Enable all possible GnuTLS debugging
2552
# Enable all possible GnuTLS debugging
1734
2554
# "Use a log level over 10 to enable all debugging options."
1735
2555
# - GnuTLS manual
1736
2556
gnutls.library.functions.gnutls_global_set_log_level(11)
1738
2558
@gnutls.library.types.gnutls_log_func
1739
2559
def debug_gnutls(level, string):
1740
logger.debug(u"GnuTLS: %s", string[:-1])
1742
(gnutls.library.functions
1743
.gnutls_global_set_log_function(debug_gnutls))
2560
logger.debug("GnuTLS: %s", string[:-1])
2562
gnutls.library.functions.gnutls_global_set_log_function(
2565
# Redirect stdin so all checkers get /dev/null
2566
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2567
os.dup2(null, sys.stdin.fileno())
2571
# Need to fork before connecting to D-Bus
2573
# Close all input and output, do double fork, etc.
2576
# multiprocessing will use threads, so before we use gobject we
2577
# need to inform gobject that threads will be used.
2578
gobject.threads_init()
1745
2580
global main_loop
1746
2581
# From the Avahi example code
1747
DBusGMainLoop(set_as_default=True )
2582
DBusGMainLoop(set_as_default=True)
1748
2583
main_loop = gobject.MainLoop()
1749
2584
bus = dbus.SystemBus()
1750
2585
# End of Avahi example code
1753
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1754
bus, do_not_queue=True)
1755
except dbus.exceptions.NameExistsException, e:
1756
logger.error(unicode(e) + u", disabling D-Bus")
2588
bus_name = dbus.service.BusName("se.recompile.Mandos",
2591
old_bus_name = dbus.service.BusName(
2592
"se.bsnet.fukt.Mandos", bus,
2594
except dbus.exceptions.DBusException as e:
2595
logger.error("Disabling D-Bus:", exc_info=e)
1757
2596
use_dbus = False
1758
server_settings[u"use_dbus"] = False
2597
server_settings["use_dbus"] = False
1759
2598
tcp_server.use_dbus = False
1760
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1761
service = AvahiService(name = server_settings[u"servicename"],
1762
servicetype = u"_mandos._tcp",
1763
protocol = protocol, bus = bus)
1764
if server_settings["interface"]:
1765
service.interface = (if_nametoindex
1766
(str(server_settings[u"interface"])))
2600
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2601
service = AvahiServiceToSyslog(
2602
name = server_settings["servicename"],
2603
servicetype = "_mandos._tcp",
2604
protocol = protocol,
2606
if server_settings["interface"]:
2607
service.interface = if_nametoindex(
2608
server_settings["interface"].encode("utf-8"))
2610
global multiprocessing_manager
2611
multiprocessing_manager = multiprocessing.Manager()
1768
2613
client_class = Client
1770
2615
client_class = functools.partial(ClientDBus, bus = bus)
1771
def client_config_items(config, section):
1772
special_settings = {
1773
"approved_by_default":
1774
lambda: config.getboolean(section,
1775
"approved_by_default"),
1777
for name, value in config.items(section):
2617
client_settings = Client.config_parser(client_config)
2618
old_client_settings = {}
2621
# This is used to redirect stdout and stderr for checker processes
2623
wnull = open(os.devnull, "w") # A writable /dev/null
2624
# Only used if server is running in foreground but not in debug
2626
if debug or not foreground:
2629
# Get client data and settings from last running state.
2630
if server_settings["restore"]:
2632
with open(stored_state_path, "rb") as stored_state:
2633
clients_data, old_client_settings = pickle.load(
2635
os.remove(stored_state_path)
2636
except IOError as e:
2637
if e.errno == errno.ENOENT:
2638
logger.warning("Could not load persistent state:"
2639
" {}".format(os.strerror(e.errno)))
2641
logger.critical("Could not load persistent state:",
2644
except EOFError as e:
2645
logger.warning("Could not load persistent state: "
2649
with PGPEngine() as pgp:
2650
for client_name, client in clients_data.items():
2651
# Skip removed clients
2652
if client_name not in client_settings:
2655
# Decide which value to use after restoring saved state.
2656
# We have three different values: Old config file,
2657
# new config file, and saved state.
2658
# New config value takes precedence if it differs from old
2659
# config value, otherwise use saved state.
2660
for name, value in client_settings[client_name].items():
2662
# For each value in new config, check if it
2663
# differs from the old config value (Except for
2664
# the "secret" attribute)
2665
if (name != "secret"
2667
old_client_settings[client_name][name])):
2668
client[name] = value
2672
# Clients who has passed its expire date can still be
2673
# enabled if its last checker was successful. A Client
2674
# whose checker succeeded before we stored its state is
2675
# assumed to have successfully run all checkers during
2677
if client["enabled"]:
2678
if datetime.datetime.utcnow() >= client["expires"]:
2679
if not client["last_checked_ok"]:
2681
"disabling client {} - Client never "
2682
"performed a successful checker".format(
2684
client["enabled"] = False
2685
elif client["last_checker_status"] != 0:
2687
"disabling client {} - Client last"
2688
" checker failed with error code"
2691
client["last_checker_status"]))
2692
client["enabled"] = False
2694
client["expires"] = (
2695
datetime.datetime.utcnow()
2696
+ client["timeout"])
2697
logger.debug("Last checker succeeded,"
2698
" keeping {} enabled".format(
1779
yield (name, special_settings[name]())
1783
tcp_server.clients.update(set(
1784
client_class(name = section,
1785
config= dict(client_config_items(
1786
client_config, section)))
1787
for section in client_config.sections()))
2701
client["secret"] = pgp.decrypt(
2702
client["encrypted_secret"],
2703
client_settings[client_name]["secret"])
2705
# If decryption fails, we use secret from new settings
2706
logger.debug("Failed to decrypt {} old secret".format(
2708
client["secret"] = (client_settings[client_name]
2711
# Add/remove clients based on new changes made to config
2712
for client_name in (set(old_client_settings)
2713
- set(client_settings)):
2714
del clients_data[client_name]
2715
for client_name in (set(client_settings)
2716
- set(old_client_settings)):
2717
clients_data[client_name] = client_settings[client_name]
2719
# Create all client objects
2720
for client_name, client in clients_data.items():
2721
tcp_server.clients[client_name] = client_class(
2724
server_settings = server_settings)
1788
2726
if not tcp_server.clients:
1789
logger.warning(u"No clients defined")
1792
# Redirect stdin so all checkers get /dev/null
1793
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1794
os.dup2(null, sys.stdin.fileno())
1798
# No console logging
1799
logger.removeHandler(console)
1800
# Close all input and output, do double fork, etc.
2727
logger.warning("No clients defined")
2730
if pidfile is not None:
1805
2731
pid = os.getpid()
1806
pidfile.write(str(pid) + "\n")
2734
print(pid, file=pidfile)
2736
logger.error("Could not write to file %r with PID %d",
1809
logger.error(u"Could not write to file %r with PID %d",
1812
# "pidfile" was never created
1817
signal.signal(signal.SIGINT, signal.SIG_IGN)
1818
2741
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1819
2742
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1822
class MandosDBusService(dbus.service.Object):
2746
@alternate_dbus_interfaces(
2747
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2748
class MandosDBusService(DBusObjectWithProperties):
1823
2749
"""A D-Bus proxy object"""
1824
2751
def __init__(self):
1825
dbus.service.Object.__init__(self, bus, u"/")
1826
_interface = u"se.bsnet.fukt.Mandos"
1828
@dbus.service.signal(_interface, signature=u"o")
2752
dbus.service.Object.__init__(self, bus, "/")
2754
_interface = "se.recompile.Mandos"
2756
@dbus_interface_annotations(_interface)
2759
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2762
@dbus.service.signal(_interface, signature="o")
1829
2763
def ClientAdded(self, objpath):
1833
@dbus.service.signal(_interface, signature=u"ss")
2767
@dbus.service.signal(_interface, signature="ss")
1834
2768
def ClientNotFound(self, fingerprint, address):
1838
@dbus.service.signal(_interface, signature=u"os")
2772
@dbus.service.signal(_interface, signature="os")
1839
2773
def ClientRemoved(self, objpath, name):
1843
@dbus.service.method(_interface, out_signature=u"ao")
2777
@dbus.service.method(_interface, out_signature="ao")
1844
2778
def GetAllClients(self):
1846
return dbus.Array(c.dbus_object_path
1847
for c in tcp_server.clients)
2780
return dbus.Array(c.dbus_object_path for c in
2781
tcp_server.clients.itervalues())
1849
2783
@dbus.service.method(_interface,
1850
out_signature=u"a{oa{sv}}")
2784
out_signature="a{oa{sv}}")
1851
2785
def GetAllClientsWithProperties(self):
1853
2787
return dbus.Dictionary(
1854
((c.dbus_object_path, c.GetAll(u""))
1855
for c in tcp_server.clients),
1856
signature=u"oa{sv}")
2788
{ c.dbus_object_path: c.GetAll("")
2789
for c in tcp_server.clients.itervalues() },
1858
@dbus.service.method(_interface, in_signature=u"o")
2792
@dbus.service.method(_interface, in_signature="o")
1859
2793
def RemoveClient(self, object_path):
1861
for c in tcp_server.clients:
2795
for c in tcp_server.clients.itervalues():
1862
2796
if c.dbus_object_path == object_path:
1863
tcp_server.clients.remove(c)
2797
del tcp_server.clients[c.name]
1864
2798
c.remove_from_connection()
1865
2799
# Don't signal anything except ClientRemoved
1866
2800
c.disable(quiet=True)
1877
2811
"Cleanup function; run on exit"
2815
multiprocessing.active_children()
2817
if not (tcp_server.clients or client_settings):
2820
# Store client before exiting. Secrets are encrypted with key
2821
# based on what config file has. If config file is
2822
# removed/edited, old secret will thus be unrecovable.
2824
with PGPEngine() as pgp:
2825
for client in tcp_server.clients.itervalues():
2826
key = client_settings[client.name]["secret"]
2827
client.encrypted_secret = pgp.encrypt(client.secret,
2831
# A list of attributes that can not be pickled
2833
exclude = { "bus", "changedstate", "secret",
2834
"checker", "server_settings" }
2835
for name, typ in inspect.getmembers(dbus.service
2839
client_dict["encrypted_secret"] = (client
2841
for attr in client.client_structure:
2842
if attr not in exclude:
2843
client_dict[attr] = getattr(client, attr)
2845
clients[client.name] = client_dict
2846
del client_settings[client.name]["secret"]
2849
with tempfile.NamedTemporaryFile(
2853
dir=os.path.dirname(stored_state_path),
2854
delete=False) as stored_state:
2855
pickle.dump((clients, client_settings), stored_state)
2856
tempname = stored_state.name
2857
os.rename(tempname, stored_state_path)
2858
except (IOError, OSError) as e:
2864
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2865
logger.warning("Could not save persistent state: {}"
2866
.format(os.strerror(e.errno)))
2868
logger.warning("Could not save persistent state:",
2872
# Delete all clients, and settings from config
1880
2873
while tcp_server.clients:
1881
client = tcp_server.clients.pop()
2874
name, client = tcp_server.clients.popitem()
1883
2876
client.remove_from_connection()
1884
client.disable_hook = None
1885
2877
# Don't signal anything except ClientRemoved
1886
2878
client.disable(quiet=True)
1888
2880
# Emit D-Bus signal
1889
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2881
mandos_dbus_service.ClientRemoved(
2882
client.dbus_object_path, client.name)
2883
client_settings.clear()
1892
2885
atexit.register(cleanup)
1894
for client in tcp_server.clients:
2887
for client in tcp_server.clients.itervalues():
1896
2889
# Emit D-Bus signal
1897
2890
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2891
# Need to initiate checking of clients
2893
client.init_checker()
1900
2895
tcp_server.enable()
1901
2896
tcp_server.server_activate()
1903
2898
# Find out what port we got
1904
service.port = tcp_server.socket.getsockname()[1]
2900
service.port = tcp_server.socket.getsockname()[1]
1906
logger.info(u"Now listening on address %r, port %d,"
1907
" flowinfo %d, scope_id %d"
1908
% tcp_server.socket.getsockname())
2902
logger.info("Now listening on address %r, port %d,"
2903
" flowinfo %d, scope_id %d",
2904
*tcp_server.socket.getsockname())
1910
logger.info(u"Now listening on address %r, port %d"
1911
% tcp_server.socket.getsockname())
2906
logger.info("Now listening on address %r, port %d",
2907
*tcp_server.socket.getsockname())
1913
2909
#service.interface = tcp_server.socket.getsockname()[3]
1916
# From the Avahi example code
1919
except dbus.exceptions.DBusException, error:
1920
logger.critical(u"DBusException: %s", error)
1923
# End of Avahi example code
2913
# From the Avahi example code
2916
except dbus.exceptions.DBusException as error:
2917
logger.critical("D-Bus Exception", exc_info=error)
2920
# End of Avahi example code
1925
2922
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1926
2923
lambda *args, **kwargs:
1927
2924
(tcp_server.handle_request
1928
2925
(*args[2:], **kwargs) or True))
1930
logger.debug(u"Starting main loop")
2927
logger.debug("Starting main loop")
1931
2928
main_loop.run()
1932
except AvahiError, error:
1933
logger.critical(u"AvahiError: %s", error)
2929
except AvahiError as error:
2930
logger.critical("Avahi Error", exc_info=error)
1936
2933
except KeyboardInterrupt:
1939
logger.debug(u"Server received KeyboardInterrupt")
1940
logger.debug(u"Server exiting")
2935
print("", file=sys.stderr)
2936
logger.debug("Server received KeyboardInterrupt")
2937
logger.debug("Server exiting")
1941
2938
# Must run before the D-Bus bus name gets deregistered
1944
2942
if __name__ == '__main__':