To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-ctl
- browse files at revision 1057
- compare with another revision
- download diff
- download tarball
- view history from revision 1057
- Committer: Teddy Hogeborn
- Date: 2019-03-12 20:27:39 UTC
- Revision ID: teddy@recompile.se-20190312202739-sa7fhlxuqg1soimk
mandos-ctl: Refactor
* mandos-ctl (TestPrintTableCmd.test_one_client): Change format of
"expected_output" definition to match other tests, for consistency.
* mandos-ctl (TestPrintTableCmd.test_one_client): Change format of
"expected_output" definition to match other tests, for consistency.
- files modified:
- TODO
added
removed
mandos-ctl
45
45
import io
46
46
import tempfile
47
47
import contextlib
48
import abc
49
48
50
import dbus as dbus_python
49
import dbus
51
50
52
51
# Show warnings by default
53
52
if not sys.warnoptions:
62
61
63
62
if sys.version_info.major == 2:
64
63
str = unicode
65
import StringIO
66
io.StringIO = StringIO.StringIO
67
64
68
65
locale.setlocale(locale.LC_ALL, "")
69
66
67
dbus_busname_domain = "se.recompile"
68
dbus_busname = dbus_busname_domain + ".Mandos"
69
server_dbus_path = "/"
70
server_dbus_interface = dbus_busname_domain + ".Mandos"
71
client_dbus_interface = dbus_busname_domain + ".Mandos.Client"
72
del dbus_busname_domain
70
73
version = "1.8.3"
71
74
72
75
76
try:
77
dbus.OBJECT_MANAGER_IFACE
78
except AttributeError:
79
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
80
81
73
82
def main():
74
83
parser = argparse.ArgumentParser()
84
75
85
add_command_line_options(parser)
76
86
77
87
options = parser.parse_args()
88
78
89
check_option_syntax(parser, options)
79
90
80
91
clientnames = options.client
82
93
if options.debug:
83
94
log.setLevel(logging.DEBUG)
84
95
85
bus = dbus_python_adapter.CachingBus(dbus_python)
86
87
try:
88
all_clients = bus.get_clients_and_properties()
89
except dbus.ConnectFailed as e:
90
log.critical("Could not connect to Mandos server: %s", e)
91
sys.exit(1)
92
except dbus.Error as e:
93
log.critical(
94
"Failed to access Mandos server through D-Bus:\n%s", e)
95
sys.exit(1)
96
97
# Compile dict of (clientpath: properties) to process
96
try:
97
bus = dbus.SystemBus()
98
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
99
dbus_busname, server_dbus_path)
100
mandos_dbus_objc = bus.get_object(dbus_busname,
101
server_dbus_path)
102
except dbus.exceptions.DBusException:
103
log.critical("Could not connect to Mandos server")
104
sys.exit(1)
105
106
mandos_serv = dbus.Interface(mandos_dbus_objc,
107
dbus_interface=server_dbus_interface)
108
mandos_serv_object_manager = dbus.Interface(
109
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
110
111
# Filter out log message from dbus module
112
dbus_logger = logging.getLogger("dbus.proxies")
113
class NullFilter(logging.Filter):
114
def filter(self, record):
115
return False
116
dbus_filter = NullFilter()
117
try:
118
dbus_logger.addFilter(dbus_filter)
119
log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
120
server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
121
mandos_clients = {path: ifs_and_props[client_dbus_interface]
122
for path, ifs_and_props in
123
mandos_serv_object_manager
124
.GetManagedObjects().items()
125
if client_dbus_interface in ifs_and_props}
126
except dbus.exceptions.DBusException as e:
127
log.critical("Failed to access Mandos server through D-Bus:"
128
"\n%s", e)
129
sys.exit(1)
130
finally:
131
# restore dbus logger
132
dbus_logger.removeFilter(dbus_filter)
133
134
# Compile dict of (clients: properties) to process
135
clients = {}
136
98
137
if not clientnames:
99
clients = all_clients
138
clients = {objpath: properties
139
for objpath, properties in mandos_clients.items()}
100
140
else:
101
clients = {}
102
141
for name in clientnames:
103
for objpath, properties in all_clients.items():
142
for objpath, properties in mandos_clients.items():
104
143
if properties["Name"] == name:
105
144
clients[objpath] = properties
106
145
break
108
147
log.critical("Client not found on server: %r", name)
109
148
sys.exit(1)
110
149
150
# Run all commands on clients
111
151
commands = commands_from_options(options)
112
113
152
for command in commands:
114
command.run(clients, bus)
153
command.run(clients, bus, mandos_serv)
115
154
116
155
117
156
def add_command_line_options(parser):
215
254
>>> rfc3339_duration_to_delta("")
216
255
Traceback (most recent call last):
217
256
...
218
ValueError: Invalid RFC 3339 duration: ""
257
ValueError: Invalid RFC 3339 duration: u''
219
258
>>> # Must start with "P":
220
259
>>> rfc3339_duration_to_delta("1D")
221
260
Traceback (most recent call last):
222
261
...
223
ValueError: Invalid RFC 3339 duration: "1D"
262
ValueError: Invalid RFC 3339 duration: u'1D'
224
263
>>> # Must use correct order
225
264
>>> rfc3339_duration_to_delta("PT1S2M")
226
265
Traceback (most recent call last):
227
266
...
228
ValueError: Invalid RFC 3339 duration: "PT1S2M"
267
ValueError: Invalid RFC 3339 duration: u'PT1S2M'
229
268
>>> # Time needs time marker
230
269
>>> rfc3339_duration_to_delta("P1H2S")
231
270
Traceback (most recent call last):
232
271
...
233
ValueError: Invalid RFC 3339 duration: "P1H2S"
272
ValueError: Invalid RFC 3339 duration: u'P1H2S'
234
273
>>> # Weeks can not be combined with anything else
235
274
>>> rfc3339_duration_to_delta("P1D2W")
236
275
Traceback (most recent call last):
237
276
...
238
ValueError: Invalid RFC 3339 duration: "P1D2W"
277
ValueError: Invalid RFC 3339 duration: u'P1D2W'
239
278
>>> rfc3339_duration_to_delta("P2W2H")
240
279
Traceback (most recent call last):
241
280
...
242
ValueError: Invalid RFC 3339 duration: "P2W2H"
281
ValueError: Invalid RFC 3339 duration: u'P2W2H'
243
282
"""
244
283
245
284
# Parsing an RFC 3339 duration with regular expressions is not
316
355
break
317
356
else:
318
357
# No currently valid tokens were found
319
raise ValueError("Invalid RFC 3339 duration: \"{}\""
358
raise ValueError("Invalid RFC 3339 duration: {!r}"
320
359
.format(duration))
321
360
# End token found
322
361
return value
407
446
options.remove = True
408
447
409
448
410
411
class dbus(object):
412
413
class SystemBus(object):
414
415
object_manager_iface = "org.freedesktop.DBus.ObjectManager"
416
def get_managed_objects(self, busname, objectpath):
417
return self.call_method("GetManagedObjects", busname,
418
objectpath,
419
self.object_manager_iface)
420
421
properties_iface = "org.freedesktop.DBus.Properties"
422
def set_property(self, busname, objectpath, interface, key,
423
value):
424
self.call_method("Set", busname, objectpath,
425
self.properties_iface, interface, key,
426
value)
427
428
429
class MandosBus(SystemBus):
430
busname_domain = "se.recompile"
431
busname = busname_domain + ".Mandos"
432
server_path = "/"
433
server_interface = busname_domain + ".Mandos"
434
client_interface = busname_domain + ".Mandos.Client"
435
del busname_domain
436
437
def get_clients_and_properties(self):
438
managed_objects = self.get_managed_objects(
439
self.busname, self.server_path)
440
return {objpath: properties[self.client_interface]
441
for objpath, properties in managed_objects.items()
442
if self.client_interface in properties}
443
444
def set_client_property(self, objectpath, key, value):
445
return self.set_property(self.busname, objectpath,
446
self.client_interface, key,
447
value)
448
449
def call_client_method(self, objectpath, method, *args):
450
return self.call_method(method, self.busname, objectpath,
451
self.client_interface, *args)
452
453
def call_server_method(self, method, *args):
454
return self.call_method(method, self.busname,
455
self.server_path,
456
self.server_interface, *args)
457
458
class Error(Exception):
459
pass
460
461
class ConnectFailed(Error):
462
pass
463
464
465
class dbus_python_adapter(object):
466
467
class SystemBus(dbus.MandosBus):
468
"""Use dbus-python"""
469
470
def __init__(self, module=dbus_python):
471
self.dbus_python = module
472
self.bus = self.dbus_python.SystemBus()
473
474
@contextlib.contextmanager
475
def convert_exception(self, exception_class=dbus.Error):
476
try:
477
yield
478
except self.dbus_python.exceptions.DBusException as e:
479
# This does what "raise from" would do
480
exc = exception_class(*e.args)
481
exc.__cause__ = e
482
raise exc
483
484
def call_method(self, methodname, busname, objectpath,
485
interface, *args):
486
proxy_object = self.get_object(busname, objectpath)
487
log.debug("D-Bus: %s:%s:%s.%s(%s)", busname, objectpath,
488
interface, methodname,
489
", ".join(repr(a) for a in args))
490
method = getattr(proxy_object, methodname)
491
with self.convert_exception():
492
with dbus_python_adapter.SilenceLogger(
493
"dbus.proxies"):
494
value = method(*args, dbus_interface=interface)
495
return self.type_filter(value)
496
497
def get_object(self, busname, objectpath):
498
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
499
busname, objectpath)
500
with self.convert_exception(dbus.ConnectFailed):
501
return self.bus.get_object(busname, objectpath)
502
503
def type_filter(self, value):
504
"""Convert the most bothersome types to Python types"""
505
if isinstance(value, self.dbus_python.Boolean):
506
return bool(value)
507
if isinstance(value, self.dbus_python.ObjectPath):
508
return str(value)
509
# Also recurse into dictionaries
510
if isinstance(value, self.dbus_python.Dictionary):
511
return {self.type_filter(key):
512
self.type_filter(subval)
513
for key, subval in value.items()}
514
return value
515
516
517
class SilenceLogger(object):
518
"Simple context manager to silence a particular logger"
519
def __init__(self, loggername):
520
self.logger = logging.getLogger(loggername)
521
522
def __enter__(self):
523
self.logger.addFilter(self.nullfilter)
524
525
class NullFilter(logging.Filter):
526
def filter(self, record):
527
return False
528
529
nullfilter = NullFilter()
530
531
def __exit__(self, exc_type, exc_val, exc_tb):
532
self.logger.removeFilter(self.nullfilter)
533
534
535
class CachingBus(SystemBus):
536
"""A caching layer for dbus_python_adapter.SystemBus"""
537
def __init__(self, *args, **kwargs):
538
self.object_cache = {}
539
super(dbus_python_adapter.CachingBus,
540
self).__init__(*args, **kwargs)
541
def get_object(self, busname, objectpath):
542
try:
543
return self.object_cache[(busname, objectpath)]
544
except KeyError:
545
new_object = super(
546
dbus_python_adapter.CachingBus,
547
self).get_object(busname, objectpath)
548
self.object_cache[(busname, objectpath)] = new_object
549
return new_object
550
551
552
449
def commands_from_options(options):
553
450
554
451
commands = []
555
452
556
453
if options.is_enabled:
557
commands.append(command.IsEnabled())
454
commands.append(IsEnabledCmd())
558
455
559
456
if options.approve:
560
commands.append(command.Approve())
457
commands.append(ApproveCmd())
561
458
562
459
if options.deny:
563
commands.append(command.Deny())
460
commands.append(DenyCmd())
564
461
565
462
if options.remove:
566
commands.append(command.Remove())
463
commands.append(RemoveCmd())
567
464
568
465
if options.dump_json:
569
commands.append(command.DumpJSON())
466
commands.append(DumpJSONCmd())
570
467
571
468
if options.enable:
572
commands.append(command.Enable())
469
commands.append(EnableCmd())
573
470
574
471
if options.disable:
575
commands.append(command.Disable())
472
commands.append(DisableCmd())
576
473
577
474
if options.bump_timeout:
578
commands.append(command.BumpTimeout())
475
commands.append(BumpTimeoutCmd())
579
476
580
477
if options.start_checker:
581
commands.append(command.StartChecker())
478
commands.append(StartCheckerCmd())
582
479
583
480
if options.stop_checker:
584
commands.append(command.StopChecker())
481
commands.append(StopCheckerCmd())
585
482
586
483
if options.approved_by_default is not None:
587
484
if options.approved_by_default:
588
commands.append(command.ApproveByDefault())
485
commands.append(ApproveByDefaultCmd())
589
486
else:
590
commands.append(command.DenyByDefault())
487
commands.append(DenyByDefaultCmd())
591
488
592
489
if options.checker is not None:
593
commands.append(command.SetChecker(options.checker))
490
commands.append(SetCheckerCmd(options.checker))
594
491
595
492
if options.host is not None:
596
commands.append(command.SetHost(options.host))
493
commands.append(SetHostCmd(options.host))
597
494
598
495
if options.secret is not None:
599
commands.append(command.SetSecret(options.secret))
496
commands.append(SetSecretCmd(options.secret))
600
497
601
498
if options.timeout is not None:
602
commands.append(command.SetTimeout(options.timeout))
499
commands.append(SetTimeoutCmd(options.timeout))
603
500
604
501
if options.extended_timeout:
605
502
commands.append(
606
command.SetExtendedTimeout(options.extended_timeout))
503
SetExtendedTimeoutCmd(options.extended_timeout))
607
504
608
505
if options.interval is not None:
609
commands.append(command.SetInterval(options.interval))
506
commands.append(SetIntervalCmd(options.interval))
610
507
611
508
if options.approval_delay is not None:
612
commands.append(
613
command.SetApprovalDelay(options.approval_delay))
509
commands.append(SetApprovalDelayCmd(options.approval_delay))
614
510
615
511
if options.approval_duration is not None:
616
512
commands.append(
617
command.SetApprovalDuration(options.approval_duration))
513
SetApprovalDurationCmd(options.approval_duration))
618
514
619
515
# If no command option has been given, show table of clients,
620
516
# optionally verbosely
621
517
if not commands:
622
commands.append(command.PrintTable(verbose=options.verbose))
518
commands.append(PrintTableCmd(verbose=options.verbose))
623
519
624
520
return commands
625
521
626
522
627
class command(object):
628
"""A namespace for command classes"""
629
630
class Base(object):
631
"""Abstract base class for commands"""
632
def run(self, clients, bus=None):
633
"""Normal commands should implement run_on_one_client(),
634
but commands which want to operate on all clients at the same time can
635
override this run() method instead.
636
"""
637
self.bus = bus
638
for client, properties in clients.items():
639
self.run_on_one_client(client, properties)
640
641
642
class IsEnabled(Base):
643
def run(self, clients, bus=None):
644
properties = next(iter(clients.values()))
645
if properties["Enabled"]:
646
sys.exit(0)
647
sys.exit(1)
648
649
650
class Approve(Base):
651
def run_on_one_client(self, client, properties):
652
self.bus.call_client_method(client, "Approve", True)
653
654
655
class Deny(Base):
656
def run_on_one_client(self, client, properties):
657
self.bus.call_client_method(client, "Approve", False)
658
659
660
class Remove(Base):
661
def run(self, clients, bus):
662
for clientpath in frozenset(clients.keys()):
663
bus.call_server_method("RemoveClient", clientpath)
664
665
666
class Output(Base):
667
"""Abstract class for commands outputting client details"""
668
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
669
"Created", "Interval", "Host", "KeyID",
670
"Fingerprint", "CheckerRunning",
671
"LastEnabled", "ApprovalPending",
672
"ApprovedByDefault", "LastApprovalRequest",
673
"ApprovalDelay", "ApprovalDuration",
674
"Checker", "ExtendedTimeout", "Expires",
675
"LastCheckerStatus")
676
677
678
class DumpJSON(Output):
679
def run(self, clients, bus=None):
680
data = {properties["Name"]:
681
{key: properties[key]
682
for key in self.all_keywords}
683
for properties in clients.values()}
684
print(json.dumps(data, indent=4, separators=(',', ': ')))
685
686
687
class PrintTable(Output):
688
def __init__(self, verbose=False):
689
self.verbose = verbose
690
691
def run(self, clients, bus=None):
692
default_keywords = ("Name", "Enabled", "Timeout",
693
"LastCheckedOK")
694
keywords = default_keywords
695
if self.verbose:
696
keywords = self.all_keywords
697
print(self.TableOfClients(clients.values(), keywords))
698
699
class TableOfClients(object):
700
tableheaders = {
701
"Name": "Name",
702
"Enabled": "Enabled",
703
"Timeout": "Timeout",
704
"LastCheckedOK": "Last Successful Check",
705
"LastApprovalRequest": "Last Approval Request",
706
"Created": "Created",
707
"Interval": "Interval",
708
"Host": "Host",
709
"Fingerprint": "Fingerprint",
710
"KeyID": "Key ID",
711
"CheckerRunning": "Check Is Running",
712
"LastEnabled": "Last Enabled",
713
"ApprovalPending": "Approval Is Pending",
714
"ApprovedByDefault": "Approved By Default",
715
"ApprovalDelay": "Approval Delay",
716
"ApprovalDuration": "Approval Duration",
717
"Checker": "Checker",
718
"ExtendedTimeout": "Extended Timeout",
719
"Expires": "Expires",
720
"LastCheckerStatus": "Last Checker Status",
721
}
722
723
def __init__(self, clients, keywords):
724
self.clients = clients
725
self.keywords = keywords
726
523
class Command(object):
524
"""Abstract class for commands"""
525
def run(self, clients, bus=None, mandos=None):
526
"""Normal commands should implement run_on_one_client(), but
527
commands which want to operate on all clients at the same time
528
can override this run() method instead."""
529
self.mandos = mandos
530
for clientpath, properties in clients.items():
531
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
532
dbus_busname, str(clientpath))
533
client = bus.get_object(dbus_busname, clientpath)
534
self.run_on_one_client(client, properties)
535
536
537
class IsEnabledCmd(Command):
538
def run(self, clients, bus=None, mandos=None):
539
client, properties = next(iter(clients.items()))
540
if self.is_enabled(client, properties):
541
sys.exit(0)
542
sys.exit(1)
543
def is_enabled(self, client, properties):
544
return properties["Enabled"]
545
546
547
class ApproveCmd(Command):
548
def run_on_one_client(self, client, properties):
549
log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
550
client.__dbus_object_path__, client_dbus_interface)
551
client.Approve(dbus.Boolean(True),
552
dbus_interface=client_dbus_interface)
553
554
555
class DenyCmd(Command):
556
def run_on_one_client(self, client, properties):
557
log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
558
client.__dbus_object_path__, client_dbus_interface)
559
client.Approve(dbus.Boolean(False),
560
dbus_interface=client_dbus_interface)
561
562
563
class RemoveCmd(Command):
564
def run_on_one_client(self, client, properties):
565
log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
566
server_dbus_path, server_dbus_interface,
567
str(client.__dbus_object_path__))
568
self.mandos.RemoveClient(client.__dbus_object_path__)
569
570
571
class PrintCmd(Command):
572
"""Abstract class for commands printing client details"""
573
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
574
"Created", "Interval", "Host", "KeyID",
575
"Fingerprint", "CheckerRunning", "LastEnabled",
576
"ApprovalPending", "ApprovedByDefault",
577
"LastApprovalRequest", "ApprovalDelay",
578
"ApprovalDuration", "Checker", "ExtendedTimeout",
579
"Expires", "LastCheckerStatus")
580
def run(self, clients, bus=None, mandos=None):
581
print(self.output(clients.values()))
582
def output(self, clients):
583
raise NotImplementedError()
584
585
586
class DumpJSONCmd(PrintCmd):
587
def output(self, clients):
588
data = {client["Name"]:
589
{key: self.dbus_boolean_to_bool(client[key])
590
for key in self.all_keywords}
591
for client in clients.values()}
592
return json.dumps(data, indent=4, separators=(',', ': '))
593
@staticmethod
594
def dbus_boolean_to_bool(value):
595
if isinstance(value, dbus.Boolean):
596
value = bool(value)
597
return value
598
599
600
class PrintTableCmd(PrintCmd):
601
def __init__(self, verbose=False):
602
self.verbose = verbose
603
604
def output(self, clients):
605
default_keywords = ("Name", "Enabled", "Timeout",
606
"LastCheckedOK")
607
keywords = default_keywords
608
if self.verbose:
609
keywords = self.all_keywords
610
return str(self.TableOfClients(clients, keywords))
611
612
class TableOfClients(object):
613
tableheaders = {
614
"Name": "Name",
615
"Enabled": "Enabled",
616
"Timeout": "Timeout",
617
"LastCheckedOK": "Last Successful Check",
618
"LastApprovalRequest": "Last Approval Request",
619
"Created": "Created",
620
"Interval": "Interval",
621
"Host": "Host",
622
"Fingerprint": "Fingerprint",
623
"KeyID": "Key ID",
624
"CheckerRunning": "Check Is Running",
625
"LastEnabled": "Last Enabled",
626
"ApprovalPending": "Approval Is Pending",
627
"ApprovedByDefault": "Approved By Default",
628
"ApprovalDelay": "Approval Delay",
629
"ApprovalDuration": "Approval Duration",
630
"Checker": "Checker",
631
"ExtendedTimeout": "Extended Timeout",
632
"Expires": "Expires",
633
"LastCheckerStatus": "Last Checker Status",
634
}
635
636
def __init__(self, clients, keywords, tableheaders=None):
637
self.clients = clients
638
self.keywords = keywords
639
if tableheaders is not None:
640
self.tableheaders = tableheaders
641
642
def __str__(self):
643
return "\n".join(self.rows())
644
645
if sys.version_info.major == 2:
646
__unicode__ = __str__
727
647
def __str__(self):
728
return "\n".join(self.rows())
729
730
if sys.version_info.major == 2:
731
__unicode__ = __str__
732
def __str__(self):
733
return str(self).encode(
734
locale.getpreferredencoding())
735
736
def rows(self):
737
format_string = self.row_formatting_string()
738
rows = [self.header_line(format_string)]
739
rows.extend(self.client_line(client, format_string)
740
for client in self.clients)
741
return rows
742
743
def row_formatting_string(self):
744
"Format string used to format table rows"
745
return " ".join("{{{key}:{width}}}".format(
746
width=max(len(self.tableheaders[key]),
747
*(len(self.string_from_client(client,
748
key))
749
for client in self.clients)),
750
key=key)
751
for key in self.keywords)
752
753
def string_from_client(self, client, key):
754
return self.valuetostring(client[key], key)
755
756
@classmethod
757
def valuetostring(cls, value, keyword):
758
if isinstance(value, bool):
759
return "Yes" if value else "No"
760
if keyword in ("Timeout", "Interval", "ApprovalDelay",
761
"ApprovalDuration", "ExtendedTimeout"):
762
return cls.milliseconds_to_string(value)
763
return str(value)
764
765
def header_line(self, format_string):
766
return format_string.format(**self.tableheaders)
767
768
def client_line(self, client, format_string):
769
return format_string.format(
770
**{key: self.string_from_client(client, key)
771
for key in self.keywords})
772
773
@staticmethod
774
def milliseconds_to_string(ms):
775
td = datetime.timedelta(0, 0, 0, ms)
776
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
777
.format(days="{}T".format(td.days)
778
if td.days else "",
779
hours=td.seconds // 3600,
780
minutes=(td.seconds % 3600) // 60,
781
seconds=td.seconds % 60))
782
783
784
class PropertySetter(Base):
785
"Abstract class for Actions for setting one client property"
786
787
def run_on_one_client(self, client, properties=None):
788
"""Set the Client's D-Bus property"""
789
self.bus.set_client_property(client, self.propname,
790
self.value_to_set)
791
792
@property
793
def propname(self):
794
raise NotImplementedError()
795
796
797
class Enable(PropertySetter):
798
propname = "Enabled"
799
value_to_set = True
800
801
802
class Disable(PropertySetter):
803
propname = "Enabled"
804
value_to_set = False
805
806
807
class BumpTimeout(PropertySetter):
808
propname = "LastCheckedOK"
809
value_to_set = ""
810
811
812
class StartChecker(PropertySetter):
813
propname = "CheckerRunning"
814
value_to_set = True
815
816
817
class StopChecker(PropertySetter):
818
propname = "CheckerRunning"
819
value_to_set = False
820
821
822
class ApproveByDefault(PropertySetter):
823
propname = "ApprovedByDefault"
824
value_to_set = True
825
826
827
class DenyByDefault(PropertySetter):
828
propname = "ApprovedByDefault"
829
value_to_set = False
830
831
832
class PropertySetterValue(PropertySetter):
833
"""Abstract class for PropertySetter recieving a value as
834
constructor argument instead of a class attribute."""
835
def __init__(self, value):
836
self.value_to_set = value
837
838
839
class SetChecker(PropertySetterValue):
840
propname = "Checker"
841
842
843
class SetHost(PropertySetterValue):
844
propname = "Host"
845
846
847
class SetSecret(PropertySetterValue):
848
propname = "Secret"
849
850
@property
851
def value_to_set(self):
852
return self._vts
853
854
@value_to_set.setter
855
def value_to_set(self, value):
856
"""When setting, read data from supplied file object"""
857
self._vts = value.read()
858
value.close()
859
860
861
class PropertySetterValueMilliseconds(PropertySetterValue):
862
"""Abstract class for PropertySetterValue taking a value
863
argument as a datetime.timedelta() but should store it as
864
milliseconds."""
865
866
@property
867
def value_to_set(self):
868
return self._vts
869
870
@value_to_set.setter
871
def value_to_set(self, value):
872
"When setting, convert value from a datetime.timedelta"
873
self._vts = int(round(value.total_seconds() * 1000))
874
875
876
class SetTimeout(PropertySetterValueMilliseconds):
877
propname = "Timeout"
878
879
880
class SetExtendedTimeout(PropertySetterValueMilliseconds):
881
propname = "ExtendedTimeout"
882
883
884
class SetInterval(PropertySetterValueMilliseconds):
885
propname = "Interval"
886
887
888
class SetApprovalDelay(PropertySetterValueMilliseconds):
889
propname = "ApprovalDelay"
890
891
892
class SetApprovalDuration(PropertySetterValueMilliseconds):
893
propname = "ApprovalDuration"
648
return str(self).encode(locale.getpreferredencoding())
649
650
def rows(self):
651
format_string = self.row_formatting_string()
652
rows = [self.header_line(format_string)]
653
rows.extend(self.client_line(client, format_string)
654
for client in self.clients)
655
return rows
656
657
def row_formatting_string(self):
658
"Format string used to format table rows"
659
return " ".join("{{{key}:{width}}}".format(
660
width=max(len(self.tableheaders[key]),
661
*(len(self.string_from_client(client, key))
662
for client in self.clients)),
663
key=key)
664
for key in self.keywords)
665
666
def string_from_client(self, client, key):
667
return self.valuetostring(client[key], key)
668
669
@classmethod
670
def valuetostring(cls, value, keyword):
671
if isinstance(value, dbus.Boolean):
672
return "Yes" if value else "No"
673
if keyword in ("Timeout", "Interval", "ApprovalDelay",
674
"ApprovalDuration", "ExtendedTimeout"):
675
return cls.milliseconds_to_string(value)
676
return str(value)
677
678
def header_line(self, format_string):
679
return format_string.format(**self.tableheaders)
680
681
def client_line(self, client, format_string):
682
return format_string.format(
683
**{key: self.string_from_client(client, key)
684
for key in self.keywords})
685
686
@staticmethod
687
def milliseconds_to_string(ms):
688
td = datetime.timedelta(0, 0, 0, ms)
689
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
690
.format(days="{}T".format(td.days)
691
if td.days else "",
692
hours=td.seconds // 3600,
693
minutes=(td.seconds % 3600) // 60,
694
seconds=td.seconds % 60))
695
696
697
class PropertyCmd(Command):
698
"""Abstract class for Actions for setting one client property"""
699
def run_on_one_client(self, client, properties):
700
"""Set the Client's D-Bus property"""
701
log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
702
client.__dbus_object_path__,
703
dbus.PROPERTIES_IFACE, client_dbus_interface,
704
self.propname, self.value_to_set
705
if not isinstance(self.value_to_set, dbus.Boolean)
706
else bool(self.value_to_set))
707
client.Set(client_dbus_interface, self.propname,
708
self.value_to_set,
709
dbus_interface=dbus.PROPERTIES_IFACE)
710
@property
711
def propname(self):
712
raise NotImplementedError()
713
714
715
class EnableCmd(PropertyCmd):
716
propname = "Enabled"
717
value_to_set = dbus.Boolean(True)
718
719
720
class DisableCmd(PropertyCmd):
721
propname = "Enabled"
722
value_to_set = dbus.Boolean(False)
723
724
725
class BumpTimeoutCmd(PropertyCmd):
726
propname = "LastCheckedOK"
727
value_to_set = ""
728
729
730
class StartCheckerCmd(PropertyCmd):
731
propname = "CheckerRunning"
732
value_to_set = dbus.Boolean(True)
733
734
735
class StopCheckerCmd(PropertyCmd):
736
propname = "CheckerRunning"
737
value_to_set = dbus.Boolean(False)
738
739
740
class ApproveByDefaultCmd(PropertyCmd):
741
propname = "ApprovedByDefault"
742
value_to_set = dbus.Boolean(True)
743
744
745
class DenyByDefaultCmd(PropertyCmd):
746
propname = "ApprovedByDefault"
747
value_to_set = dbus.Boolean(False)
748
749
750
class PropertyValueCmd(PropertyCmd):
751
"""Abstract class for PropertyCmd recieving a value as argument"""
752
def __init__(self, value):
753
self.value_to_set = value
754
755
756
class SetCheckerCmd(PropertyValueCmd):
757
propname = "Checker"
758
759
760
class SetHostCmd(PropertyValueCmd):
761
propname = "Host"
762
763
764
class SetSecretCmd(PropertyValueCmd):
765
propname = "Secret"
766
@property
767
def value_to_set(self):
768
return self._vts
769
@value_to_set.setter
770
def value_to_set(self, value):
771
"""When setting, read data from supplied file object"""
772
self._vts = value.read()
773
value.close()
774
775
776
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
777
"""Abstract class for PropertyValueCmd taking a value argument as
778
a datetime.timedelta() but should store it as milliseconds."""
779
@property
780
def value_to_set(self):
781
return self._vts
782
@value_to_set.setter
783
def value_to_set(self, value):
784
"""When setting, convert value from a datetime.timedelta"""
785
self._vts = int(round(value.total_seconds() * 1000))
786
787
788
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
789
propname = "Timeout"
790
791
792
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
793
propname = "ExtendedTimeout"
794
795
796
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
797
propname = "Interval"
798
799
800
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
801
propname = "ApprovalDelay"
802
803
804
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
805
propname = "ApprovalDuration"
894
806
895
807
896
808
897
class TestCaseWithAssertLogs(unittest.TestCase):
898
"""unittest.TestCase.assertLogs only exists in Python 3.4"""
899
900
if not hasattr(unittest.TestCase, "assertLogs"):
901
@contextlib.contextmanager
902
def assertLogs(self, logger, level=logging.INFO):
903
capturing_handler = self.CapturingLevelHandler(level)
904
old_level = logger.level
905
old_propagate = logger.propagate
906
logger.addHandler(capturing_handler)
907
logger.setLevel(level)
908
logger.propagate = False
909
try:
910
yield capturing_handler.watcher
911
finally:
912
logger.propagate = old_propagate
913
logger.removeHandler(capturing_handler)
914
logger.setLevel(old_level)
915
self.assertGreater(len(capturing_handler.watcher.records),
916
0)
917
918
class CapturingLevelHandler(logging.Handler):
919
def __init__(self, level, *args, **kwargs):
920
logging.Handler.__init__(self, *args, **kwargs)
921
self.watcher = self.LoggingWatcher([], [])
922
def emit(self, record):
923
self.watcher.records.append(record)
924
self.watcher.output.append(self.format(record))
925
926
LoggingWatcher = collections.namedtuple("LoggingWatcher",
927
("records",
928
"output"))
929
930
931
class Unique(object):
932
"""Class for objects which exist only to be unique objects, since
933
unittest.mock.sentinel only exists in Python 3.3"""
934
935
936
class Test_string_to_delta(TestCaseWithAssertLogs):
937
# Just test basic RFC 3339 functionality here, the doc string for
938
# rfc3339_duration_to_delta() already has more comprehensive
939
# tests, which is run by doctest.
940
941
def test_rfc3339_zero_seconds(self):
942
self.assertEqual(datetime.timedelta(),
943
string_to_delta("PT0S"))
944
945
def test_rfc3339_zero_days(self):
946
self.assertEqual(datetime.timedelta(), string_to_delta("P0D"))
947
948
def test_rfc3339_one_second(self):
949
self.assertEqual(datetime.timedelta(0, 1),
950
string_to_delta("PT1S"))
951
952
def test_rfc3339_two_hours(self):
953
self.assertEqual(datetime.timedelta(0, 7200),
954
string_to_delta("PT2H"))
955
809
class Test_string_to_delta(unittest.TestCase):
810
def test_handles_basic_rfc3339(self):
811
self.assertEqual(string_to_delta("PT0S"),
812
datetime.timedelta())
813
self.assertEqual(string_to_delta("P0D"),
814
datetime.timedelta())
815
self.assertEqual(string_to_delta("PT1S"),
816
datetime.timedelta(0, 1))
817
self.assertEqual(string_to_delta("PT2H"),
818
datetime.timedelta(0, 7200))
956
819
def test_falls_back_to_pre_1_6_1_with_warning(self):
957
with self.assertLogs(log, logging.WARNING):
958
value = string_to_delta("2h")
959
self.assertEqual(datetime.timedelta(0, 7200), value)
820
# assertLogs only exists in Python 3.4
821
if hasattr(self, "assertLogs"):
822
with self.assertLogs(log, logging.WARNING):
823
value = string_to_delta("2h")
824
else:
825
class WarningFilter(logging.Filter):
826
"""Don't show, but record the presence of, warnings"""
827
def filter(self, record):
828
is_warning = record.levelno >= logging.WARNING
829
self.found = is_warning or getattr(self, "found",
830
False)
831
return not is_warning
832
warning_filter = WarningFilter()
833
log.addFilter(warning_filter)
834
try:
835
value = string_to_delta("2h")
836
finally:
837
log.removeFilter(warning_filter)
838
self.assertTrue(getattr(warning_filter, "found", False))
839
self.assertEqual(value, datetime.timedelta(0, 7200))
960
840
961
841
962
842
class Test_check_option_syntax(unittest.TestCase):
963
def setUp(self):
964
self.parser = argparse.ArgumentParser()
965
add_command_line_options(self.parser)
966
967
def test_actions_requires_client_or_all(self):
968
for action, value in self.actions.items():
969
options = self.parser.parse_args()
970
setattr(options, action, value)
971
with self.assertParseError():
972
self.check_option_syntax(options)
973
974
843
# This mostly corresponds to the definition from has_actions() in
975
844
# check_option_syntax()
976
845
actions = {
997
866
"deny": True,
998
867
}
999
868
869
def setUp(self):
870
self.parser = argparse.ArgumentParser()
871
add_command_line_options(self.parser)
872
1000
873
@contextlib.contextmanager
1001
874
def assertParseError(self):
1002
875
with self.assertRaises(SystemExit) as e:
1003
with self.redirect_stderr_to_devnull():
876
with self.temporarily_suppress_stderr():
1004
877
yield
1005
878
# Exit code from argparse is guaranteed to be "2". Reference:
1006
879
# https://docs.python.org/3/library
1007
880
# /argparse.html#exiting-methods
1008
self.assertEqual(2, e.exception.code)
881
self.assertEqual(e.exception.code, 2)
1009
882
1010
883
@staticmethod
1011
884
@contextlib.contextmanager
1012
def redirect_stderr_to_devnull():
1013
old_stderr = sys.stderr
1014
with contextlib.closing(open(os.devnull, "w")) as null:
1015
sys.stderr = null
1016
try:
1017
yield
1018
finally:
1019
sys.stderr = old_stderr
885
def temporarily_suppress_stderr():
886
null = os.open(os.path.devnull, os.O_RDWR)
887
stderrcopy = os.dup(sys.stderr.fileno())
888
os.dup2(null, sys.stderr.fileno())
889
os.close(null)
890
try:
891
yield
892
finally:
893
# restore stderr
894
os.dup2(stderrcopy, sys.stderr.fileno())
895
os.close(stderrcopy)
1020
896
1021
897
def check_option_syntax(self, options):
1022
898
check_option_syntax(self.parser, options)
1023
899
1024
def test_actions_all_conflicts_with_verbose(self):
900
def test_actions_requires_client_or_all(self):
1025
901
for action, value in self.actions.items():
1026
902
options = self.parser.parse_args()
1027
903
setattr(options, action, value)
1028
options.all = True
1029
options.verbose = True
1030
904
with self.assertParseError():
1031
905
self.check_option_syntax(options)
1032
906
1033
def test_actions_with_client_conflicts_with_verbose(self):
907
def test_actions_conflicts_with_verbose(self):
1034
908
for action, value in self.actions.items():
1035
909
options = self.parser.parse_args()
1036
910
setattr(options, action, value)
1037
911
options.verbose = True
1038
options.client = ["client"]
1039
912
with self.assertParseError():
1040
913
self.check_option_syntax(options)
1041
914
1067
940
options.all = True
1068
941
self.check_option_syntax(options)
1069
942
1070
def test_any_action_is_ok_with_one_client(self):
1071
for action, value in self.actions.items():
1072
options = self.parser.parse_args()
1073
setattr(options, action, value)
1074
options.client = ["client"]
1075
self.check_option_syntax(options)
1076
1077
def test_one_client_with_all_actions_except_is_enabled(self):
1078
options = self.parser.parse_args()
1079
for action, value in self.actions.items():
1080
if action == "is_enabled":
1081
continue
1082
setattr(options, action, value)
1083
options.client = ["client"]
1084
self.check_option_syntax(options)
1085
1086
def test_two_clients_with_all_actions_except_is_enabled(self):
1087
options = self.parser.parse_args()
1088
for action, value in self.actions.items():
1089
if action == "is_enabled":
1090
continue
1091
setattr(options, action, value)
1092
options.client = ["client1", "client2"]
1093
self.check_option_syntax(options)
1094
1095
def test_two_clients_are_ok_with_actions_except_is_enabled(self):
1096
for action, value in self.actions.items():
1097
if action == "is_enabled":
1098
continue
1099
options = self.parser.parse_args()
1100
setattr(options, action, value)
1101
options.client = ["client1", "client2"]
1102
self.check_option_syntax(options)
1103
1104
943
def test_is_enabled_fails_without_client(self):
1105
944
options = self.parser.parse_args()
1106
945
options.is_enabled = True
1107
946
with self.assertParseError():
1108
947
self.check_option_syntax(options)
1109
948
949
def test_is_enabled_works_with_one_client(self):
950
options = self.parser.parse_args()
951
options.is_enabled = True
952
options.client = ["foo"]
953
self.check_option_syntax(options)
954
1110
955
def test_is_enabled_fails_with_two_clients(self):
1111
956
options = self.parser.parse_args()
1112
957
options.is_enabled = True
1113
options.client = ["client1", "client2"]
958
options.client = ["foo", "barbar"]
1114
959
with self.assertParseError():
1115
960
self.check_option_syntax(options)
1116
961
1126
971
self.check_option_syntax(options)
1127
972
1128
973
1129
class Test_dbus_exceptions(unittest.TestCase):
1130
1131
def test_dbus_ConnectFailed_is_Error(self):
1132
with self.assertRaises(dbus.Error):
1133
raise dbus.ConnectFailed()
1134
1135
1136
class Test_dbus_MandosBus(unittest.TestCase):
1137
1138
class MockMandosBus(dbus.MandosBus):
1139
def __init__(self):
1140
self._name = "se.recompile.Mandos"
1141
self._server_path = "/"
1142
self._server_interface = "se.recompile.Mandos"
1143
self._client_interface = "se.recompile.Mandos.Client"
1144
self.calls = []
1145
self.call_method_return = Unique()
1146
1147
def call_method(self, methodname, busname, objectpath,
1148
interface, *args):
1149
self.calls.append((methodname, busname, objectpath,
1150
interface, args))
1151
return self.call_method_return
1152
1153
def setUp(self):
1154
self.bus = self.MockMandosBus()
1155
1156
def test_set_client_property(self):
1157
self.bus.set_client_property("objectpath", "key", "value")
1158
expected_call = ("Set", self.bus._name, "objectpath",
1159
"org.freedesktop.DBus.Properties",
1160
(self.bus._client_interface, "key", "value"))
1161
self.assertIn(expected_call, self.bus.calls)
1162
1163
def test_call_client_method(self):
1164
ret = self.bus.call_client_method("objectpath", "methodname")
1165
self.assertIs(self.bus.call_method_return, ret)
1166
expected_call = ("methodname", self.bus._name, "objectpath",
1167
self.bus._client_interface, ())
1168
self.assertIn(expected_call, self.bus.calls)
1169
1170
def test_call_client_method_with_args(self):
1171
args = (Unique(), Unique())
1172
ret = self.bus.call_client_method("objectpath", "methodname",
1173
*args)
1174
self.assertIs(self.bus.call_method_return, ret)
1175
expected_call = ("methodname", self.bus._name, "objectpath",
1176
self.bus._client_interface,
1177
(args[0], args[1]))
1178
self.assertIn(expected_call, self.bus.calls)
1179
1180
def test_get_clients_and_properties(self):
1181
managed_objects = {
1182
"objectpath": {
1183
self.bus._client_interface: {
1184
"key": "value",
1185
"bool": True,
1186
},
1187
"irrelevant_interface": {
1188
"key": "othervalue",
1189
"bool": False,
1190
},
1191
},
1192
"other_objectpath": {
1193
"other_irrelevant_interface": {
1194
"key": "value 3",
1195
"bool": None,
1196
},
1197
},
1198
}
1199
expected_clients_and_properties = {
1200
"objectpath": {
1201
"key": "value",
1202
"bool": True,
1203
}
1204
}
1205
self.bus.call_method_return = managed_objects
1206
ret = self.bus.get_clients_and_properties()
1207
self.assertDictEqual(expected_clients_and_properties, ret)
1208
expected_call = ("GetManagedObjects", self.bus._name,
1209
self.bus._server_path,
1210
"org.freedesktop.DBus.ObjectManager", ())
1211
self.assertIn(expected_call, self.bus.calls)
1212
1213
def test_call_server_method(self):
1214
ret = self.bus.call_server_method("methodname")
1215
self.assertIs(self.bus.call_method_return, ret)
1216
expected_call = ("methodname", self.bus._name,
1217
self.bus._server_path,
1218
self.bus._server_interface, ())
1219
self.assertIn(expected_call, self.bus.calls)
1220
1221
def test_call_server_method_with_args(self):
1222
args = (Unique(), Unique())
1223
ret = self.bus.call_server_method("methodname", *args)
1224
self.assertIs(self.bus.call_method_return, ret)
1225
expected_call = ("methodname", self.bus._name,
1226
self.bus._server_path,
1227
self.bus._server_interface,
1228
(args[0], args[1]))
1229
self.assertIn(expected_call, self.bus.calls)
1230
1231
1232
class Test_dbus_python_adapter_SystemBus(TestCaseWithAssertLogs):
1233
1234
def MockDBusPython_func(self, func):
1235
class mock_dbus_python(object):
1236
"""mock dbus-python module"""
1237
class exceptions(object):
1238
"""Pseudo-namespace"""
1239
class DBusException(Exception):
1240
pass
1241
class SystemBus(object):
1242
@staticmethod
1243
def get_object(busname, objectpath):
1244
DBusObject = collections.namedtuple(
1245
"DBusObject", ("methodname",))
1246
def method(*args, **kwargs):
1247
self.assertEqual({"dbus_interface":
1248
"interface"},
1249
kwargs)
1250
return func(*args)
1251
return DBusObject(methodname=method)
1252
class Boolean(object):
1253
def __init__(self, value):
1254
self.value = bool(value)
1255
def __bool__(self):
1256
return self.value
1257
if sys.version_info.major == 2:
1258
__nonzero__ = __bool__
1259
class ObjectPath(str):
1260
pass
1261
class Dictionary(dict):
1262
pass
1263
return mock_dbus_python
1264
1265
def call_method(self, bus, methodname, busname, objectpath,
1266
interface, *args):
1267
with self.assertLogs(log, logging.DEBUG):
1268
return bus.call_method(methodname, busname, objectpath,
1269
interface, *args)
1270
1271
def test_call_method_returns(self):
1272
expected_method_return = Unique()
1273
method_args = (Unique(), Unique())
1274
def func(*args):
1275
self.assertEqual(len(method_args), len(args))
1276
for marg, arg in zip(method_args, args):
1277
self.assertIs(marg, arg)
1278
return expected_method_return
1279
mock_dbus_python = self.MockDBusPython_func(func)
1280
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1281
ret = self.call_method(bus, "methodname", "busname",
1282
"objectpath", "interface",
1283
*method_args)
1284
self.assertIs(ret, expected_method_return)
1285
1286
def test_call_method_filters_bool_true(self):
1287
def func():
1288
return method_return
1289
mock_dbus_python = self.MockDBusPython_func(func)
1290
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1291
method_return = mock_dbus_python.Boolean(True)
1292
ret = self.call_method(bus, "methodname", "busname",
1293
"objectpath", "interface")
1294
self.assertTrue(ret)
1295
self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1296
1297
def test_call_method_filters_bool_false(self):
1298
def func():
1299
return method_return
1300
mock_dbus_python = self.MockDBusPython_func(func)
1301
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1302
method_return = mock_dbus_python.Boolean(False)
1303
ret = self.call_method(bus, "methodname", "busname",
1304
"objectpath", "interface")
1305
self.assertFalse(ret)
1306
self.assertNotIsInstance(ret, mock_dbus_python.Boolean)
1307
1308
def test_call_method_filters_objectpath(self):
1309
def func():
1310
return method_return
1311
mock_dbus_python = self.MockDBusPython_func(func)
1312
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1313
method_return = mock_dbus_python.ObjectPath("objectpath")
1314
ret = self.call_method(bus, "methodname", "busname",
1315
"objectpath", "interface")
1316
self.assertEqual("objectpath", ret)
1317
self.assertIsNot("objectpath", ret)
1318
self.assertNotIsInstance(ret, mock_dbus_python.ObjectPath)
1319
1320
def test_call_method_filters_booleans_in_dict(self):
1321
def func():
1322
return method_return
1323
mock_dbus_python = self.MockDBusPython_func(func)
1324
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1325
method_return = mock_dbus_python.Dictionary(
1326
{mock_dbus_python.Boolean(True):
1327
mock_dbus_python.Boolean(False),
1328
mock_dbus_python.Boolean(False):
1329
mock_dbus_python.Boolean(True)})
1330
ret = self.call_method(bus, "methodname", "busname",
1331
"objectpath", "interface")
1332
expected_method_return = {True: False,
1333
False: True}
1334
self.assertEqual(expected_method_return, ret)
1335
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1336
1337
def test_call_method_filters_objectpaths_in_dict(self):
1338
def func():
1339
return method_return
1340
mock_dbus_python = self.MockDBusPython_func(func)
1341
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1342
method_return = mock_dbus_python.Dictionary(
1343
{mock_dbus_python.ObjectPath("objectpath_key_1"):
1344
mock_dbus_python.ObjectPath("objectpath_value_1"),
1345
mock_dbus_python.ObjectPath("objectpath_key_2"):
1346
mock_dbus_python.ObjectPath("objectpath_value_2")})
1347
ret = self.call_method(bus, "methodname", "busname",
1348
"objectpath", "interface")
1349
expected_method_return = {str(key): str(value)
1350
for key, value in
1351
method_return.items()}
1352
self.assertEqual(expected_method_return, ret)
1353
self.assertIsInstance(ret, dict)
1354
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1355
1356
def test_call_method_filters_dict_in_dict(self):
1357
def func():
1358
return method_return
1359
mock_dbus_python = self.MockDBusPython_func(func)
1360
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1361
method_return = mock_dbus_python.Dictionary(
1362
{"key1": mock_dbus_python.Dictionary({"key11": "value11",
1363
"key12": "value12"}),
1364
"key2": mock_dbus_python.Dictionary({"key21": "value21",
1365
"key22": "value22"})})
1366
ret = self.call_method(bus, "methodname", "busname",
1367
"objectpath", "interface")
1368
expected_method_return = {
1369
"key1": {"key11": "value11",
1370
"key12": "value12"},
1371
"key2": {"key21": "value21",
1372
"key22": "value22"},
1373
}
1374
self.assertEqual(expected_method_return, ret)
1375
self.assertIsInstance(ret, dict)
1376
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1377
for key, value in ret.items():
1378
self.assertIsInstance(value, dict)
1379
self.assertEqual(expected_method_return[key], value)
1380
self.assertNotIsInstance(value,
1381
mock_dbus_python.Dictionary)
1382
1383
def test_call_method_filters_dict_three_deep(self):
1384
def func():
1385
return method_return
1386
mock_dbus_python = self.MockDBusPython_func(func)
1387
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1388
method_return = mock_dbus_python.Dictionary(
1389
{"key1":
1390
mock_dbus_python.Dictionary(
1391
{"key2":
1392
mock_dbus_python.Dictionary(
1393
{"key3":
1394
mock_dbus_python.Boolean(True),
1395
}),
1396
}),
1397
})
1398
ret = self.call_method(bus, "methodname", "busname",
1399
"objectpath", "interface")
1400
expected_method_return = {"key1": {"key2": {"key3": True}}}
1401
self.assertEqual(expected_method_return, ret)
1402
self.assertIsInstance(ret, dict)
1403
self.assertNotIsInstance(ret, mock_dbus_python.Dictionary)
1404
self.assertIsInstance(ret["key1"], dict)
1405
self.assertNotIsInstance(ret["key1"],
1406
mock_dbus_python.Dictionary)
1407
self.assertIsInstance(ret["key1"]["key2"], dict)
1408
self.assertNotIsInstance(ret["key1"]["key2"],
1409
mock_dbus_python.Dictionary)
1410
self.assertTrue(ret["key1"]["key2"]["key3"])
1411
self.assertNotIsInstance(ret["key1"]["key2"]["key3"],
1412
mock_dbus_python.Boolean)
1413
1414
def test_call_method_handles_exception(self):
1415
dbus_logger = logging.getLogger("dbus.proxies")
1416
1417
def func():
1418
dbus_logger.error("Test")
1419
raise mock_dbus_python.exceptions.DBusException()
1420
1421
mock_dbus_python = self.MockDBusPython_func(func)
1422
bus = dbus_python_adapter.SystemBus(mock_dbus_python)
1423
1424
class CountingHandler(logging.Handler):
1425
count = 0
1426
def emit(self, record):
1427
self.count += 1
1428
1429
counting_handler = CountingHandler()
1430
1431
dbus_logger.addHandler(counting_handler)
1432
1433
try:
1434
with self.assertRaises(dbus.Error) as e:
1435
self.call_method(bus, "methodname", "busname",
1436
"objectpath", "interface")
1437
finally:
1438
dbus_logger.removeFilter(counting_handler)
1439
1440
self.assertNotIsInstance(e, dbus.ConnectFailed)
1441
1442
# Make sure the dbus logger was suppressed
1443
self.assertEqual(0, counting_handler.count)
1444
1445
def test_get_object_converts_to_correct_exception(self):
1446
bus = dbus_python_adapter.SystemBus(
1447
self.fake_dbus_python_raises_exception_on_connect)
1448
with self.assertRaises(dbus.ConnectFailed):
1449
self.call_method(bus, "methodname", "busname",
1450
"objectpath", "interface")
1451
1452
class fake_dbus_python_raises_exception_on_connect(object):
1453
"""fake dbus-python module"""
1454
class exceptions(object):
1455
"""Pseudo-namespace"""
1456
class DBusException(Exception):
1457
pass
1458
1459
@classmethod
1460
def SystemBus(cls):
1461
def get_object(busname, objectpath):
1462
raise cls.exceptions.DBusException()
1463
Bus = collections.namedtuple("Bus", ["get_object"])
1464
return Bus(get_object=get_object)
1465
1466
1467
class Test_dbus_python_adapter_CachingBus(unittest.TestCase):
1468
class mock_dbus_python(object):
1469
"""mock dbus-python modules"""
1470
class SystemBus(object):
1471
@staticmethod
1472
def get_object(busname, objectpath):
1473
return Unique()
1474
1475
def setUp(self):
1476
self.bus = dbus_python_adapter.CachingBus(
1477
self.mock_dbus_python)
1478
1479
def test_returns_distinct_objectpaths(self):
1480
obj1 = self.bus.get_object("busname", "objectpath1")
1481
self.assertIsInstance(obj1, Unique)
1482
obj2 = self.bus.get_object("busname", "objectpath2")
1483
self.assertIsInstance(obj2, Unique)
1484
self.assertIsNot(obj1, obj2)
1485
1486
def test_returns_distinct_busnames(self):
1487
obj1 = self.bus.get_object("busname1", "objectpath")
1488
self.assertIsInstance(obj1, Unique)
1489
obj2 = self.bus.get_object("busname2", "objectpath")
1490
self.assertIsInstance(obj2, Unique)
1491
self.assertIsNot(obj1, obj2)
1492
1493
def test_returns_distinct_both(self):
1494
obj1 = self.bus.get_object("busname1", "objectpath")
1495
self.assertIsInstance(obj1, Unique)
1496
obj2 = self.bus.get_object("busname2", "objectpath")
1497
self.assertIsInstance(obj2, Unique)
1498
self.assertIsNot(obj1, obj2)
1499
1500
def test_returns_same(self):
1501
obj1 = self.bus.get_object("busname", "objectpath")
1502
self.assertIsInstance(obj1, Unique)
1503
obj2 = self.bus.get_object("busname", "objectpath")
1504
self.assertIsInstance(obj2, Unique)
1505
self.assertIs(obj1, obj2)
1506
1507
def test_returns_same_old(self):
1508
obj1 = self.bus.get_object("busname1", "objectpath1")
1509
self.assertIsInstance(obj1, Unique)
1510
obj2 = self.bus.get_object("busname2", "objectpath2")
1511
self.assertIsInstance(obj2, Unique)
1512
obj1b = self.bus.get_object("busname1", "objectpath1")
1513
self.assertIsInstance(obj1b, Unique)
1514
self.assertIsNot(obj1, obj2)
1515
self.assertIsNot(obj2, obj1b)
1516
self.assertIs(obj1, obj1b)
1517
1518
1519
class Test_commands_from_options(unittest.TestCase):
1520
974
class Test_command_from_options(unittest.TestCase):
1521
975
def setUp(self):
1522
976
self.parser = argparse.ArgumentParser()
1523
977
add_command_line_options(self.parser)
1524
1525
def test_is_enabled(self):
1526
self.assert_command_from_args(["--is-enabled", "client"],
1527
command.IsEnabled)
1528
1529
978
def assert_command_from_args(self, args, command_cls,
1530
979
**cmd_attrs):
1531
980
"""Assert that parsing ARGS should result in an instance of
1533
982
options = self.parser.parse_args(args)
1534
983
check_option_syntax(self.parser, options)
1535
984
commands = commands_from_options(options)
1536
self.assertEqual(1, len(commands))
985
self.assertEqual(len(commands), 1)
1537
986
command = commands[0]
1538
987
self.assertIsInstance(command, command_cls)
1539
988
for key, value in cmd_attrs.items():
1540
self.assertEqual(value, getattr(command, key))
1541
1542
def test_is_enabled_short(self):
1543
self.assert_command_from_args(["-V", "client"],
1544
command.IsEnabled)
1545
1546
def test_approve(self):
1547
self.assert_command_from_args(["--approve", "client"],
1548
command.Approve)
1549
1550
def test_approve_short(self):
1551
self.assert_command_from_args(["-A", "client"],
1552
command.Approve)
1553
1554
def test_deny(self):
1555
self.assert_command_from_args(["--deny", "client"],
1556
command.Deny)
1557
1558
def test_deny_short(self):
1559
self.assert_command_from_args(["-D", "client"], command.Deny)
1560
1561
def test_remove(self):
1562
self.assert_command_from_args(["--remove", "client"],
1563
command.Remove)
1564
1565
def test_deny_before_remove(self):
1566
options = self.parser.parse_args(["--deny", "--remove",
1567
"client"])
1568
check_option_syntax(self.parser, options)
1569
commands = commands_from_options(options)
1570
self.assertEqual(2, len(commands))
1571
self.assertIsInstance(commands[0], command.Deny)
1572
self.assertIsInstance(commands[1], command.Remove)
1573
1574
def test_deny_before_remove_reversed(self):
1575
options = self.parser.parse_args(["--remove", "--deny",
1576
"--all"])
1577
check_option_syntax(self.parser, options)
1578
commands = commands_from_options(options)
1579
self.assertEqual(2, len(commands))
1580
self.assertIsInstance(commands[0], command.Deny)
1581
self.assertIsInstance(commands[1], command.Remove)
1582
1583
def test_remove_short(self):
1584
self.assert_command_from_args(["-r", "client"],
1585
command.Remove)
1586
1587
def test_dump_json(self):
1588
self.assert_command_from_args(["--dump-json"],
1589
command.DumpJSON)
989
self.assertEqual(getattr(command, key), value)
990
def test_print_table(self):
991
self.assert_command_from_args([], PrintTableCmd,
992
verbose=False)
993
994
def test_print_table_verbose(self):
995
self.assert_command_from_args(["--verbose"], PrintTableCmd,
996
verbose=True)
997
998
def test_print_table_verbose_short(self):
999
self.assert_command_from_args(["-v"], PrintTableCmd,
1000
verbose=True)
1590
1001
1591
1002
def test_enable(self):
1592
self.assert_command_from_args(["--enable", "client"],
1593
command.Enable)
1003
self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1594
1004
1595
1005
def test_enable_short(self):
1596
self.assert_command_from_args(["-e", "client"],
1597
command.Enable)
1006
self.assert_command_from_args(["-e", "foo"], EnableCmd)
1598
1007
1599
1008
def test_disable(self):
1600
self.assert_command_from_args(["--disable", "client"],
1601
command.Disable)
1009
self.assert_command_from_args(["--disable", "foo"],
1010
DisableCmd)
1602
1011
1603
1012
def test_disable_short(self):
1604
self.assert_command_from_args(["-d", "client"],
1605
command.Disable)
1013
self.assert_command_from_args(["-d", "foo"], DisableCmd)
1606
1014
1607
1015
def test_bump_timeout(self):
1608
self.assert_command_from_args(["--bump-timeout", "client"],
1609
command.BumpTimeout)
1016
self.assert_command_from_args(["--bump-timeout", "foo"],
1017
BumpTimeoutCmd)
1610
1018
1611
1019
def test_bump_timeout_short(self):
1612
self.assert_command_from_args(["-b", "client"],
1613
command.BumpTimeout)
1020
self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1614
1021
1615
1022
def test_start_checker(self):
1616
self.assert_command_from_args(["--start-checker", "client"],
1617
command.StartChecker)
1023
self.assert_command_from_args(["--start-checker", "foo"],
1024
StartCheckerCmd)
1618
1025
1619
1026
def test_stop_checker(self):
1620
self.assert_command_from_args(["--stop-checker", "client"],
1621
command.StopChecker)
1622
1623
def test_approve_by_default(self):
1624
self.assert_command_from_args(["--approve-by-default",
1625
"client"],
1626
command.ApproveByDefault)
1627
1628
def test_deny_by_default(self):
1629
self.assert_command_from_args(["--deny-by-default", "client"],
1630
command.DenyByDefault)
1027
self.assert_command_from_args(["--stop-checker", "foo"],
1028
StopCheckerCmd)
1029
1030
def test_remove(self):
1031
self.assert_command_from_args(["--remove", "foo"],
1032
RemoveCmd)
1033
1034
def test_remove_short(self):
1035
self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1631
1036
1632
1037
def test_checker(self):
1633
self.assert_command_from_args(["--checker", ":", "client"],
1634
command.SetChecker,
1635
value_to_set=":")
1038
self.assert_command_from_args(["--checker", ":", "foo"],
1039
SetCheckerCmd, value_to_set=":")
1636
1040
1637
1041
def test_checker_empty(self):
1638
self.assert_command_from_args(["--checker", "", "client"],
1639
command.SetChecker,
1640
value_to_set="")
1042
self.assert_command_from_args(["--checker", "", "foo"],
1043
SetCheckerCmd, value_to_set="")
1641
1044
1642
1045
def test_checker_short(self):
1643
self.assert_command_from_args(["-c", ":", "client"],
1644
command.SetChecker,
1645
value_to_set=":")
1646
1647
def test_host(self):
1648
self.assert_command_from_args(
1649
["--host", "client.example.org", "client"],
1650
command.SetHost, value_to_set="client.example.org")
1651
1652
def test_host_short(self):
1653
self.assert_command_from_args(
1654
["-H", "client.example.org", "client"], command.SetHost,
1655
value_to_set="client.example.org")
1656
1657
def test_secret_devnull(self):
1658
self.assert_command_from_args(["--secret", os.path.devnull,
1659
"client"], command.SetSecret,
1660
value_to_set=b"")
1661
1662
def test_secret_tempfile(self):
1663
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1664
value = b"secret\0xyzzy\nbar"
1665
f.write(value)
1666
f.seek(0)
1667
self.assert_command_from_args(["--secret", f.name,
1668
"client"],
1669
command.SetSecret,
1670
value_to_set=value)
1671
1672
def test_secret_devnull_short(self):
1673
self.assert_command_from_args(["-s", os.path.devnull,
1674
"client"], command.SetSecret,
1675
value_to_set=b"")
1676
1677
def test_secret_tempfile_short(self):
1678
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1679
value = b"secret\0xyzzy\nbar"
1680
f.write(value)
1681
f.seek(0)
1682
self.assert_command_from_args(["-s", f.name, "client"],
1683
command.SetSecret,
1684
value_to_set=value)
1046
self.assert_command_from_args(["-c", ":", "foo"],
1047
SetCheckerCmd, value_to_set=":")
1685
1048
1686
1049
def test_timeout(self):
1687
self.assert_command_from_args(["--timeout", "PT5M", "client"],
1688
command.SetTimeout,
1050
self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1051
SetTimeoutCmd,
1689
1052
value_to_set=300000)
1690
1053
1691
1054
def test_timeout_short(self):
1692
self.assert_command_from_args(["-t", "PT5M", "client"],
1693
command.SetTimeout,
1055
self.assert_command_from_args(["-t", "PT5M", "foo"],
1056
SetTimeoutCmd,
1694
1057
value_to_set=300000)
1695
1058
1696
1059
def test_extended_timeout(self):
1697
1060
self.assert_command_from_args(["--extended-timeout", "PT15M",
1698
"client"],
1699
command.SetExtendedTimeout,
1061
"foo"],
1062
SetExtendedTimeoutCmd,
1700
1063
value_to_set=900000)
1701
1064
1702
1065
def test_interval(self):
1703
self.assert_command_from_args(["--interval", "PT2M",
1704
"client"], command.SetInterval,
1066
self.assert_command_from_args(["--interval", "PT2M", "foo"],
1067
SetIntervalCmd,
1705
1068
value_to_set=120000)
1706
1069
1707
1070
def test_interval_short(self):
1708
self.assert_command_from_args(["-i", "PT2M", "client"],
1709
command.SetInterval,
1071
self.assert_command_from_args(["-i", "PT2M", "foo"],
1072
SetIntervalCmd,
1710
1073
value_to_set=120000)
1711
1074
1075
def test_approve_by_default(self):
1076
self.assert_command_from_args(["--approve-by-default", "foo"],
1077
ApproveByDefaultCmd)
1078
1079
def test_deny_by_default(self):
1080
self.assert_command_from_args(["--deny-by-default", "foo"],
1081
DenyByDefaultCmd)
1082
1712
1083
def test_approval_delay(self):
1713
1084
self.assert_command_from_args(["--approval-delay", "PT30S",
1714
"client"],
1715
command.SetApprovalDelay,
1085
"foo"], SetApprovalDelayCmd,
1716
1086
value_to_set=30000)
1717
1087
1718
1088
def test_approval_duration(self):
1719
1089
self.assert_command_from_args(["--approval-duration", "PT1S",
1720
"client"],
1721
command.SetApprovalDuration,
1090
"foo"], SetApprovalDurationCmd,
1722
1091
value_to_set=1000)
1723
1092
1724
def test_print_table(self):
1725
self.assert_command_from_args([], command.PrintTable,
1726
verbose=False)
1727
1728
def test_print_table_verbose(self):
1729
self.assert_command_from_args(["--verbose"],
1730
command.PrintTable,
1731
verbose=True)
1732
1733
def test_print_table_verbose_short(self):
1734
self.assert_command_from_args(["-v"], command.PrintTable,
1735
verbose=True)
1736
1737
1738
class TestCommand(unittest.TestCase):
1093
def test_host(self):
1094
self.assert_command_from_args(["--host", "foo.example.org",
1095
"foo"], SetHostCmd,
1096
value_to_set="foo.example.org")
1097
1098
def test_host_short(self):
1099
self.assert_command_from_args(["-H", "foo.example.org",
1100
"foo"], SetHostCmd,
1101
value_to_set="foo.example.org")
1102
1103
def test_secret_devnull(self):
1104
self.assert_command_from_args(["--secret", os.path.devnull,
1105
"foo"], SetSecretCmd,
1106
value_to_set=b"")
1107
1108
def test_secret_tempfile(self):
1109
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1110
value = b"secret\0xyzzy\nbar"
1111
f.write(value)
1112
f.seek(0)
1113
self.assert_command_from_args(["--secret", f.name,
1114
"foo"], SetSecretCmd,
1115
value_to_set=value)
1116
1117
def test_secret_devnull_short(self):
1118
self.assert_command_from_args(["-s", os.path.devnull, "foo"],
1119
SetSecretCmd, value_to_set=b"")
1120
1121
def test_secret_tempfile_short(self):
1122
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1123
value = b"secret\0xyzzy\nbar"
1124
f.write(value)
1125
f.seek(0)
1126
self.assert_command_from_args(["-s", f.name, "foo"],
1127
SetSecretCmd,
1128
value_to_set=value)
1129
1130
def test_approve(self):
1131
self.assert_command_from_args(["--approve", "foo"],
1132
ApproveCmd)
1133
1134
def test_approve_short(self):
1135
self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1136
1137
def test_deny(self):
1138
self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1139
1140
def test_deny_short(self):
1141
self.assert_command_from_args(["-D", "foo"], DenyCmd)
1142
1143
def test_dump_json(self):
1144
self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1145
1146
def test_is_enabled(self):
1147
self.assert_command_from_args(["--is-enabled", "foo"],
1148
IsEnabledCmd)
1149
1150
def test_is_enabled_short(self):
1151
self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1152
1153
def test_deny_before_remove(self):
1154
options = self.parser.parse_args(["--deny", "--remove",
1155
"foo"])
1156
check_option_syntax(self.parser, options)
1157
commands = commands_from_options(options)
1158
self.assertEqual(len(commands), 2)
1159
self.assertIsInstance(commands[0], DenyCmd)
1160
self.assertIsInstance(commands[1], RemoveCmd)
1161
1162
def test_deny_before_remove_reversed(self):
1163
options = self.parser.parse_args(["--remove", "--deny",
1164
"--all"])
1165
check_option_syntax(self.parser, options)
1166
commands = commands_from_options(options)
1167
self.assertEqual(len(commands), 2)
1168
self.assertIsInstance(commands[0], DenyCmd)
1169
self.assertIsInstance(commands[1], RemoveCmd)
1170
1171
1172
class TestCmd(unittest.TestCase):
1739
1173
"""Abstract class for tests of command classes"""
1740
1741
class FakeMandosBus(dbus.MandosBus):
1742
def __init__(self, testcase):
1743
self.client_properties = {
1174
def setUp(self):
1175
testcase = self
1176
class MockClient(object):
1177
def __init__(self, name, **attributes):
1178
self.__dbus_object_path__ = "/clients/{}".format(name)
1179
self.attributes = attributes
1180
self.attributes["Name"] = name
1181
self.calls = []
1182
def Set(self, interface, propname, value, dbus_interface):
1183
testcase.assertEqual(interface, client_dbus_interface)
1184
testcase.assertEqual(dbus_interface,
1185
dbus.PROPERTIES_IFACE)
1186
self.attributes[propname] = value
1187
def Get(self, interface, propname, dbus_interface):
1188
testcase.assertEqual(interface, client_dbus_interface)
1189
testcase.assertEqual(dbus_interface,
1190
dbus.PROPERTIES_IFACE)
1191
return self.attributes[propname]
1192
def Approve(self, approve, dbus_interface):
1193
testcase.assertEqual(dbus_interface,
1194
client_dbus_interface)
1195
self.calls.append(("Approve", (approve,
1196
dbus_interface)))
1197
self.client = MockClient(
1198
"foo",
1199
KeyID=("92ed150794387c03ce684574b1139a65"
1200
"94a34f895daaaf09fd8ea90a27cddb12"),
1201
Secret=b"secret",
1202
Host="foo.example.org",
1203
Enabled=dbus.Boolean(True),
1204
Timeout=300000,
1205
LastCheckedOK="2019-02-03T00:00:00",
1206
Created="2019-01-02T00:00:00",
1207
Interval=120000,
1208
Fingerprint=("778827225BA7DE539C5A"
1209
"7CFA59CFF7CDBD9A5920"),
1210
CheckerRunning=dbus.Boolean(False),
1211
LastEnabled="2019-01-03T00:00:00",
1212
ApprovalPending=dbus.Boolean(False),
1213
ApprovedByDefault=dbus.Boolean(True),
1214
LastApprovalRequest="",
1215
ApprovalDelay=0,
1216
ApprovalDuration=1000,
1217
Checker="fping -q -- %(host)s",
1218
ExtendedTimeout=900000,
1219
Expires="2019-02-04T00:00:00",
1220
LastCheckerStatus=0)
1221
self.other_client = MockClient(
1222
"barbar",
1223
KeyID=("0558568eedd67d622f5c83b35a115f79"
1224
"6ab612cff5ad227247e46c2b020f441c"),
1225
Secret=b"secretbar",
1226
Host="192.0.2.3",
1227
Enabled=dbus.Boolean(True),
1228
Timeout=300000,
1229
LastCheckedOK="2019-02-04T00:00:00",
1230
Created="2019-01-03T00:00:00",
1231
Interval=120000,
1232
Fingerprint=("3E393AEAEFB84C7E89E2"
1233
"F547B3A107558FCA3A27"),
1234
CheckerRunning=dbus.Boolean(True),
1235
LastEnabled="2019-01-04T00:00:00",
1236
ApprovalPending=dbus.Boolean(False),
1237
ApprovedByDefault=dbus.Boolean(False),
1238
LastApprovalRequest="2019-01-03T00:00:00",
1239
ApprovalDelay=30000,
1240
ApprovalDuration=93785000,
1241
Checker=":",
1242
ExtendedTimeout=900000,
1243
Expires="2019-02-05T00:00:00",
1244
LastCheckerStatus=-2)
1245
self.clients = collections.OrderedDict(
1246
[
1247
("/clients/foo", self.client.attributes),
1248
("/clients/barbar", self.other_client.attributes),
1249
])
1250
self.one_client = {"/clients/foo": self.client.attributes}
1251
@property
1252
def bus(self):
1253
class Bus(object):
1254
@staticmethod
1255
def get_object(client_bus_name, path):
1256
self.assertEqual(client_bus_name, dbus_busname)
1257
return {
1258
"/clients/foo": self.client,
1259
"/clients/barbar": self.other_client,
1260
}[path]
1261
return Bus()
1262
1263
1264
class TestIsEnabledCmd(TestCmd):
1265
def test_is_enabled(self):
1266
self.assertTrue(all(IsEnabledCmd().is_enabled(client,
1267
properties)
1268
for client, properties
1269
in self.clients.items()))
1270
def test_is_enabled_run_exits_successfully(self):
1271
with self.assertRaises(SystemExit) as e:
1272
IsEnabledCmd().run(self.one_client)
1273
if e.exception.code is not None:
1274
self.assertEqual(e.exception.code, 0)
1275
else:
1276
self.assertIsNone(e.exception.code)
1277
def test_is_enabled_run_exits_with_failure(self):
1278
self.client.attributes["Enabled"] = dbus.Boolean(False)
1279
with self.assertRaises(SystemExit) as e:
1280
IsEnabledCmd().run(self.one_client)
1281
if isinstance(e.exception.code, int):
1282
self.assertNotEqual(e.exception.code, 0)
1283
else:
1284
self.assertIsNotNone(e.exception.code)
1285
1286
1287
class TestApproveCmd(TestCmd):
1288
def test_approve(self):
1289
ApproveCmd().run(self.clients, self.bus)
1290
for clientpath in self.clients:
1291
client = self.bus.get_object(dbus_busname, clientpath)
1292
self.assertIn(("Approve", (True, client_dbus_interface)),
1293
client.calls)
1294
1295
1296
class TestDenyCmd(TestCmd):
1297
def test_deny(self):
1298
DenyCmd().run(self.clients, self.bus)
1299
for clientpath in self.clients:
1300
client = self.bus.get_object(dbus_busname, clientpath)
1301
self.assertIn(("Approve", (False, client_dbus_interface)),
1302
client.calls)
1303
1304
class TestRemoveCmd(TestCmd):
1305
def test_remove(self):
1306
class MockMandos(object):
1307
def __init__(self):
1308
self.calls = []
1309
def RemoveClient(self, dbus_path):
1310
self.calls.append(("RemoveClient", (dbus_path,)))
1311
mandos = MockMandos()
1312
super(TestRemoveCmd, self).setUp()
1313
RemoveCmd().run(self.clients, self.bus, mandos)
1314
self.assertEqual(len(mandos.calls), 2)
1315
for clientpath in self.clients:
1316
self.assertIn(("RemoveClient", (clientpath,)),
1317
mandos.calls)
1318
1319
1320
class TestDumpJSONCmd(TestCmd):
1321
def setUp(self):
1322
self.expected_json = {
1323
"foo": {
1744
1324
"Name": "foo",
1745
1325
"KeyID": ("92ed150794387c03ce684574b1139a65"
1746
1326
"94a34f895daaaf09fd8ea90a27cddb12"),
1747
"Secret": b"secret",
1748
1327
"Host": "foo.example.org",
1749
1328
"Enabled": True,
1750
1329
"Timeout": 300000,
1764
1343
"ExtendedTimeout": 900000,
1765
1344
"Expires": "2019-02-04T00:00:00",
1766
1345
"LastCheckerStatus": 0,
1767
}
1768
self.other_client_properties = {
1346
},
1347
"barbar": {
1769
1348
"Name": "barbar",
1770
1349
"KeyID": ("0558568eedd67d622f5c83b35a115f79"
1771
1350
"6ab612cff5ad227247e46c2b020f441c"),
1772
"Secret": b"secretbar",
1773
1351
"Host": "192.0.2.3",
1774
1352
"Enabled": True,
1775
1353
"Timeout": 300000,
1789
1367
"ExtendedTimeout": 900000,
1790
1368
"Expires": "2019-02-05T00:00:00",
1791
1369
"LastCheckerStatus": -2,
1792
}
1793
self.clients = collections.OrderedDict(
1794
[
1795
("client_objectpath", self.client_properties),
1796
("other_client_objectpath",
1797
self.other_client_properties),
1798
])
1799
self.one_client = {"client_objectpath":
1800
self.client_properties}
1801
self.testcase = testcase
1802
self.calls = []
1803
1804
def call_method(self, methodname, busname, objectpath,
1805
interface, *args):
1806
self.testcase.assertEqual("se.recompile.Mandos", busname)
1807
self.calls.append((methodname, busname, objectpath,
1808
interface, args))
1809
if interface == "org.freedesktop.DBus.Properties":
1810
if methodname == "Set":
1811
self.testcase.assertEqual(3, len(args))
1812
interface, key, value = args
1813
self.testcase.assertEqual(
1814
"se.recompile.Mandos.Client", interface)
1815
self.clients[objectpath][key] = value
1816
return
1817
elif interface == "se.recompile.Mandos":
1818
self.testcase.assertEqual("RemoveClient", methodname)
1819
self.testcase.assertEqual(1, len(args))
1820
clientpath = args[0]
1821
del self.clients[clientpath]
1822
return
1823
elif interface == "se.recompile.Mandos.Client":
1824
if methodname == "Approve":
1825
self.testcase.assertEqual(1, len(args))
1826
return
1827
raise ValueError()
1828
1829
def setUp(self):
1830
self.bus = self.FakeMandosBus(self)
1831
1832
1833
class TestBaseCommands(TestCommand):
1834
1835
def test_IsEnabled_exits_successfully(self):
1836
with self.assertRaises(SystemExit) as e:
1837
command.IsEnabled().run(self.bus.one_client)
1838
if e.exception.code is not None:
1839
self.assertEqual(0, e.exception.code)
1840
else:
1841
self.assertIsNone(e.exception.code)
1842
1843
def test_IsEnabled_exits_with_failure(self):
1844
self.bus.client_properties["Enabled"] = False
1845
with self.assertRaises(SystemExit) as e:
1846
command.IsEnabled().run(self.bus.one_client)
1847
if isinstance(e.exception.code, int):
1848
self.assertNotEqual(0, e.exception.code)
1849
else:
1850
self.assertIsNotNone(e.exception.code)
1851
1852
def test_Approve(self):
1853
busname = "se.recompile.Mandos"
1854
client_interface = "se.recompile.Mandos.Client"
1855
command.Approve().run(self.bus.clients, self.bus)
1856
for clientpath in self.bus.clients:
1857
self.assertIn(("Approve", busname, clientpath,
1858
client_interface, (True,)), self.bus.calls)
1859
1860
def test_Deny(self):
1861
busname = "se.recompile.Mandos"
1862
client_interface = "se.recompile.Mandos.Client"
1863
command.Deny().run(self.bus.clients, self.bus)
1864
for clientpath in self.bus.clients:
1865
self.assertIn(("Approve", busname, clientpath,
1866
client_interface, (False,)),
1867
self.bus.calls)
1868
1869
def test_Remove(self):
1870
command.Remove().run(self.bus.clients, self.bus)
1871
for clientpath in self.bus.clients:
1872
self.assertIn(("RemoveClient", dbus_busname,
1873
dbus_server_path, dbus_server_interface,
1874
(clientpath,)), self.bus.calls)
1875
1876
expected_json = {
1877
"foo": {
1878
"Name": "foo",
1879
"KeyID": ("92ed150794387c03ce684574b1139a65"
1880
"94a34f895daaaf09fd8ea90a27cddb12"),
1881
"Host": "foo.example.org",
1882
"Enabled": True,
1883
"Timeout": 300000,
1884
"LastCheckedOK": "2019-02-03T00:00:00",
1885
"Created": "2019-01-02T00:00:00",
1886
"Interval": 120000,
1887
"Fingerprint": ("778827225BA7DE539C5A"
1888
"7CFA59CFF7CDBD9A5920"),
1889
"CheckerRunning": False,
1890
"LastEnabled": "2019-01-03T00:00:00",
1891
"ApprovalPending": False,
1892
"ApprovedByDefault": True,
1893
"LastApprovalRequest": "",
1894
"ApprovalDelay": 0,
1895
"ApprovalDuration": 1000,
1896
"Checker": "fping -q -- %(host)s",
1897
"ExtendedTimeout": 900000,
1898
"Expires": "2019-02-04T00:00:00",
1899
"LastCheckerStatus": 0,
1900
},
1901
"barbar": {
1902
"Name": "barbar",
1903
"KeyID": ("0558568eedd67d622f5c83b35a115f79"
1904
"6ab612cff5ad227247e46c2b020f441c"),
1905
"Host": "192.0.2.3",
1906
"Enabled": True,
1907
"Timeout": 300000,
1908
"LastCheckedOK": "2019-02-04T00:00:00",
1909
"Created": "2019-01-03T00:00:00",
1910
"Interval": 120000,
1911
"Fingerprint": ("3E393AEAEFB84C7E89E2"
1912
"F547B3A107558FCA3A27"),
1913
"CheckerRunning": True,
1914
"LastEnabled": "2019-01-04T00:00:00",
1915
"ApprovalPending": False,
1916
"ApprovedByDefault": False,
1917
"LastApprovalRequest": "2019-01-03T00:00:00",
1918
"ApprovalDelay": 30000,
1919
"ApprovalDuration": 93785000,
1920
"Checker": ":",
1921
"ExtendedTimeout": 900000,
1922
"Expires": "2019-02-05T00:00:00",
1923
"LastCheckerStatus": -2,
1924
},
1925
}
1926
1927
def test_DumpJSON_normal(self):
1928
with self.capture_stdout_to_buffer() as buffer:
1929
command.DumpJSON().run(self.bus.clients)
1930
json_data = json.loads(buffer.getvalue())
1931
self.assertDictEqual(self.expected_json, json_data)
1932
1933
@staticmethod
1934
@contextlib.contextmanager
1935
def capture_stdout_to_buffer():
1936
capture_buffer = io.StringIO()
1937
old_stdout = sys.stdout
1938
sys.stdout = capture_buffer
1939
try:
1940
yield capture_buffer
1941
finally:
1942
sys.stdout = old_stdout
1943
1944
def test_DumpJSON_one_client(self):
1945
with self.capture_stdout_to_buffer() as buffer:
1946
command.DumpJSON().run(self.bus.one_client)
1947
json_data = json.loads(buffer.getvalue())
1370
},
1371
}
1372
return super(TestDumpJSONCmd, self).setUp()
1373
def test_normal(self):
1374
json_data = json.loads(DumpJSONCmd().output(self.clients))
1375
self.assertDictEqual(json_data, self.expected_json)
1376
def test_one_client(self):
1377
clients = self.one_client
1378
json_data = json.loads(DumpJSONCmd().output(clients))
1948
1379
expected_json = {"foo": self.expected_json["foo"]}
1949
self.assertDictEqual(expected_json, json_data)
1950
1951
def test_PrintTable_normal(self):
1952
with self.capture_stdout_to_buffer() as buffer:
1953
command.PrintTable().run(self.bus.clients)
1380
self.assertDictEqual(json_data, expected_json)
1381
1382
1383
class TestPrintTableCmd(TestCmd):
1384
def test_normal(self):
1385
output = PrintTableCmd().output(self.clients.values())
1954
1386
expected_output = "\n".join((
1955
1387
"Name Enabled Timeout Last Successful Check",
1956
1388
"foo Yes 00:05:00 2019-02-03T00:00:00 ",
1957
1389
"barbar Yes 00:05:00 2019-02-04T00:00:00 ",
1958
)) + "\n"
1959
self.assertEqual(expected_output, buffer.getvalue())
1960
1961
def test_PrintTable_verbose(self):
1962
with self.capture_stdout_to_buffer() as buffer:
1963
command.PrintTable(verbose=True).run(self.bus.clients)
1390
))
1391
self.assertEqual(output, expected_output)
1392
def test_verbose(self):
1393
output = PrintTableCmd(verbose=True).output(
1394
self.clients.values())
1964
1395
columns = (
1965
1396
(
1966
1397
"Name ",
2048
1479
)
2049
1480
)
2050
1481
num_lines = max(len(rows) for rows in columns)
2051
expected_output = ("\n".join("".join(rows[line]
2052
for rows in columns)
2053
for line in range(num_lines))
2054
+ "\n")
2055
self.assertEqual(expected_output, buffer.getvalue())
2056
2057
def test_PrintTable_one_client(self):
2058
with self.capture_stdout_to_buffer() as buffer:
2059
command.PrintTable().run(self.bus.one_client)
1482
expected_output = "\n".join("".join(rows[line]
1483
for rows in columns)
1484
for line in range(num_lines))
1485
self.assertEqual(output, expected_output)
1486
def test_one_client(self):
1487
output = PrintTableCmd().output(self.one_client.values())
2060
1488
expected_output = "\n".join((
2061
1489
"Name Enabled Timeout Last Successful Check",
2062
1490
"foo Yes 00:05:00 2019-02-03T00:00:00 ",
2063
)) + "\n"
2064
self.assertEqual(expected_output, buffer.getvalue())
2065
2066
2067
class TestPropertySetterCmd(TestCommand):
2068
"""Abstract class for tests of command.PropertySetter classes"""
2069
1491
))
1492
self.assertEqual(output, expected_output)
1493
1494
1495
class Unique(object):
1496
"""Class for objects which exist only to be unique objects, since
1497
unittest.mock.sentinel only exists in Python 3.3"""
1498
1499
1500
class TestPropertyCmd(TestCmd):
1501
"""Abstract class for tests of PropertyCmd classes"""
2070
1502
def runTest(self):
2071
1503
if not hasattr(self, "command"):
2072
return # Abstract TestCase class
1504
return
2073
1505
values_to_get = getattr(self, "values_to_get",
2074
1506
self.values_to_set)
2075
1507
for value_to_set, value_to_get in zip(self.values_to_set,
2076
1508
values_to_get):
2077
for clientpath in self.bus.clients:
2078
self.bus.clients[clientpath][self.propname] = Unique()
2079
self.run_command(value_to_set, self.bus.clients)
2080
for clientpath in self.bus.clients:
2081
value = self.bus.clients[clientpath][self.propname]
1509
for clientpath in self.clients:
1510
client = self.bus.get_object(dbus_busname, clientpath)
1511
old_value = client.attributes[self.propname]
1512
self.assertNotIsInstance(old_value, Unique)
1513
client.attributes[self.propname] = Unique()
1514
self.run_command(value_to_set, self.clients)
1515
for clientpath in self.clients:
1516
client = self.bus.get_object(dbus_busname, clientpath)
1517
value = client.attributes[self.propname]
2082
1518
self.assertNotIsInstance(value, Unique)
2083
self.assertEqual(value_to_get, value)
2084
1519
self.assertEqual(value, value_to_get)
2085
1520
def run_command(self, value, clients):
2086
1521
self.command().run(clients, self.bus)
2087
1522
2088
1523
2089
class TestEnableCmd(TestPropertySetterCmd):
2090
command = command.Enable
2091
propname = "Enabled"
2092
values_to_set = [True]
2093
2094
2095
class TestDisableCmd(TestPropertySetterCmd):
2096
command = command.Disable
2097
propname = "Enabled"
2098
values_to_set = [False]
2099
2100
2101
class TestBumpTimeoutCmd(TestPropertySetterCmd):
2102
command = command.BumpTimeout
1524
class TestEnableCmd(TestCmd):
1525
def test_enable(self):
1526
for clientpath in self.clients:
1527
client = self.bus.get_object(dbus_busname, clientpath)
1528
client.attributes["Enabled"] = False
1529
1530
EnableCmd().run(self.clients, self.bus)
1531
1532
for clientpath in self.clients:
1533
client = self.bus.get_object(dbus_busname, clientpath)
1534
self.assertTrue(client.attributes["Enabled"])
1535
1536
1537
class TestDisableCmd(TestCmd):
1538
def test_disable(self):
1539
DisableCmd().run(self.clients, self.bus)
1540
for clientpath in self.clients:
1541
client = self.bus.get_object(dbus_busname, clientpath)
1542
self.assertFalse(client.attributes["Enabled"])
1543
1544
1545
class TestBumpTimeoutCmd(TestPropertyCmd):
1546
command = BumpTimeoutCmd
2103
1547
propname = "LastCheckedOK"
2104
1548
values_to_set = [""]
2105
1549
2106
1550
2107
class TestStartCheckerCmd(TestPropertySetterCmd):
2108
command = command.StartChecker
2109
propname = "CheckerRunning"
2110
values_to_set = [True]
2111
2112
2113
class TestStopCheckerCmd(TestPropertySetterCmd):
2114
command = command.StopChecker
2115
propname = "CheckerRunning"
2116
values_to_set = [False]
2117
2118
2119
class TestApproveByDefaultCmd(TestPropertySetterCmd):
2120
command = command.ApproveByDefault
2121
propname = "ApprovedByDefault"
2122
values_to_set = [True]
2123
2124
2125
class TestDenyByDefaultCmd(TestPropertySetterCmd):
2126
command = command.DenyByDefault
2127
propname = "ApprovedByDefault"
2128
values_to_set = [False]
2129
2130
2131
class TestPropertySetterValueCmd(TestPropertySetterCmd):
2132
"""Abstract class for tests of PropertySetterValueCmd classes"""
2133
1551
class TestStartCheckerCmd(TestPropertyCmd):
1552
command = StartCheckerCmd
1553
propname = "CheckerRunning"
1554
values_to_set = [dbus.Boolean(True)]
1555
1556
1557
class TestStopCheckerCmd(TestPropertyCmd):
1558
command = StopCheckerCmd
1559
propname = "CheckerRunning"
1560
values_to_set = [dbus.Boolean(False)]
1561
1562
1563
class TestApproveByDefaultCmd(TestPropertyCmd):
1564
command = ApproveByDefaultCmd
1565
propname = "ApprovedByDefault"
1566
values_to_set = [dbus.Boolean(True)]
1567
1568
1569
class TestDenyByDefaultCmd(TestPropertyCmd):
1570
command = DenyByDefaultCmd
1571
propname = "ApprovedByDefault"
1572
values_to_set = [dbus.Boolean(False)]
1573
1574
1575
class TestPropertyValueCmd(TestPropertyCmd):
1576
"""Abstract class for tests of PropertyValueCmd classes"""
1577
def runTest(self):
1578
if type(self) is TestPropertyValueCmd:
1579
return
1580
return super(TestPropertyValueCmd, self).runTest()
2134
1581
def run_command(self, value, clients):
2135
1582
self.command(value).run(clients, self.bus)
2136
1583
2137
1584
2138
class TestSetCheckerCmd(TestPropertySetterValueCmd):
2139
command = command.SetChecker
1585
class TestSetCheckerCmd(TestPropertyValueCmd):
1586
command = SetCheckerCmd
2140
1587
propname = "Checker"
2141
1588
values_to_set = ["", ":", "fping -q -- %s"]
2142
1589
2143
1590
2144
class TestSetHostCmd(TestPropertySetterValueCmd):
2145
command = command.SetHost
1591
class TestSetHostCmd(TestPropertyValueCmd):
1592
command = SetHostCmd
2146
1593
propname = "Host"
2147
values_to_set = ["192.0.2.3", "client.example.org"]
2148
2149
2150
class TestSetSecretCmd(TestPropertySetterValueCmd):
2151
command = command.SetSecret
1594
values_to_set = ["192.0.2.3", "foo.example.org"]
1595
1596
1597
class TestSetSecretCmd(TestPropertyValueCmd):
1598
command = SetSecretCmd
2152
1599
propname = "Secret"
2153
1600
values_to_set = [io.BytesIO(b""),
2154
1601
io.BytesIO(b"secret\0xyzzy\nbar")]
2155
values_to_get = [f.getvalue() for f in values_to_set]
2156
2157
2158
class TestSetTimeoutCmd(TestPropertySetterValueCmd):
2159
command = command.SetTimeout
1602
values_to_get = [b"", b"secret\0xyzzy\nbar"]
1603
1604
1605
class TestSetTimeoutCmd(TestPropertyValueCmd):
1606
command = SetTimeoutCmd
2160
1607
propname = "Timeout"
2161
1608
values_to_set = [datetime.timedelta(),
2162
1609
datetime.timedelta(minutes=5),
2163
1610
datetime.timedelta(seconds=1),
2164
1611
datetime.timedelta(weeks=1),
2165
1612
datetime.timedelta(weeks=52)]
2166
values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2167
2168
2169
class TestSetExtendedTimeoutCmd(TestPropertySetterValueCmd):
2170
command = command.SetExtendedTimeout
1613
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1614
1615
1616
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
1617
command = SetExtendedTimeoutCmd
2171
1618
propname = "ExtendedTimeout"
2172
1619
values_to_set = [datetime.timedelta(),
2173
1620
datetime.timedelta(minutes=5),
2174
1621
datetime.timedelta(seconds=1),
2175
1622
datetime.timedelta(weeks=1),
2176
1623
datetime.timedelta(weeks=52)]
2177
values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2178
2179
2180
class TestSetIntervalCmd(TestPropertySetterValueCmd):
2181
command = command.SetInterval
1624
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1625
1626
1627
class TestSetIntervalCmd(TestPropertyValueCmd):
1628
command = SetIntervalCmd
2182
1629
propname = "Interval"
2183
1630
values_to_set = [datetime.timedelta(),
2184
1631
datetime.timedelta(minutes=5),
2185
1632
datetime.timedelta(seconds=1),
2186
1633
datetime.timedelta(weeks=1),
2187
1634
datetime.timedelta(weeks=52)]
2188
values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2189
2190
2191
class TestSetApprovalDelayCmd(TestPropertySetterValueCmd):
2192
command = command.SetApprovalDelay
1635
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1636
1637
1638
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
1639
command = SetApprovalDelayCmd
2193
1640
propname = "ApprovalDelay"
2194
1641
values_to_set = [datetime.timedelta(),
2195
1642
datetime.timedelta(minutes=5),
2196
1643
datetime.timedelta(seconds=1),
2197
1644
datetime.timedelta(weeks=1),
2198
1645
datetime.timedelta(weeks=52)]
2199
values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
2200
2201
2202
class TestSetApprovalDurationCmd(TestPropertySetterValueCmd):
2203
command = command.SetApprovalDuration
1646
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1647
1648
1649
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
1650
command = SetApprovalDurationCmd
2204
1651
propname = "ApprovalDuration"
2205
1652
values_to_set = [datetime.timedelta(),
2206
1653
datetime.timedelta(minutes=5),
2207
1654
datetime.timedelta(seconds=1),
2208
1655
datetime.timedelta(weeks=1),
2209
1656
datetime.timedelta(weeks=52)]
2210
values_to_get = [dt.total_seconds()*1000 for dt in values_to_set]
1657
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
2211
1658
2212
1659
2213
1660
2228
1675
return tests
2229
1676
2230
1677
if __name__ == "__main__":
2231
try:
2232
if should_only_run_tests():
2233
# Call using ./tdd-python-script --check [--verbose]
2234
unittest.main()
2235
else:
2236
main()
2237
finally:
2238
logging.shutdown()
1678
if should_only_run_tests():
1679
# Call using ./tdd-python-script --check [--verbose]
1680
unittest.main()
1681
else:
1682
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0