To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos-ctl
- browse files at revision 237.7.594
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.594
- Committer: Teddy Hogeborn
- Date: 2019-03-09 18:30:17 UTC
- mfrom: (237.26.3 trunk)
- mto: This revision was merged to the branch mainline in revision 382.
- Revision ID: teddy@recompile.se-20190309183017-5z0892yksb1rpulx
mandos-ctl: Merge refactoring changes and debug output
- files modified:
- mandos-ctl
added
removed
mandos-ctl
64
64
65
65
locale.setlocale(locale.LC_ALL, "")
66
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
67
domain = "se.recompile"
68
busname = domain + ".Mandos"
69
server_path = "/"
70
server_interface = domain + ".Mandos"
71
client_interface = domain + ".Mandos.Client"
73
72
version = "1.8.3"
74
73
75
74
79
78
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
80
79
81
80
82
def main():
83
parser = argparse.ArgumentParser()
84
85
add_command_line_options(parser)
86
87
options = parser.parse_args()
88
89
check_option_syntax(parser, options)
90
91
clientnames = options.client
92
93
if options.debug:
94
log.setLevel(logging.DEBUG)
95
96
bus = dbus.SystemBus()
97
98
mandos_dbus_object = get_mandos_dbus_object(bus)
99
100
mandos_serv = dbus.Interface(
101
mandos_dbus_object, dbus_interface=server_dbus_interface)
102
mandos_serv_object_manager = dbus.Interface(
103
mandos_dbus_object, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
104
105
managed_objects = get_managed_objects(mandos_serv_object_manager)
106
107
all_clients = {}
108
for path, ifs_and_props in managed_objects.items():
109
try:
110
all_clients[path] = ifs_and_props[client_dbus_interface]
111
except KeyError:
112
pass
113
114
# Compile dict of (clientpath: properties) to process
115
if not clientnames:
116
clients = all_clients
117
else:
118
clients = {}
119
for name in clientnames:
120
for objpath, properties in all_clients.items():
121
if properties["Name"] == name:
122
clients[objpath] = properties
123
break
124
else:
125
log.critical("Client not found on server: %r", name)
126
sys.exit(1)
127
128
# Run all commands on clients
129
commands = commands_from_options(options)
130
for command in commands:
131
command.run(clients, bus, mandos_serv)
132
133
134
def add_command_line_options(parser):
135
parser.add_argument("--version", action="version",
136
version="%(prog)s {}".format(version),
137
help="show version number and exit")
138
parser.add_argument("-a", "--all", action="store_true",
139
help="Select all clients")
140
parser.add_argument("-v", "--verbose", action="store_true",
141
help="Print all fields")
142
parser.add_argument("-j", "--dump-json", action="store_true",
143
help="Dump client data in JSON format")
144
enable_disable = parser.add_mutually_exclusive_group()
145
enable_disable.add_argument("-e", "--enable", action="store_true",
146
help="Enable client")
147
enable_disable.add_argument("-d", "--disable",
148
action="store_true",
149
help="disable client")
150
parser.add_argument("-b", "--bump-timeout", action="store_true",
151
help="Bump timeout for client")
152
start_stop_checker = parser.add_mutually_exclusive_group()
153
start_stop_checker.add_argument("--start-checker",
154
action="store_true",
155
help="Start checker for client")
156
start_stop_checker.add_argument("--stop-checker",
157
action="store_true",
158
help="Stop checker for client")
159
parser.add_argument("-V", "--is-enabled", action="store_true",
160
help="Check if client is enabled")
161
parser.add_argument("-r", "--remove", action="store_true",
162
help="Remove client")
163
parser.add_argument("-c", "--checker",
164
help="Set checker command for client")
165
parser.add_argument("-t", "--timeout", type=string_to_delta,
166
help="Set timeout for client")
167
parser.add_argument("--extended-timeout", type=string_to_delta,
168
help="Set extended timeout for client")
169
parser.add_argument("-i", "--interval", type=string_to_delta,
170
help="Set checker interval for client")
171
approve_deny_default = parser.add_mutually_exclusive_group()
172
approve_deny_default.add_argument(
173
"--approve-by-default", action="store_true",
174
default=None, dest="approved_by_default",
175
help="Set client to be approved by default")
176
approve_deny_default.add_argument(
177
"--deny-by-default", action="store_false",
178
dest="approved_by_default",
179
help="Set client to be denied by default")
180
parser.add_argument("--approval-delay", type=string_to_delta,
181
help="Set delay before client approve/deny")
182
parser.add_argument("--approval-duration", type=string_to_delta,
183
help="Set duration of one client approval")
184
parser.add_argument("-H", "--host", help="Set host for client")
185
parser.add_argument("-s", "--secret",
186
type=argparse.FileType(mode="rb"),
187
help="Set password blob (file) for client")
188
approve_deny = parser.add_mutually_exclusive_group()
189
approve_deny.add_argument(
190
"-A", "--approve", action="store_true",
191
help="Approve any current client request")
192
approve_deny.add_argument("-D", "--deny", action="store_true",
193
help="Deny any current client request")
194
parser.add_argument("--debug", action="store_true",
195
help="Debug mode (show D-Bus commands)")
196
parser.add_argument("--check", action="store_true",
197
help="Run self-test")
198
parser.add_argument("client", nargs="*", help="Client name")
199
200
201
def string_to_delta(interval):
202
"""Parse a string and return a datetime.timedelta"""
203
204
try:
205
return rfc3339_duration_to_delta(interval)
206
except ValueError as e:
207
log.warning("%s - Parsing as pre-1.6.1 interval instead",
208
' '.join(e.args))
209
return parse_pre_1_6_1_interval(interval)
81
def milliseconds_to_string(ms):
82
td = datetime.timedelta(0, 0, 0, ms)
83
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
84
.format(days="{}T".format(td.days) if td.days else "",
85
hours=td.seconds // 3600,
86
minutes=(td.seconds % 3600) // 60,
87
seconds=td.seconds % 60))
210
88
211
89
212
90
def rfc3339_duration_to_delta(duration):
339
217
return value
340
218
341
219
220
def string_to_delta(interval):
221
"""Parse a string and return a datetime.timedelta"""
222
223
try:
224
return rfc3339_duration_to_delta(interval)
225
except ValueError as e:
226
log.warning("%s - Parsing as pre-1.6.1 interval instead",
227
' '.join(e.args))
228
return parse_pre_1_6_1_interval(interval)
229
230
342
231
def parse_pre_1_6_1_interval(interval):
343
232
"""Parse an interval string as documented by Mandos before 1.6.1,
344
233
and return a datetime.timedelta
382
271
return value
383
272
384
273
385
def check_option_syntax(parser, options):
386
"""Apply additional restrictions on options, not expressible in
387
argparse"""
388
389
def has_actions(options):
390
return any((options.enable,
391
options.disable,
392
options.bump_timeout,
393
options.start_checker,
394
options.stop_checker,
395
options.is_enabled,
396
options.remove,
397
options.checker is not None,
398
options.timeout is not None,
399
options.extended_timeout is not None,
400
options.interval is not None,
401
options.approved_by_default is not None,
402
options.approval_delay is not None,
403
options.approval_duration is not None,
404
options.host is not None,
405
options.secret is not None,
406
options.approve,
407
options.deny))
408
409
if has_actions(options) and not (options.client or options.all):
410
parser.error("Options require clients names or --all.")
411
if options.verbose and has_actions(options):
412
parser.error("--verbose can only be used alone.")
413
if options.dump_json and (options.verbose
414
or has_actions(options)):
415
parser.error("--dump-json can only be used alone.")
416
if options.all and not has_actions(options):
417
parser.error("--all requires an action.")
418
if options.is_enabled and len(options.client) > 1:
419
parser.error("--is-enabled requires exactly one client")
420
if options.remove:
421
options.remove = False
422
if has_actions(options) and not options.deny:
423
parser.error("--remove can only be combined with --deny")
424
options.remove = True
425
426
427
def get_mandos_dbus_object(bus):
428
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
429
dbus_busname, server_dbus_path)
430
with if_dbus_exception_log_with_exception_and_exit(
431
"Could not connect to Mandos server: %s"):
432
mandos_dbus_object = bus.get_object(dbus_busname,
433
server_dbus_path)
434
return mandos_dbus_object
435
436
437
@contextlib.contextmanager
438
def if_dbus_exception_log_with_exception_and_exit(*args, **kwargs):
439
try:
440
yield
441
except dbus.exceptions.DBusException as e:
442
log.critical(*(args + (e,)), **kwargs)
443
sys.exit(1)
444
445
446
def get_managed_objects(object_manager):
447
log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", dbus_busname,
448
server_dbus_path, dbus.OBJECT_MANAGER_IFACE)
449
with if_dbus_exception_log_with_exception_and_exit(
450
"Failed to access Mandos server through D-Bus:\n%s"):
451
with SilenceLogger("dbus.proxies"):
452
managed_objects = object_manager.GetManagedObjects()
453
return managed_objects
454
455
456
class SilenceLogger(object):
457
"Simple context manager to silence a particular logger"
458
def __init__(self, loggername):
459
self.logger = logging.getLogger(loggername)
460
461
def __enter__(self):
462
self.logger.addFilter(self.nullfilter)
463
return self
464
465
class NullFilter(logging.Filter):
466
def filter(self, record):
467
return False
468
469
nullfilter = NullFilter()
470
471
def __exit__(self, exc_type, exc_val, exc_tb):
472
self.logger.removeFilter(self.nullfilter)
473
474
475
def commands_from_options(options):
476
477
commands = []
478
479
if options.is_enabled:
480
commands.append(IsEnabledCmd())
481
482
if options.approve:
483
commands.append(ApproveCmd())
484
485
if options.deny:
486
commands.append(DenyCmd())
487
488
if options.remove:
489
commands.append(RemoveCmd())
490
491
if options.dump_json:
492
commands.append(DumpJSONCmd())
493
494
if options.enable:
495
commands.append(EnableCmd())
496
497
if options.disable:
498
commands.append(DisableCmd())
499
500
if options.bump_timeout:
501
commands.append(BumpTimeoutCmd())
502
503
if options.start_checker:
504
commands.append(StartCheckerCmd())
505
506
if options.stop_checker:
507
commands.append(StopCheckerCmd())
508
509
if options.approved_by_default is not None:
510
if options.approved_by_default:
511
commands.append(ApproveByDefaultCmd())
512
else:
513
commands.append(DenyByDefaultCmd())
514
515
if options.checker is not None:
516
commands.append(SetCheckerCmd(options.checker))
517
518
if options.host is not None:
519
commands.append(SetHostCmd(options.host))
520
521
if options.secret is not None:
522
commands.append(SetSecretCmd(options.secret))
523
524
if options.timeout is not None:
525
commands.append(SetTimeoutCmd(options.timeout))
526
527
if options.extended_timeout:
528
commands.append(
529
SetExtendedTimeoutCmd(options.extended_timeout))
530
531
if options.interval is not None:
532
commands.append(SetIntervalCmd(options.interval))
533
534
if options.approval_delay is not None:
535
commands.append(SetApprovalDelayCmd(options.approval_delay))
536
537
if options.approval_duration is not None:
538
commands.append(
539
SetApprovalDurationCmd(options.approval_duration))
540
541
# If no command option has been given, show table of clients,
542
# optionally verbosely
543
if not commands:
544
commands.append(PrintTableCmd(verbose=options.verbose))
545
546
return commands
547
548
274
## Classes for commands.
275
276
# Abstract classes first
549
277
class Command(object):
550
278
"""Abstract class for commands"""
551
def run(self, clients, bus=None, mandos=None):
279
def run(self, mandos, clients):
552
280
"""Normal commands should implement run_on_one_client(), but
553
281
commands which want to operate on all clients at the same time
554
282
can override this run() method instead."""
555
283
self.mandos = mandos
556
for clientpath, properties in clients.items():
557
log.debug("D-Bus: Connect to: (busname=%r, path=%r)",
558
dbus_busname, str(clientpath))
559
client = bus.get_object(dbus_busname, clientpath)
284
for client, properties in clients.items():
560
285
self.run_on_one_client(client, properties)
561
286
562
563
class IsEnabledCmd(Command):
564
def run(self, clients, bus=None, mandos=None):
565
client, properties = next(iter(clients.items()))
566
if self.is_enabled(client, properties):
567
sys.exit(0)
568
sys.exit(1)
569
def is_enabled(self, client, properties):
570
return properties["Enabled"]
571
572
573
class ApproveCmd(Command):
574
def run_on_one_client(self, client, properties):
575
log.debug("D-Bus: %s:%s:%s.Approve(True)", dbus_busname,
576
client.__dbus_object_path__, client_dbus_interface)
577
client.Approve(dbus.Boolean(True),
578
dbus_interface=client_dbus_interface)
579
580
581
class DenyCmd(Command):
582
def run_on_one_client(self, client, properties):
583
log.debug("D-Bus: %s:%s:%s.Approve(False)", dbus_busname,
584
client.__dbus_object_path__, client_dbus_interface)
585
client.Approve(dbus.Boolean(False),
586
dbus_interface=client_dbus_interface)
587
588
589
class RemoveCmd(Command):
590
def run_on_one_client(self, client, properties):
591
log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", dbus_busname,
592
server_dbus_path, server_dbus_interface,
593
str(client.__dbus_object_path__))
594
self.mandos.RemoveClient(client.__dbus_object_path__)
595
596
597
class OutputCmd(Command):
598
"""Abstract class for commands outputting client details"""
287
class PrintCmd(Command):
288
"""Abstract class for commands printing client details"""
599
289
all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
600
290
"Created", "Interval", "Host", "KeyID",
601
291
"Fingerprint", "CheckerRunning", "LastEnabled",
603
293
"LastApprovalRequest", "ApprovalDelay",
604
294
"ApprovalDuration", "Checker", "ExtendedTimeout",
605
295
"Expires", "LastCheckerStatus")
606
607
def run(self, clients, bus=None, mandos=None):
296
def run(self, mandos, clients):
608
297
print(self.output(clients.values()))
609
298
610
def output(self, clients):
611
raise NotImplementedError()
612
613
614
class DumpJSONCmd(OutputCmd):
615
def output(self, clients):
616
data = {client["Name"]:
617
{key: self.dbus_boolean_to_bool(client[key])
618
for key in self.all_keywords}
619
for client in clients}
620
return json.dumps(data, indent=4, separators=(',', ': '))
621
622
@staticmethod
623
def dbus_boolean_to_bool(value):
624
if isinstance(value, dbus.Boolean):
625
value = bool(value)
626
return value
627
628
629
class PrintTableCmd(OutputCmd):
299
class PropertyCmd(Command):
300
"""Abstract class for Actions for setting one client property"""
301
def run_on_one_client(self, client, properties):
302
"""Set the Client's D-Bus property"""
303
log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", busname,
304
client.__dbus_object_path__,
305
dbus.PROPERTIES_IFACE, client_interface,
306
self.property, self.value_to_set
307
if not isinstance(self.value_to_set, dbus.Boolean)
308
else bool(self.value_to_set))
309
client.Set(client_interface, self.property, self.value_to_set,
310
dbus_interface=dbus.PROPERTIES_IFACE)
311
312
class ValueArgumentMixIn(object):
313
"""Mixin class for commands taking a value as argument"""
314
def __init__(self, value):
315
self.value_to_set = value
316
317
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
318
"""Mixin class for commands taking a value argument as
319
milliseconds."""
320
@property
321
def value_to_set(self):
322
return self._vts
323
@value_to_set.setter
324
def value_to_set(self, value):
325
"""When setting, convert value to a datetime.timedelta"""
326
self._vts = int(round(value.total_seconds() * 1000))
327
328
# Actual (non-abstract) command classes
329
330
class PrintTableCmd(PrintCmd):
630
331
def __init__(self, verbose=False):
631
332
self.verbose = verbose
632
333
633
334
def output(self, clients):
634
default_keywords = ("Name", "Enabled", "Timeout",
635
"LastCheckedOK")
335
default_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
636
336
keywords = default_keywords
637
337
if self.verbose:
638
338
keywords = self.all_keywords
662
362
"LastCheckerStatus": "Last Checker Status",
663
363
}
664
364
665
def __init__(self, clients, keywords):
365
def __init__(self, clients, keywords, tableheaders=None):
666
366
self.clients = clients
667
367
self.keywords = keywords
368
if tableheaders is not None:
369
self.tableheaders = tableheaders
668
370
669
371
def __str__(self):
670
372
return "\n".join(self.rows())
693
395
def string_from_client(self, client, key):
694
396
return self.valuetostring(client[key], key)
695
397
696
@classmethod
697
def valuetostring(cls, value, keyword):
398
@staticmethod
399
def valuetostring(value, keyword):
698
400
if isinstance(value, dbus.Boolean):
699
401
return "Yes" if value else "No"
700
402
if keyword in ("Timeout", "Interval", "ApprovalDelay",
701
403
"ApprovalDuration", "ExtendedTimeout"):
702
return cls.milliseconds_to_string(value)
404
return milliseconds_to_string(value)
703
405
return str(value)
704
406
705
407
def header_line(self, format_string):
710
412
**{key: self.string_from_client(client, key)
711
413
for key in self.keywords})
712
414
713
@staticmethod
714
def milliseconds_to_string(ms):
715
td = datetime.timedelta(0, 0, 0, ms)
716
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
717
.format(days="{}T".format(td.days)
718
if td.days else "",
719
hours=td.seconds // 3600,
720
minutes=(td.seconds % 3600) // 60,
721
seconds=td.seconds % 60))
722
723
724
class PropertyCmd(Command):
725
"""Abstract class for Actions for setting one client property"""
726
415
416
417
class DumpJSONCmd(PrintCmd):
418
def output(self, clients):
419
data = {client["Name"]:
420
{key: self.dbus_boolean_to_bool(client[key])
421
for key in self.all_keywords}
422
for client in clients.values()}
423
return json.dumps(data, indent=4, separators=(',', ': '))
424
@staticmethod
425
def dbus_boolean_to_bool(value):
426
if isinstance(value, dbus.Boolean):
427
value = bool(value)
428
return value
429
430
class IsEnabledCmd(Command):
727
431
def run_on_one_client(self, client, properties):
728
"""Set the Client's D-Bus property"""
729
log.debug("D-Bus: %s:%s:%s.Set(%r, %r, %r)", dbus_busname,
432
if self.is_enabled(client, properties):
433
sys.exit(0)
434
sys.exit(1)
435
def is_enabled(self, client, properties):
436
log.debug("D-Bus: %s:%s:%s.Get(%r, %r)", busname,
730
437
client.__dbus_object_path__,
731
dbus.PROPERTIES_IFACE, client_dbus_interface,
732
self.propname, self.value_to_set
733
if not isinstance(self.value_to_set, dbus.Boolean)
734
else bool(self.value_to_set))
735
client.Set(client_dbus_interface, self.propname,
736
self.value_to_set,
737
dbus_interface=dbus.PROPERTIES_IFACE)
738
739
@property
740
def propname(self):
741
raise NotImplementedError()
742
438
dbus.PROPERTIES_IFACE, client_interface,
439
"Enabled")
440
return bool(client.Get(client_interface, "Enabled",
441
dbus_interface=dbus.PROPERTIES_IFACE))
442
443
class RemoveCmd(Command):
444
def run_on_one_client(self, client, properties):
445
log.debug("D-Bus: %s:%s:%s.RemoveClient(%r)", busname,
446
server_path, server_interface,
447
str(client.__dbus_object_path__))
448
self.mandos.RemoveClient(client.__dbus_object_path__)
449
450
class ApproveCmd(Command):
451
def run_on_one_client(self, client, properties):
452
log.debug("D-Bus: %s:%s.Approve(True)",
453
client.__dbus_object_path__, client_interface)
454
client.Approve(dbus.Boolean(True),
455
dbus_interface=client_interface)
456
457
class DenyCmd(Command):
458
def run_on_one_client(self, client, properties):
459
log.debug("D-Bus: %s:%s.Approve(False)",
460
client.__dbus_object_path__, client_interface)
461
client.Approve(dbus.Boolean(False),
462
dbus_interface=client_interface)
743
463
744
464
class EnableCmd(PropertyCmd):
745
propname = "Enabled"
465
property = "Enabled"
746
466
value_to_set = dbus.Boolean(True)
747
467
748
749
468
class DisableCmd(PropertyCmd):
750
propname = "Enabled"
469
property = "Enabled"
751
470
value_to_set = dbus.Boolean(False)
752
471
753
754
472
class BumpTimeoutCmd(PropertyCmd):
755
propname = "LastCheckedOK"
473
property = "LastCheckedOK"
756
474
value_to_set = ""
757
475
758
759
476
class StartCheckerCmd(PropertyCmd):
760
propname = "CheckerRunning"
477
property = "CheckerRunning"
761
478
value_to_set = dbus.Boolean(True)
762
479
763
764
480
class StopCheckerCmd(PropertyCmd):
765
propname = "CheckerRunning"
481
property = "CheckerRunning"
766
482
value_to_set = dbus.Boolean(False)
767
483
768
769
484
class ApproveByDefaultCmd(PropertyCmd):
770
propname = "ApprovedByDefault"
485
property = "ApprovedByDefault"
771
486
value_to_set = dbus.Boolean(True)
772
487
773
774
488
class DenyByDefaultCmd(PropertyCmd):
775
propname = "ApprovedByDefault"
489
property = "ApprovedByDefault"
776
490
value_to_set = dbus.Boolean(False)
777
491
778
779
class PropertyValueCmd(PropertyCmd):
780
"""Abstract class for PropertyCmd recieving a value as argument"""
781
def __init__(self, value):
782
self.value_to_set = value
783
784
785
class SetCheckerCmd(PropertyValueCmd):
786
propname = "Checker"
787
788
789
class SetHostCmd(PropertyValueCmd):
790
propname = "Host"
791
792
793
class SetSecretCmd(PropertyValueCmd):
794
propname = "Secret"
795
492
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
493
property = "Checker"
494
495
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
496
property = "Host"
497
498
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
796
499
@property
797
500
def value_to_set(self):
798
501
return self._vts
799
800
502
@value_to_set.setter
801
503
def value_to_set(self, value):
802
504
"""When setting, read data from supplied file object"""
803
505
self._vts = value.read()
804
506
value.close()
805
806
807
class MillisecondsPropertyValueArgumentCmd(PropertyValueCmd):
808
"""Abstract class for PropertyValueCmd taking a value argument as
809
a datetime.timedelta() but should store it as milliseconds."""
810
811
@property
812
def value_to_set(self):
813
return self._vts
814
815
@value_to_set.setter
816
def value_to_set(self, value):
817
"""When setting, convert value from a datetime.timedelta"""
818
self._vts = int(round(value.total_seconds() * 1000))
819
820
821
class SetTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
822
propname = "Timeout"
823
824
825
class SetExtendedTimeoutCmd(MillisecondsPropertyValueArgumentCmd):
826
propname = "ExtendedTimeout"
827
828
829
class SetIntervalCmd(MillisecondsPropertyValueArgumentCmd):
830
propname = "Interval"
831
832
833
class SetApprovalDelayCmd(MillisecondsPropertyValueArgumentCmd):
834
propname = "ApprovalDelay"
835
836
837
class SetApprovalDurationCmd(MillisecondsPropertyValueArgumentCmd):
838
propname = "ApprovalDuration"
839
507
property = "Secret"
508
509
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
510
property = "Timeout"
511
512
class SetExtendedTimeoutCmd(PropertyCmd,
513
MillisecondsValueArgumentMixIn):
514
property = "ExtendedTimeout"
515
516
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
517
property = "Interval"
518
519
class SetApprovalDelayCmd(PropertyCmd,
520
MillisecondsValueArgumentMixIn):
521
property = "ApprovalDelay"
522
523
class SetApprovalDurationCmd(PropertyCmd,
524
MillisecondsValueArgumentMixIn):
525
property = "ApprovalDuration"
526
527
def add_command_line_options(parser):
528
parser.add_argument("--version", action="version",
529
version="%(prog)s {}".format(version),
530
help="show version number and exit")
531
parser.add_argument("-a", "--all", action="store_true",
532
help="Select all clients")
533
parser.add_argument("-v", "--verbose", action="store_true",
534
help="Print all fields")
535
parser.add_argument("-j", "--dump-json", action="store_true",
536
help="Dump client data in JSON format")
537
enable_disable = parser.add_mutually_exclusive_group()
538
enable_disable.add_argument("-e", "--enable", action="store_true",
539
help="Enable client")
540
enable_disable.add_argument("-d", "--disable",
541
action="store_true",
542
help="disable client")
543
parser.add_argument("-b", "--bump-timeout", action="store_true",
544
help="Bump timeout for client")
545
start_stop_checker = parser.add_mutually_exclusive_group()
546
start_stop_checker.add_argument("--start-checker",
547
action="store_true",
548
help="Start checker for client")
549
start_stop_checker.add_argument("--stop-checker",
550
action="store_true",
551
help="Stop checker for client")
552
parser.add_argument("-V", "--is-enabled", action="store_true",
553
help="Check if client is enabled")
554
parser.add_argument("-r", "--remove", action="store_true",
555
help="Remove client")
556
parser.add_argument("-c", "--checker",
557
help="Set checker command for client")
558
parser.add_argument("-t", "--timeout", type=string_to_delta,
559
help="Set timeout for client")
560
parser.add_argument("--extended-timeout", type=string_to_delta,
561
help="Set extended timeout for client")
562
parser.add_argument("-i", "--interval", type=string_to_delta,
563
help="Set checker interval for client")
564
approve_deny_default = parser.add_mutually_exclusive_group()
565
approve_deny_default.add_argument(
566
"--approve-by-default", action="store_true",
567
default=None, dest="approved_by_default",
568
help="Set client to be approved by default")
569
approve_deny_default.add_argument(
570
"--deny-by-default", action="store_false",
571
dest="approved_by_default",
572
help="Set client to be denied by default")
573
parser.add_argument("--approval-delay", type=string_to_delta,
574
help="Set delay before client approve/deny")
575
parser.add_argument("--approval-duration", type=string_to_delta,
576
help="Set duration of one client approval")
577
parser.add_argument("-H", "--host", help="Set host for client")
578
parser.add_argument("-s", "--secret",
579
type=argparse.FileType(mode="rb"),
580
help="Set password blob (file) for client")
581
approve_deny = parser.add_mutually_exclusive_group()
582
approve_deny.add_argument(
583
"-A", "--approve", action="store_true",
584
help="Approve any current client request")
585
approve_deny.add_argument("-D", "--deny", action="store_true",
586
help="Deny any current client request")
587
parser.add_argument("--debug", action="store_true",
588
help="Debug mode (show D-Bus commands)")
589
parser.add_argument("--check", action="store_true",
590
help="Run self-test")
591
parser.add_argument("client", nargs="*", help="Client name")
592
593
594
def commands_from_options(options):
595
596
commands = []
597
598
if options.dump_json:
599
commands.append(DumpJSONCmd())
600
601
if options.enable:
602
commands.append(EnableCmd())
603
604
if options.disable:
605
commands.append(DisableCmd())
606
607
if options.bump_timeout:
608
commands.append(BumpTimeoutCmd())
609
610
if options.start_checker:
611
commands.append(StartCheckerCmd())
612
613
if options.stop_checker:
614
commands.append(StopCheckerCmd())
615
616
if options.is_enabled:
617
commands.append(IsEnabledCmd())
618
619
if options.checker is not None:
620
commands.append(SetCheckerCmd(options.checker))
621
622
if options.timeout is not None:
623
commands.append(SetTimeoutCmd(options.timeout))
624
625
if options.extended_timeout:
626
commands.append(
627
SetExtendedTimeoutCmd(options.extended_timeout))
628
629
if options.interval is not None:
630
commands.append(SetIntervalCmd(options.interval))
631
632
if options.approved_by_default is not None:
633
if options.approved_by_default:
634
commands.append(ApproveByDefaultCmd())
635
else:
636
commands.append(DenyByDefaultCmd())
637
638
if options.approval_delay is not None:
639
commands.append(SetApprovalDelayCmd(options.approval_delay))
640
641
if options.approval_duration is not None:
642
commands.append(
643
SetApprovalDurationCmd(options.approval_duration))
644
645
if options.host is not None:
646
commands.append(SetHostCmd(options.host))
647
648
if options.secret is not None:
649
commands.append(SetSecretCmd(options.secret))
650
651
if options.approve:
652
commands.append(ApproveCmd())
653
654
if options.deny:
655
commands.append(DenyCmd())
656
657
if options.remove:
658
commands.append(RemoveCmd())
659
660
# If no command option has been given, show table of clients,
661
# optionally verbosely
662
if not commands:
663
commands.append(PrintTableCmd(verbose=options.verbose))
664
665
return commands
666
667
668
def check_option_syntax(parser, options):
669
"""Apply additional restrictions on options, not expressible in
670
argparse"""
671
672
def has_actions(options):
673
return any((options.enable,
674
options.disable,
675
options.bump_timeout,
676
options.start_checker,
677
options.stop_checker,
678
options.is_enabled,
679
options.remove,
680
options.checker is not None,
681
options.timeout is not None,
682
options.extended_timeout is not None,
683
options.interval is not None,
684
options.approved_by_default is not None,
685
options.approval_delay is not None,
686
options.approval_duration is not None,
687
options.host is not None,
688
options.secret is not None,
689
options.approve,
690
options.deny))
691
692
if has_actions(options) and not (options.client or options.all):
693
parser.error("Options require clients names or --all.")
694
if options.verbose and has_actions(options):
695
parser.error("--verbose can only be used alone.")
696
if options.dump_json and (options.verbose
697
or has_actions(options)):
698
parser.error("--dump-json can only be used alone.")
699
if options.all and not has_actions(options):
700
parser.error("--all requires an action.")
701
if options.is_enabled and len(options.client) > 1:
702
parser.error("--is-enabled requires exactly one client")
703
if options.remove:
704
options.remove = False
705
if has_actions(options) and not options.deny:
706
parser.error("--remove can only be combined with --deny")
707
options.remove = True
708
709
710
def main():
711
parser = argparse.ArgumentParser()
712
713
add_command_line_options(parser)
714
715
options = parser.parse_args()
716
717
check_option_syntax(parser, options)
718
719
clientnames = options.client
720
721
if options.debug:
722
log.setLevel(logging.DEBUG)
723
724
try:
725
bus = dbus.SystemBus()
726
log.debug("D-Bus: Connect to: (name=%r, path=%r)", busname,
727
server_path)
728
mandos_dbus_objc = bus.get_object(busname, server_path)
729
except dbus.exceptions.DBusException:
730
log.critical("Could not connect to Mandos server")
731
sys.exit(1)
732
733
mandos_serv = dbus.Interface(mandos_dbus_objc,
734
dbus_interface=server_interface)
735
mandos_serv_object_manager = dbus.Interface(
736
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
737
738
# Filter out log message from dbus module
739
dbus_logger = logging.getLogger("dbus.proxies")
740
class NullFilter(logging.Filter):
741
def filter(self, record):
742
return False
743
dbus_filter = NullFilter()
744
try:
745
dbus_logger.addFilter(dbus_filter)
746
log.debug("D-Bus: %s:%s:%s.GetManagedObjects()", busname,
747
server_path, dbus.OBJECT_MANAGER_IFACE)
748
mandos_clients = {path: ifs_and_props[client_interface]
749
for path, ifs_and_props in
750
mandos_serv_object_manager
751
.GetManagedObjects().items()
752
if client_interface in ifs_and_props}
753
except dbus.exceptions.DBusException as e:
754
log.critical("Failed to access Mandos server through D-Bus:"
755
"\n%s", e)
756
sys.exit(1)
757
finally:
758
# restore dbus logger
759
dbus_logger.removeFilter(dbus_filter)
760
761
# Compile dict of (clients: properties) to process
762
clients = {}
763
764
if not clientnames:
765
clients = {(log.debug("D-Bus: Connect to: (name=%r, path=%r)",
766
busname, str(path)) and False) or
767
bus.get_object(busname, path): properties
768
for path, properties in mandos_clients.items()}
769
else:
770
for name in clientnames:
771
for path, client in mandos_clients.items():
772
if client["Name"] == name:
773
log.debug("D-Bus: Connect to: (name=%r, path=%r)",
774
busname, str(path))
775
client_objc = bus.get_object(busname, path)
776
clients[client_objc] = client
777
break
778
else:
779
log.critical("Client not found on server: %r", name)
780
sys.exit(1)
781
782
# Run all commands on clients
783
commands = commands_from_options(options)
784
for command in commands:
785
command.run(mandos_serv, clients)
840
786
841
787
842
class TestCaseWithAssertLogs(unittest.TestCase):
843
"""unittest.TestCase.assertLogs only exists in Python 3.4"""
844
845
if not hasattr(unittest.TestCase, "assertLogs"):
846
@contextlib.contextmanager
847
def assertLogs(self, logger, level=logging.INFO):
848
capturing_handler = self.CapturingLevelHandler(level)
849
old_level = logger.level
850
old_propagate = logger.propagate
851
logger.addHandler(capturing_handler)
852
logger.setLevel(level)
853
logger.propagate = False
854
try:
855
yield capturing_handler.watcher
856
finally:
857
logger.propagate = old_propagate
858
logger.removeHandler(capturing_handler)
859
logger.setLevel(old_level)
860
self.assertGreater(len(capturing_handler.watcher.records),
861
0)
862
863
class CapturingLevelHandler(logging.Handler):
864
def __init__(self, level, *args, **kwargs):
865
logging.Handler.__init__(self, *args, **kwargs)
866
self.watcher = self.LoggingWatcher([], [])
867
def emit(self, record):
868
self.watcher.records.append(record)
869
self.watcher.output.append(self.format(record))
870
871
LoggingWatcher = collections.namedtuple("LoggingWatcher",
872
("records",
873
"output"))
874
875
class Test_string_to_delta(TestCaseWithAssertLogs):
788
class Test_milliseconds_to_string(unittest.TestCase):
789
def test_all(self):
790
self.assertEqual(milliseconds_to_string(93785000),
791
"1T02:03:05")
792
def test_no_days(self):
793
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
794
def test_all_zero(self):
795
self.assertEqual(milliseconds_to_string(0), "00:00:00")
796
def test_no_fractional_seconds(self):
797
self.assertEqual(milliseconds_to_string(400), "00:00:00")
798
self.assertEqual(milliseconds_to_string(900), "00:00:00")
799
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
800
801
class Test_string_to_delta(unittest.TestCase):
876
802
def test_handles_basic_rfc3339(self):
877
803
self.assertEqual(string_to_delta("PT0S"),
878
804
datetime.timedelta())
882
808
datetime.timedelta(0, 1))
883
809
self.assertEqual(string_to_delta("PT2H"),
884
810
datetime.timedelta(0, 7200))
885
886
811
def test_falls_back_to_pre_1_6_1_with_warning(self):
887
with self.assertLogs(log, logging.WARNING):
888
value = string_to_delta("2h")
812
# assertLogs only exists in Python 3.4
813
if hasattr(self, "assertLogs"):
814
with self.assertLogs(log, logging.WARNING):
815
value = string_to_delta("2h")
816
else:
817
class WarningFilter(logging.Filter):
818
"""Don't show, but record the presence of, warnings"""
819
def filter(self, record):
820
is_warning = record.levelno >= logging.WARNING
821
self.found = is_warning or getattr(self, "found",
822
False)
823
return not is_warning
824
warning_filter = WarningFilter()
825
log.addFilter(warning_filter)
826
try:
827
value = string_to_delta("2h")
828
finally:
829
log.removeFilter(warning_filter)
830
self.assertTrue(getattr(warning_filter, "found", False))
889
831
self.assertEqual(value, datetime.timedelta(0, 7200))
890
832
891
833
892
class Test_check_option_syntax(unittest.TestCase):
893
def setUp(self):
894
self.parser = argparse.ArgumentParser()
895
add_command_line_options(self.parser)
896
897
def test_actions_requires_client_or_all(self):
898
for action, value in self.actions.items():
899
options = self.parser.parse_args()
900
setattr(options, action, value)
901
with self.assertParseError():
902
self.check_option_syntax(options)
903
904
# This mostly corresponds to the definition from has_actions() in
905
# check_option_syntax()
906
actions = {
907
# The actual values set here are not that important, but we do
908
# at least stick to the correct types, even though they are
909
# never used
910
"enable": True,
911
"disable": True,
912
"bump_timeout": True,
913
"start_checker": True,
914
"stop_checker": True,
915
"is_enabled": True,
916
"remove": True,
917
"checker": "x",
918
"timeout": datetime.timedelta(),
919
"extended_timeout": datetime.timedelta(),
920
"interval": datetime.timedelta(),
921
"approved_by_default": True,
922
"approval_delay": datetime.timedelta(),
923
"approval_duration": datetime.timedelta(),
924
"host": "x",
925
"secret": io.BytesIO(b"x"),
926
"approve": True,
927
"deny": True,
928
}
929
930
@contextlib.contextmanager
931
def assertParseError(self):
932
with self.assertRaises(SystemExit) as e:
933
with self.temporarily_suppress_stderr():
934
yield
935
# Exit code from argparse is guaranteed to be "2". Reference:
936
# https://docs.python.org/3/library
937
# /argparse.html#exiting-methods
938
self.assertEqual(e.exception.code, 2)
939
940
@staticmethod
941
@contextlib.contextmanager
942
def temporarily_suppress_stderr():
943
null = os.open(os.path.devnull, os.O_RDWR)
944
stderrcopy = os.dup(sys.stderr.fileno())
945
os.dup2(null, sys.stderr.fileno())
946
os.close(null)
947
try:
948
yield
949
finally:
950
# restore stderr
951
os.dup2(stderrcopy, sys.stderr.fileno())
952
os.close(stderrcopy)
953
954
def check_option_syntax(self, options):
955
check_option_syntax(self.parser, options)
956
957
def test_actions_conflicts_with_verbose(self):
958
for action, value in self.actions.items():
959
options = self.parser.parse_args()
960
setattr(options, action, value)
961
options.verbose = True
962
with self.assertParseError():
963
self.check_option_syntax(options)
964
965
def test_dump_json_conflicts_with_verbose(self):
966
options = self.parser.parse_args()
967
options.dump_json = True
968
options.verbose = True
969
with self.assertParseError():
970
self.check_option_syntax(options)
971
972
def test_dump_json_conflicts_with_action(self):
973
for action, value in self.actions.items():
974
options = self.parser.parse_args()
975
setattr(options, action, value)
976
options.dump_json = True
977
with self.assertParseError():
978
self.check_option_syntax(options)
979
980
def test_all_can_not_be_alone(self):
981
options = self.parser.parse_args()
982
options.all = True
983
with self.assertParseError():
984
self.check_option_syntax(options)
985
986
def test_all_is_ok_with_any_action(self):
987
for action, value in self.actions.items():
988
options = self.parser.parse_args()
989
setattr(options, action, value)
990
options.all = True
991
self.check_option_syntax(options)
992
993
def test_is_enabled_fails_without_client(self):
994
options = self.parser.parse_args()
995
options.is_enabled = True
996
with self.assertParseError():
997
self.check_option_syntax(options)
998
999
def test_is_enabled_works_with_one_client(self):
1000
options = self.parser.parse_args()
1001
options.is_enabled = True
1002
options.client = ["foo"]
1003
self.check_option_syntax(options)
1004
1005
def test_is_enabled_fails_with_two_clients(self):
1006
options = self.parser.parse_args()
1007
options.is_enabled = True
1008
options.client = ["foo", "barbar"]
1009
with self.assertParseError():
1010
self.check_option_syntax(options)
1011
1012
def test_remove_can_only_be_combined_with_action_deny(self):
1013
for action, value in self.actions.items():
1014
if action in {"remove", "deny"}:
1015
continue
1016
options = self.parser.parse_args()
1017
setattr(options, action, value)
1018
options.all = True
1019
options.remove = True
1020
with self.assertParseError():
1021
self.check_option_syntax(options)
1022
1023
1024
class Test_get_mandos_dbus_object(TestCaseWithAssertLogs):
1025
def test_calls_and_returns_get_object_on_bus(self):
1026
class MockBus(object):
1027
called = False
1028
def get_object(mockbus_self, busname, dbus_path):
1029
# Note that "self" is still the testcase instance,
1030
# this MockBus instance is in "mockbus_self".
1031
self.assertEqual(busname, dbus_busname)
1032
self.assertEqual(dbus_path, server_dbus_path)
1033
mockbus_self.called = True
1034
return mockbus_self
1035
1036
mockbus = get_mandos_dbus_object(bus=MockBus())
1037
self.assertIsInstance(mockbus, MockBus)
1038
self.assertTrue(mockbus.called)
1039
1040
def test_logs_and_exits_on_dbus_error(self):
1041
class MockBusFailing(object):
1042
def get_object(self, busname, dbus_path):
1043
raise dbus.exceptions.DBusException("Test")
1044
1045
with self.assertLogs(log, logging.CRITICAL):
1046
with self.assertRaises(SystemExit) as e:
1047
bus = get_mandos_dbus_object(bus=MockBusFailing())
1048
1049
if isinstance(e.exception.code, int):
1050
self.assertNotEqual(e.exception.code, 0)
1051
else:
1052
self.assertIsNotNone(e.exception.code)
1053
1054
1055
class Test_get_managed_objects(TestCaseWithAssertLogs):
1056
def test_calls_and_returns_GetManagedObjects(self):
1057
managed_objects = {"/clients/foo": { "Name": "foo"}}
1058
class MockObjectManager(object):
1059
def GetManagedObjects(self):
1060
return managed_objects
1061
retval = get_managed_objects(MockObjectManager())
1062
self.assertDictEqual(managed_objects, retval)
1063
1064
def test_logs_and_exits_on_dbus_error(self):
1065
dbus_logger = logging.getLogger("dbus.proxies")
1066
1067
class MockObjectManagerFailing(object):
1068
def GetManagedObjects(self):
1069
dbus_logger.error("Test")
1070
raise dbus.exceptions.DBusException("Test")
1071
1072
class CountingHandler(logging.Handler):
1073
count = 0
1074
def emit(self, record):
1075
self.count += 1
1076
1077
counting_handler = CountingHandler()
1078
1079
dbus_logger.addHandler(counting_handler)
1080
1081
try:
1082
with self.assertLogs(log, logging.CRITICAL) as watcher:
1083
with self.assertRaises(SystemExit) as e:
1084
get_managed_objects(MockObjectManagerFailing())
1085
finally:
1086
dbus_logger.removeFilter(counting_handler)
1087
self.assertEqual(counting_handler.count, 0)
1088
1089
# Test that the dbus_logger still works
1090
with self.assertLogs(dbus_logger, logging.ERROR):
1091
dbus_logger.error("Test")
1092
1093
if isinstance(e.exception.code, int):
1094
self.assertNotEqual(e.exception.code, 0)
1095
else:
1096
self.assertIsNotNone(e.exception.code)
1097
1098
1099
class Test_commands_from_options(unittest.TestCase):
1100
def setUp(self):
1101
self.parser = argparse.ArgumentParser()
1102
add_command_line_options(self.parser)
1103
1104
def test_is_enabled(self):
1105
self.assert_command_from_args(["--is-enabled", "foo"],
1106
IsEnabledCmd)
1107
1108
def assert_command_from_args(self, args, command_cls,
1109
**cmd_attrs):
1110
"""Assert that parsing ARGS should result in an instance of
1111
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1112
options = self.parser.parse_args(args)
1113
check_option_syntax(self.parser, options)
1114
commands = commands_from_options(options)
1115
self.assertEqual(len(commands), 1)
1116
command = commands[0]
1117
self.assertIsInstance(command, command_cls)
1118
for key, value in cmd_attrs.items():
1119
self.assertEqual(getattr(command, key), value)
1120
1121
def test_is_enabled_short(self):
1122
self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1123
1124
def test_approve(self):
1125
self.assert_command_from_args(["--approve", "foo"],
1126
ApproveCmd)
1127
1128
def test_approve_short(self):
1129
self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1130
1131
def test_deny(self):
1132
self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1133
1134
def test_deny_short(self):
1135
self.assert_command_from_args(["-D", "foo"], DenyCmd)
1136
1137
def test_remove(self):
1138
self.assert_command_from_args(["--remove", "foo"],
1139
RemoveCmd)
1140
1141
def test_deny_before_remove(self):
1142
options = self.parser.parse_args(["--deny", "--remove",
1143
"foo"])
1144
check_option_syntax(self.parser, options)
1145
commands = commands_from_options(options)
1146
self.assertEqual(len(commands), 2)
1147
self.assertIsInstance(commands[0], DenyCmd)
1148
self.assertIsInstance(commands[1], RemoveCmd)
1149
1150
def test_deny_before_remove_reversed(self):
1151
options = self.parser.parse_args(["--remove", "--deny",
1152
"--all"])
1153
check_option_syntax(self.parser, options)
1154
commands = commands_from_options(options)
1155
self.assertEqual(len(commands), 2)
1156
self.assertIsInstance(commands[0], DenyCmd)
1157
self.assertIsInstance(commands[1], RemoveCmd)
1158
1159
def test_remove_short(self):
1160
self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1161
1162
def test_dump_json(self):
1163
self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1164
1165
def test_enable(self):
1166
self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1167
1168
def test_enable_short(self):
1169
self.assert_command_from_args(["-e", "foo"], EnableCmd)
1170
1171
def test_disable(self):
1172
self.assert_command_from_args(["--disable", "foo"],
1173
DisableCmd)
1174
1175
def test_disable_short(self):
1176
self.assert_command_from_args(["-d", "foo"], DisableCmd)
1177
1178
def test_bump_timeout(self):
1179
self.assert_command_from_args(["--bump-timeout", "foo"],
1180
BumpTimeoutCmd)
1181
1182
def test_bump_timeout_short(self):
1183
self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1184
1185
def test_start_checker(self):
1186
self.assert_command_from_args(["--start-checker", "foo"],
1187
StartCheckerCmd)
1188
1189
def test_stop_checker(self):
1190
self.assert_command_from_args(["--stop-checker", "foo"],
1191
StopCheckerCmd)
1192
1193
def test_approve_by_default(self):
1194
self.assert_command_from_args(["--approve-by-default", "foo"],
1195
ApproveByDefaultCmd)
1196
1197
def test_deny_by_default(self):
1198
self.assert_command_from_args(["--deny-by-default", "foo"],
1199
DenyByDefaultCmd)
1200
1201
def test_checker(self):
1202
self.assert_command_from_args(["--checker", ":", "foo"],
1203
SetCheckerCmd, value_to_set=":")
1204
1205
def test_checker_empty(self):
1206
self.assert_command_from_args(["--checker", "", "foo"],
1207
SetCheckerCmd, value_to_set="")
1208
1209
def test_checker_short(self):
1210
self.assert_command_from_args(["-c", ":", "foo"],
1211
SetCheckerCmd, value_to_set=":")
1212
1213
def test_host(self):
1214
self.assert_command_from_args(["--host", "foo.example.org",
1215
"foo"], SetHostCmd,
1216
value_to_set="foo.example.org")
1217
1218
def test_host_short(self):
1219
self.assert_command_from_args(["-H", "foo.example.org",
1220
"foo"], SetHostCmd,
1221
value_to_set="foo.example.org")
1222
1223
def test_secret_devnull(self):
1224
self.assert_command_from_args(["--secret", os.path.devnull,
1225
"foo"], SetSecretCmd,
1226
value_to_set=b"")
1227
1228
def test_secret_tempfile(self):
1229
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1230
value = b"secret\0xyzzy\nbar"
1231
f.write(value)
1232
f.seek(0)
1233
self.assert_command_from_args(["--secret", f.name,
1234
"foo"], SetSecretCmd,
1235
value_to_set=value)
1236
1237
def test_secret_devnull_short(self):
1238
self.assert_command_from_args(["-s", os.path.devnull, "foo"],
1239
SetSecretCmd, value_to_set=b"")
1240
1241
def test_secret_tempfile_short(self):
1242
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1243
value = b"secret\0xyzzy\nbar"
1244
f.write(value)
1245
f.seek(0)
1246
self.assert_command_from_args(["-s", f.name, "foo"],
1247
SetSecretCmd,
1248
value_to_set=value)
1249
1250
def test_timeout(self):
1251
self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1252
SetTimeoutCmd,
1253
value_to_set=300000)
1254
1255
def test_timeout_short(self):
1256
self.assert_command_from_args(["-t", "PT5M", "foo"],
1257
SetTimeoutCmd,
1258
value_to_set=300000)
1259
1260
def test_extended_timeout(self):
1261
self.assert_command_from_args(["--extended-timeout", "PT15M",
1262
"foo"],
1263
SetExtendedTimeoutCmd,
1264
value_to_set=900000)
1265
1266
def test_interval(self):
1267
self.assert_command_from_args(["--interval", "PT2M", "foo"],
1268
SetIntervalCmd,
1269
value_to_set=120000)
1270
1271
def test_interval_short(self):
1272
self.assert_command_from_args(["-i", "PT2M", "foo"],
1273
SetIntervalCmd,
1274
value_to_set=120000)
1275
1276
def test_approval_delay(self):
1277
self.assert_command_from_args(["--approval-delay", "PT30S",
1278
"foo"], SetApprovalDelayCmd,
1279
value_to_set=30000)
1280
1281
def test_approval_duration(self):
1282
self.assert_command_from_args(["--approval-duration", "PT1S",
1283
"foo"], SetApprovalDurationCmd,
1284
value_to_set=1000)
1285
1286
def test_print_table(self):
1287
self.assert_command_from_args([], PrintTableCmd,
1288
verbose=False)
1289
1290
def test_print_table_verbose(self):
1291
self.assert_command_from_args(["--verbose"], PrintTableCmd,
1292
verbose=True)
1293
1294
def test_print_table_verbose_short(self):
1295
self.assert_command_from_args(["-v"], PrintTableCmd,
1296
verbose=True)
1297
1298
1299
834
class TestCmd(unittest.TestCase):
1300
835
"""Abstract class for tests of command classes"""
1301
1302
836
def setUp(self):
1303
837
testcase = self
1304
838
class MockClient(object):
1305
839
def __init__(self, name, **attributes):
1306
self.__dbus_object_path__ = "/clients/{}".format(name)
840
self.__dbus_object_path__ = "objpath_{}".format(name)
1307
841
self.attributes = attributes
1308
842
self.attributes["Name"] = name
1309
843
self.calls = []
1310
def Set(self, interface, propname, value, dbus_interface):
1311
testcase.assertEqual(interface, client_dbus_interface)
1312
testcase.assertEqual(dbus_interface,
1313
dbus.PROPERTIES_IFACE)
1314
self.attributes[propname] = value
1315
def Get(self, interface, propname, dbus_interface):
1316
testcase.assertEqual(interface, client_dbus_interface)
1317
testcase.assertEqual(dbus_interface,
1318
dbus.PROPERTIES_IFACE)
1319
return self.attributes[propname]
844
def Set(self, interface, property, value, dbus_interface):
845
testcase.assertEqual(interface, client_interface)
846
testcase.assertEqual(dbus_interface,
847
dbus.PROPERTIES_IFACE)
848
self.attributes[property] = value
849
def Get(self, interface, property, dbus_interface):
850
testcase.assertEqual(interface, client_interface)
851
testcase.assertEqual(dbus_interface,
852
dbus.PROPERTIES_IFACE)
853
return self.attributes[property]
1320
854
def Approve(self, approve, dbus_interface):
1321
testcase.assertEqual(dbus_interface,
1322
client_dbus_interface)
855
testcase.assertEqual(dbus_interface, client_interface)
1323
856
self.calls.append(("Approve", (approve,
1324
857
dbus_interface)))
1325
858
self.client = MockClient(
1365
898
ApprovedByDefault=dbus.Boolean(False),
1366
899
LastApprovalRequest="2019-01-03T00:00:00",
1367
900
ApprovalDelay=30000,
1368
ApprovalDuration=93785000,
901
ApprovalDuration=1000,
1369
902
Checker=":",
1370
903
ExtendedTimeout=900000,
1371
904
Expires="2019-02-05T00:00:00",
1372
905
LastCheckerStatus=-2)
1373
906
self.clients = collections.OrderedDict(
1374
907
[
1375
("/clients/foo", self.client.attributes),
1376
("/clients/barbar", self.other_client.attributes),
908
(self.client, self.client.attributes),
909
(self.other_client, self.other_client.attributes),
1377
910
])
1378
self.one_client = {"/clients/foo": self.client.attributes}
1379
1380
@property
1381
def bus(self):
1382
class Bus(object):
1383
@staticmethod
1384
def get_object(client_bus_name, path):
1385
self.assertEqual(client_bus_name, dbus_busname)
1386
return {
1387
# Note: "self" here is the TestCmd instance, not
1388
# the Bus instance, since this is a static method!
1389
"/clients/foo": self.client,
1390
"/clients/barbar": self.other_client,
1391
}[path]
1392
return Bus()
1393
1394
1395
class TestIsEnabledCmd(TestCmd):
1396
def test_is_enabled(self):
1397
self.assertTrue(all(IsEnabledCmd().is_enabled(client,
1398
properties)
1399
for client, properties
1400
in self.clients.items()))
1401
1402
def test_is_enabled_run_exits_successfully(self):
1403
with self.assertRaises(SystemExit) as e:
1404
IsEnabledCmd().run(self.one_client)
1405
if e.exception.code is not None:
1406
self.assertEqual(e.exception.code, 0)
1407
else:
1408
self.assertIsNone(e.exception.code)
1409
1410
def test_is_enabled_run_exits_with_failure(self):
1411
self.client.attributes["Enabled"] = dbus.Boolean(False)
1412
with self.assertRaises(SystemExit) as e:
1413
IsEnabledCmd().run(self.one_client)
1414
if isinstance(e.exception.code, int):
1415
self.assertNotEqual(e.exception.code, 0)
1416
else:
1417
self.assertIsNotNone(e.exception.code)
1418
1419
1420
class TestApproveCmd(TestCmd):
1421
def test_approve(self):
1422
ApproveCmd().run(self.clients, self.bus)
1423
for clientpath in self.clients:
1424
client = self.bus.get_object(dbus_busname, clientpath)
1425
self.assertIn(("Approve", (True, client_dbus_interface)),
1426
client.calls)
1427
1428
1429
class TestDenyCmd(TestCmd):
1430
def test_deny(self):
1431
DenyCmd().run(self.clients, self.bus)
1432
for clientpath in self.clients:
1433
client = self.bus.get_object(dbus_busname, clientpath)
1434
self.assertIn(("Approve", (False, client_dbus_interface)),
1435
client.calls)
1436
1437
1438
class TestRemoveCmd(TestCmd):
1439
def test_remove(self):
1440
class MockMandos(object):
1441
def __init__(self):
1442
self.calls = []
1443
def RemoveClient(self, dbus_path):
1444
self.calls.append(("RemoveClient", (dbus_path,)))
1445
mandos = MockMandos()
1446
super(TestRemoveCmd, self).setUp()
1447
RemoveCmd().run(self.clients, self.bus, mandos)
1448
self.assertEqual(len(mandos.calls), 2)
1449
for clientpath in self.clients:
1450
self.assertIn(("RemoveClient", (clientpath,)),
1451
mandos.calls)
1452
911
self.one_client = {self.client: self.client.attributes}
912
913
class TestPrintTableCmd(TestCmd):
914
def test_normal(self):
915
output = PrintTableCmd().output(self.clients.values())
916
expected_output = """
917
Name Enabled Timeout Last Successful Check
918
foo Yes 00:05:00 2019-02-03T00:00:00
919
barbar Yes 00:05:00 2019-02-04T00:00:00
920
"""[1:-1]
921
self.assertEqual(output, expected_output)
922
def test_verbose(self):
923
output = PrintTableCmd(verbose=True).output(
924
self.clients.values())
925
expected_output = """
926
Name Enabled Timeout Last Successful Check Created Interval Host Key ID Fingerprint Check Is Running Last Enabled Approval Is Pending Approved By Default Last Approval Request Approval Delay Approval Duration Checker Extended Timeout Expires Last Checker Status
927
foo Yes 00:05:00 2019-02-03T00:00:00 2019-01-02T00:00:00 00:02:00 foo.example.org 92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8ea90a27cddb12 778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 No 2019-01-03T00:00:00 No Yes 00:00:00 00:00:01 fping -q -- %(host)s 00:15:00 2019-02-04T00:00:00 0
928
barbar Yes 00:05:00 2019-02-04T00:00:00 2019-01-03T00:00:00 00:02:00 192.0.2.3 0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e46c2b020f441c 3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 Yes 2019-01-04T00:00:00 No No 2019-01-03T00:00:00 00:00:30 00:00:01 : 00:15:00 2019-02-05T00:00:00 -2
929
"""[1:-1]
930
self.assertEqual(output, expected_output)
931
def test_one_client(self):
932
output = PrintTableCmd().output(self.one_client.values())
933
expected_output = """
934
Name Enabled Timeout Last Successful Check
935
foo Yes 00:05:00 2019-02-03T00:00:00
936
"""[1:-1]
937
self.assertEqual(output, expected_output)
1453
938
1454
939
class TestDumpJSONCmd(TestCmd):
1455
940
def setUp(self):
1496
981
"ApprovedByDefault": False,
1497
982
"LastApprovalRequest": "2019-01-03T00:00:00",
1498
983
"ApprovalDelay": 30000,
1499
"ApprovalDuration": 93785000,
984
"ApprovalDuration": 1000,
1500
985
"Checker": ":",
1501
986
"ExtendedTimeout": 900000,
1502
987
"Expires": "2019-02-05T00:00:00",
1504
989
},
1505
990
}
1506
991
return super(TestDumpJSONCmd, self).setUp()
1507
1508
992
def test_normal(self):
1509
output = DumpJSONCmd().output(self.clients.values())
1510
json_data = json.loads(output)
993
json_data = json.loads(DumpJSONCmd().output(self.clients))
1511
994
self.assertDictEqual(json_data, self.expected_json)
1512
1513
995
def test_one_client(self):
1514
output = DumpJSONCmd().output(self.one_client.values())
1515
json_data = json.loads(output)
996
clients = self.one_client
997
json_data = json.loads(DumpJSONCmd().output(clients))
1516
998
expected_json = {"foo": self.expected_json["foo"]}
1517
999
self.assertDictEqual(json_data, expected_json)
1518
1000
1519
1520
class TestPrintTableCmd(TestCmd):
1521
def test_normal(self):
1522
output = PrintTableCmd().output(self.clients.values())
1523
expected_output = "\n".join((
1524
"Name Enabled Timeout Last Successful Check",
1525
"foo Yes 00:05:00 2019-02-03T00:00:00 ",
1526
"barbar Yes 00:05:00 2019-02-04T00:00:00 ",
1527
))
1528
self.assertEqual(output, expected_output)
1529
1530
def test_verbose(self):
1531
output = PrintTableCmd(verbose=True).output(
1532
self.clients.values())
1533
columns = (
1534
(
1535
"Name ",
1536
"foo ",
1537
"barbar ",
1538
),(
1539
"Enabled ",
1540
"Yes ",
1541
"Yes ",
1542
),(
1543
"Timeout ",
1544
"00:05:00 ",
1545
"00:05:00 ",
1546
),(
1547
"Last Successful Check ",
1548
"2019-02-03T00:00:00 ",
1549
"2019-02-04T00:00:00 ",
1550
),(
1551
"Created ",
1552
"2019-01-02T00:00:00 ",
1553
"2019-01-03T00:00:00 ",
1554
),(
1555
"Interval ",
1556
"00:02:00 ",
1557
"00:02:00 ",
1558
),(
1559
"Host ",
1560
"foo.example.org ",
1561
"192.0.2.3 ",
1562
),(
1563
("Key ID "
1564
" "),
1565
("92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8"
1566
"ea90a27cddb12 "),
1567
("0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e"
1568
"46c2b020f441c "),
1569
),(
1570
"Fingerprint ",
1571
"778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 ",
1572
"3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 ",
1573
),(
1574
"Check Is Running ",
1575
"No ",
1576
"Yes ",
1577
),(
1578
"Last Enabled ",
1579
"2019-01-03T00:00:00 ",
1580
"2019-01-04T00:00:00 ",
1581
),(
1582
"Approval Is Pending ",
1583
"No ",
1584
"No ",
1585
),(
1586
"Approved By Default ",
1587
"Yes ",
1588
"No ",
1589
),(
1590
"Last Approval Request ",
1591
" ",
1592
"2019-01-03T00:00:00 ",
1593
),(
1594
"Approval Delay ",
1595
"00:00:00 ",
1596
"00:00:30 ",
1597
),(
1598
"Approval Duration ",
1599
"00:00:01 ",
1600
"1T02:03:05 ",
1601
),(
1602
"Checker ",
1603
"fping -q -- %(host)s ",
1604
": ",
1605
),(
1606
"Extended Timeout ",
1607
"00:15:00 ",
1608
"00:15:00 ",
1609
),(
1610
"Expires ",
1611
"2019-02-04T00:00:00 ",
1612
"2019-02-05T00:00:00 ",
1613
),(
1614
"Last Checker Status",
1615
"0 ",
1616
"-2 ",
1617
)
1618
)
1619
num_lines = max(len(rows) for rows in columns)
1620
expected_output = "\n".join("".join(rows[line]
1621
for rows in columns)
1622
for line in range(num_lines))
1623
self.assertEqual(output, expected_output)
1624
1625
def test_one_client(self):
1626
output = PrintTableCmd().output(self.one_client.values())
1627
expected_output = "\n".join((
1628
"Name Enabled Timeout Last Successful Check",
1629
"foo Yes 00:05:00 2019-02-03T00:00:00 ",
1630
))
1631
self.assertEqual(output, expected_output)
1632
1001
class TestIsEnabledCmd(TestCmd):
1002
def test_is_enabled(self):
1003
self.assertTrue(all(IsEnabledCmd().is_enabled(client, properties)
1004
for client, properties in self.clients.items()))
1005
def test_is_enabled_run_exits_successfully(self):
1006
with self.assertRaises(SystemExit) as e:
1007
IsEnabledCmd().run(None, self.one_client)
1008
if e.exception.code is not None:
1009
self.assertEqual(e.exception.code, 0)
1010
else:
1011
self.assertIsNone(e.exception.code)
1012
def test_is_enabled_run_exits_with_failure(self):
1013
self.client.attributes["Enabled"] = dbus.Boolean(False)
1014
with self.assertRaises(SystemExit) as e:
1015
IsEnabledCmd().run(None, self.one_client)
1016
if isinstance(e.exception.code, int):
1017
self.assertNotEqual(e.exception.code, 0)
1018
else:
1019
self.assertIsNotNone(e.exception.code)
1020
1021
class TestRemoveCmd(TestCmd):
1022
def test_remove(self):
1023
class MockMandos(object):
1024
def __init__(self):
1025
self.calls = []
1026
def RemoveClient(self, dbus_path):
1027
self.calls.append(("RemoveClient", (dbus_path,)))
1028
mandos = MockMandos()
1029
super(TestRemoveCmd, self).setUp()
1030
RemoveCmd().run(mandos, self.clients)
1031
self.assertEqual(len(mandos.calls), 2)
1032
for client in self.clients:
1033
self.assertIn(("RemoveClient",
1034
(client.__dbus_object_path__,)),
1035
mandos.calls)
1036
1037
class TestApproveCmd(TestCmd):
1038
def test_approve(self):
1039
ApproveCmd().run(None, self.clients)
1040
for client in self.clients:
1041
self.assertIn(("Approve", (True, client_interface)),
1042
client.calls)
1043
1044
class TestDenyCmd(TestCmd):
1045
def test_deny(self):
1046
DenyCmd().run(None, self.clients)
1047
for client in self.clients:
1048
self.assertIn(("Approve", (False, client_interface)),
1049
client.calls)
1050
1051
class TestEnableCmd(TestCmd):
1052
def test_enable(self):
1053
for client in self.clients:
1054
client.attributes["Enabled"] = False
1055
1056
EnableCmd().run(None, self.clients)
1057
1058
for client in self.clients:
1059
self.assertTrue(client.attributes["Enabled"])
1060
1061
class TestDisableCmd(TestCmd):
1062
def test_disable(self):
1063
DisableCmd().run(None, self.clients)
1064
1065
for client in self.clients:
1066
self.assertFalse(client.attributes["Enabled"])
1067
1068
class Unique(object):
1069
"""Class for objects which exist only to be unique objects, since
1070
unittest.mock.sentinel only exists in Python 3.3"""
1633
1071
1634
1072
class TestPropertyCmd(TestCmd):
1635
1073
"""Abstract class for tests of PropertyCmd classes"""
1640
1078
self.values_to_set)
1641
1079
for value_to_set, value_to_get in zip(self.values_to_set,
1642
1080
values_to_get):
1643
for clientpath in self.clients:
1644
client = self.bus.get_object(dbus_busname, clientpath)
1645
old_value = client.attributes[self.propname]
1646
self.assertNotIsInstance(old_value, self.Unique)
1647
client.attributes[self.propname] = self.Unique()
1081
for client in self.clients:
1082
old_value = client.attributes[self.property]
1083
self.assertNotIsInstance(old_value, Unique)
1084
client.attributes[self.property] = Unique()
1648
1085
self.run_command(value_to_set, self.clients)
1649
for clientpath in self.clients:
1650
client = self.bus.get_object(dbus_busname, clientpath)
1651
value = client.attributes[self.propname]
1652
self.assertNotIsInstance(value, self.Unique)
1086
for client in self.clients:
1087
value = client.attributes[self.property]
1088
self.assertNotIsInstance(value, Unique)
1653
1089
self.assertEqual(value, value_to_get)
1654
1655
class Unique(object):
1656
"""Class for objects which exist only to be unique objects,
1657
since unittest.mock.sentinel only exists in Python 3.3"""
1658
1659
1090
def run_command(self, value, clients):
1660
self.command().run(clients, self.bus)
1661
1662
1663
class TestEnableCmd(TestPropertyCmd):
1664
command = EnableCmd
1665
propname = "Enabled"
1666
values_to_set = [dbus.Boolean(True)]
1667
1668
1669
class TestDisableCmd(TestPropertyCmd):
1670
command = DisableCmd
1671
propname = "Enabled"
1672
values_to_set = [dbus.Boolean(False)]
1673
1091
self.command().run(None, clients)
1674
1092
1675
1093
class TestBumpTimeoutCmd(TestPropertyCmd):
1676
1094
command = BumpTimeoutCmd
1677
propname = "LastCheckedOK"
1095
property = "LastCheckedOK"
1678
1096
values_to_set = [""]
1679
1097
1680
1681
1098
class TestStartCheckerCmd(TestPropertyCmd):
1682
1099
command = StartCheckerCmd
1683
propname = "CheckerRunning"
1100
property = "CheckerRunning"
1684
1101
values_to_set = [dbus.Boolean(True)]
1685
1102
1686
1687
1103
class TestStopCheckerCmd(TestPropertyCmd):
1688
1104
command = StopCheckerCmd
1689
propname = "CheckerRunning"
1105
property = "CheckerRunning"
1690
1106
values_to_set = [dbus.Boolean(False)]
1691
1107
1692
1693
1108
class TestApproveByDefaultCmd(TestPropertyCmd):
1694
1109
command = ApproveByDefaultCmd
1695
propname = "ApprovedByDefault"
1110
property = "ApprovedByDefault"
1696
1111
values_to_set = [dbus.Boolean(True)]
1697
1112
1698
1699
1113
class TestDenyByDefaultCmd(TestPropertyCmd):
1700
1114
command = DenyByDefaultCmd
1701
propname = "ApprovedByDefault"
1115
property = "ApprovedByDefault"
1702
1116
values_to_set = [dbus.Boolean(False)]
1703
1117
1704
1705
class TestPropertyValueCmd(TestPropertyCmd):
1706
"""Abstract class for tests of PropertyValueCmd classes"""
1707
1118
class TestValueArgumentPropertyCmd(TestPropertyCmd):
1119
"""Abstract class for tests of PropertyCmd classes using the
1120
ValueArgumentMixIn"""
1708
1121
def runTest(self):
1709
if type(self) is TestPropertyValueCmd:
1122
if type(self) is TestValueArgumentPropertyCmd:
1710
1123
return
1711
return super(TestPropertyValueCmd, self).runTest()
1712
1124
return super(TestValueArgumentPropertyCmd, self).runTest()
1713
1125
def run_command(self, value, clients):
1714
self.command(value).run(clients, self.bus)
1715
1716
1717
class TestSetCheckerCmd(TestPropertyValueCmd):
1126
self.command(value).run(None, clients)
1127
1128
class TestSetCheckerCmd(TestValueArgumentPropertyCmd):
1718
1129
command = SetCheckerCmd
1719
propname = "Checker"
1130
property = "Checker"
1720
1131
values_to_set = ["", ":", "fping -q -- %s"]
1721
1132
1722
1723
class TestSetHostCmd(TestPropertyValueCmd):
1133
class TestSetHostCmd(TestValueArgumentPropertyCmd):
1724
1134
command = SetHostCmd
1725
propname = "Host"
1135
property = "Host"
1726
1136
values_to_set = ["192.0.2.3", "foo.example.org"]
1727
1137
1728
1729
class TestSetSecretCmd(TestPropertyValueCmd):
1138
class TestSetSecretCmd(TestValueArgumentPropertyCmd):
1730
1139
command = SetSecretCmd
1731
propname = "Secret"
1140
property = "Secret"
1732
1141
values_to_set = [io.BytesIO(b""),
1733
1142
io.BytesIO(b"secret\0xyzzy\nbar")]
1734
1143
values_to_get = [b"", b"secret\0xyzzy\nbar"]
1735
1144
1736
1737
class TestSetTimeoutCmd(TestPropertyValueCmd):
1145
class TestSetTimeoutCmd(TestValueArgumentPropertyCmd):
1738
1146
command = SetTimeoutCmd
1739
propname = "Timeout"
1147
property = "Timeout"
1740
1148
values_to_set = [datetime.timedelta(),
1741
1149
datetime.timedelta(minutes=5),
1742
1150
datetime.timedelta(seconds=1),
1744
1152
datetime.timedelta(weeks=52)]
1745
1153
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1746
1154
1747
1748
class TestSetExtendedTimeoutCmd(TestPropertyValueCmd):
1155
class TestSetExtendedTimeoutCmd(TestValueArgumentPropertyCmd):
1749
1156
command = SetExtendedTimeoutCmd
1750
propname = "ExtendedTimeout"
1157
property = "ExtendedTimeout"
1751
1158
values_to_set = [datetime.timedelta(),
1752
1159
datetime.timedelta(minutes=5),
1753
1160
datetime.timedelta(seconds=1),
1755
1162
datetime.timedelta(weeks=52)]
1756
1163
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1757
1164
1758
1759
class TestSetIntervalCmd(TestPropertyValueCmd):
1165
class TestSetIntervalCmd(TestValueArgumentPropertyCmd):
1760
1166
command = SetIntervalCmd
1761
propname = "Interval"
1167
property = "Interval"
1762
1168
values_to_set = [datetime.timedelta(),
1763
1169
datetime.timedelta(minutes=5),
1764
1170
datetime.timedelta(seconds=1),
1766
1172
datetime.timedelta(weeks=52)]
1767
1173
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1768
1174
1769
1770
class TestSetApprovalDelayCmd(TestPropertyValueCmd):
1175
class TestSetApprovalDelayCmd(TestValueArgumentPropertyCmd):
1771
1176
command = SetApprovalDelayCmd
1772
propname = "ApprovalDelay"
1177
property = "ApprovalDelay"
1773
1178
values_to_set = [datetime.timedelta(),
1774
1179
datetime.timedelta(minutes=5),
1775
1180
datetime.timedelta(seconds=1),
1777
1182
datetime.timedelta(weeks=52)]
1778
1183
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1779
1184
1780
1781
class TestSetApprovalDurationCmd(TestPropertyValueCmd):
1185
class TestSetApprovalDurationCmd(TestValueArgumentPropertyCmd):
1782
1186
command = SetApprovalDurationCmd
1783
propname = "ApprovalDuration"
1187
property = "ApprovalDuration"
1784
1188
values_to_set = [datetime.timedelta(),
1785
1189
datetime.timedelta(minutes=5),
1786
1190
datetime.timedelta(seconds=1),
1788
1192
datetime.timedelta(weeks=52)]
1789
1193
values_to_get = [0, 300000, 1000, 604800000, 31449600000]
1790
1194
1195
class Test_command_from_options(unittest.TestCase):
1196
def setUp(self):
1197
self.parser = argparse.ArgumentParser()
1198
add_command_line_options(self.parser)
1199
def assert_command_from_args(self, args, command_cls, **cmd_attrs):
1200
"""Assert that parsing ARGS should result in an instance of
1201
COMMAND_CLS with (optionally) all supplied attributes (CMD_ATTRS)."""
1202
options = self.parser.parse_args(args)
1203
check_option_syntax(self.parser, options)
1204
commands = commands_from_options(options)
1205
self.assertEqual(len(commands), 1)
1206
command = commands[0]
1207
self.assertIsInstance(command, command_cls)
1208
for key, value in cmd_attrs.items():
1209
self.assertEqual(getattr(command, key), value)
1210
def test_print_table(self):
1211
self.assert_command_from_args([], PrintTableCmd,
1212
verbose=False)
1213
1214
def test_print_table_verbose(self):
1215
self.assert_command_from_args(["--verbose"], PrintTableCmd,
1216
verbose=True)
1217
1218
def test_print_table_verbose_short(self):
1219
self.assert_command_from_args(["-v"], PrintTableCmd,
1220
verbose=True)
1221
1222
def test_enable(self):
1223
self.assert_command_from_args(["--enable", "foo"], EnableCmd)
1224
1225
def test_enable_short(self):
1226
self.assert_command_from_args(["-e", "foo"], EnableCmd)
1227
1228
def test_disable(self):
1229
self.assert_command_from_args(["--disable", "foo"],
1230
DisableCmd)
1231
1232
def test_disable_short(self):
1233
self.assert_command_from_args(["-d", "foo"], DisableCmd)
1234
1235
def test_bump_timeout(self):
1236
self.assert_command_from_args(["--bump-timeout", "foo"],
1237
BumpTimeoutCmd)
1238
1239
def test_bump_timeout_short(self):
1240
self.assert_command_from_args(["-b", "foo"], BumpTimeoutCmd)
1241
1242
def test_start_checker(self):
1243
self.assert_command_from_args(["--start-checker", "foo"],
1244
StartCheckerCmd)
1245
1246
def test_stop_checker(self):
1247
self.assert_command_from_args(["--stop-checker", "foo"],
1248
StopCheckerCmd)
1249
1250
def test_remove(self):
1251
self.assert_command_from_args(["--remove", "foo"],
1252
RemoveCmd)
1253
1254
def test_remove_short(self):
1255
self.assert_command_from_args(["-r", "foo"], RemoveCmd)
1256
1257
def test_checker(self):
1258
self.assert_command_from_args(["--checker", ":", "foo"],
1259
SetCheckerCmd, value_to_set=":")
1260
1261
def test_checker_empty(self):
1262
self.assert_command_from_args(["--checker", "", "foo"],
1263
SetCheckerCmd, value_to_set="")
1264
1265
def test_checker_short(self):
1266
self.assert_command_from_args(["-c", ":", "foo"],
1267
SetCheckerCmd, value_to_set=":")
1268
1269
def test_timeout(self):
1270
self.assert_command_from_args(["--timeout", "PT5M", "foo"],
1271
SetTimeoutCmd,
1272
value_to_set=300000)
1273
1274
def test_timeout_short(self):
1275
self.assert_command_from_args(["-t", "PT5M", "foo"],
1276
SetTimeoutCmd,
1277
value_to_set=300000)
1278
1279
def test_extended_timeout(self):
1280
self.assert_command_from_args(["--extended-timeout", "PT15M",
1281
"foo"],
1282
SetExtendedTimeoutCmd,
1283
value_to_set=900000)
1284
1285
def test_interval(self):
1286
self.assert_command_from_args(["--interval", "PT2M", "foo"],
1287
SetIntervalCmd,
1288
value_to_set=120000)
1289
1290
def test_interval_short(self):
1291
self.assert_command_from_args(["-i", "PT2M", "foo"],
1292
SetIntervalCmd,
1293
value_to_set=120000)
1294
1295
def test_approve_by_default(self):
1296
self.assert_command_from_args(["--approve-by-default", "foo"],
1297
ApproveByDefaultCmd)
1298
1299
def test_deny_by_default(self):
1300
self.assert_command_from_args(["--deny-by-default", "foo"],
1301
DenyByDefaultCmd)
1302
1303
def test_approval_delay(self):
1304
self.assert_command_from_args(["--approval-delay", "PT30S",
1305
"foo"], SetApprovalDelayCmd,
1306
value_to_set=30000)
1307
1308
def test_approval_duration(self):
1309
self.assert_command_from_args(["--approval-duration", "PT1S",
1310
"foo"], SetApprovalDurationCmd,
1311
value_to_set=1000)
1312
1313
def test_host(self):
1314
self.assert_command_from_args(["--host", "foo.example.org",
1315
"foo"], SetHostCmd,
1316
value_to_set="foo.example.org")
1317
1318
def test_host_short(self):
1319
self.assert_command_from_args(["-H", "foo.example.org",
1320
"foo"], SetHostCmd,
1321
value_to_set="foo.example.org")
1322
1323
def test_secret_devnull(self):
1324
self.assert_command_from_args(["--secret", os.path.devnull,
1325
"foo"], SetSecretCmd,
1326
value_to_set=b"")
1327
1328
def test_secret_tempfile(self):
1329
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1330
value = b"secret\0xyzzy\nbar"
1331
f.write(value)
1332
f.seek(0)
1333
self.assert_command_from_args(["--secret", f.name,
1334
"foo"], SetSecretCmd,
1335
value_to_set=value)
1336
1337
def test_secret_devnull_short(self):
1338
self.assert_command_from_args(["-s", os.path.devnull, "foo"],
1339
SetSecretCmd, value_to_set=b"")
1340
1341
def test_secret_tempfile_short(self):
1342
with tempfile.NamedTemporaryFile(mode="r+b") as f:
1343
value = b"secret\0xyzzy\nbar"
1344
f.write(value)
1345
f.seek(0)
1346
self.assert_command_from_args(["-s", f.name, "foo"],
1347
SetSecretCmd,
1348
value_to_set=value)
1349
1350
def test_approve(self):
1351
self.assert_command_from_args(["--approve", "foo"],
1352
ApproveCmd)
1353
1354
def test_approve_short(self):
1355
self.assert_command_from_args(["-A", "foo"], ApproveCmd)
1356
1357
def test_deny(self):
1358
self.assert_command_from_args(["--deny", "foo"], DenyCmd)
1359
1360
def test_deny_short(self):
1361
self.assert_command_from_args(["-D", "foo"], DenyCmd)
1362
1363
def test_dump_json(self):
1364
self.assert_command_from_args(["--dump-json"], DumpJSONCmd)
1365
1366
def test_is_enabled(self):
1367
self.assert_command_from_args(["--is-enabled", "foo"],
1368
IsEnabledCmd)
1369
1370
def test_is_enabled_short(self):
1371
self.assert_command_from_args(["-V", "foo"], IsEnabledCmd)
1372
1373
def test_deny_before_remove(self):
1374
options = self.parser.parse_args(["--deny", "--remove", "foo"])
1375
check_option_syntax(self.parser, options)
1376
commands = commands_from_options(options)
1377
self.assertEqual(len(commands), 2)
1378
self.assertIsInstance(commands[0], DenyCmd)
1379
self.assertIsInstance(commands[1], RemoveCmd)
1380
1381
def test_deny_before_remove_reversed(self):
1382
options = self.parser.parse_args(["--remove", "--deny", "--all"])
1383
check_option_syntax(self.parser, options)
1384
commands = commands_from_options(options)
1385
self.assertEqual(len(commands), 2)
1386
self.assertIsInstance(commands[0], DenyCmd)
1387
self.assertIsInstance(commands[1], RemoveCmd)
1388
1389
1390
class Test_check_option_syntax(unittest.TestCase):
1391
# This mostly corresponds to the definition from has_actions() in
1392
# check_option_syntax()
1393
actions = {
1394
# The actual values set here are not that important, but we do
1395
# at least stick to the correct types, even though they are
1396
# never used
1397
"enable": True,
1398
"disable": True,
1399
"bump_timeout": True,
1400
"start_checker": True,
1401
"stop_checker": True,
1402
"is_enabled": True,
1403
"remove": True,
1404
"checker": "x",
1405
"timeout": datetime.timedelta(),
1406
"extended_timeout": datetime.timedelta(),
1407
"interval": datetime.timedelta(),
1408
"approved_by_default": True,
1409
"approval_delay": datetime.timedelta(),
1410
"approval_duration": datetime.timedelta(),
1411
"host": "x",
1412
"secret": io.BytesIO(b"x"),
1413
"approve": True,
1414
"deny": True,
1415
}
1416
1417
def setUp(self):
1418
self.parser = argparse.ArgumentParser()
1419
add_command_line_options(self.parser)
1420
1421
@contextlib.contextmanager
1422
def assertParseError(self):
1423
with self.assertRaises(SystemExit) as e:
1424
with self.temporarily_suppress_stderr():
1425
yield
1426
# Exit code from argparse is guaranteed to be "2". Reference:
1427
# https://docs.python.org/3/library/argparse.html#exiting-methods
1428
self.assertEqual(e.exception.code, 2)
1429
1430
@staticmethod
1431
@contextlib.contextmanager
1432
def temporarily_suppress_stderr():
1433
null = os.open(os.path.devnull, os.O_RDWR)
1434
stderrcopy = os.dup(sys.stderr.fileno())
1435
os.dup2(null, sys.stderr.fileno())
1436
os.close(null)
1437
try:
1438
yield
1439
finally:
1440
# restore stderr
1441
os.dup2(stderrcopy, sys.stderr.fileno())
1442
os.close(stderrcopy)
1443
1444
def check_option_syntax(self, options):
1445
check_option_syntax(self.parser, options)
1446
1447
def test_actions_requires_client_or_all(self):
1448
for action, value in self.actions.items():
1449
options = self.parser.parse_args()
1450
setattr(options, action, value)
1451
with self.assertParseError():
1452
self.check_option_syntax(options)
1453
1454
def test_actions_conflicts_with_verbose(self):
1455
for action, value in self.actions.items():
1456
options = self.parser.parse_args()
1457
setattr(options, action, value)
1458
options.verbose = True
1459
with self.assertParseError():
1460
self.check_option_syntax(options)
1461
1462
def test_dump_json_conflicts_with_verbose(self):
1463
options = self.parser.parse_args()
1464
options.dump_json = True
1465
options.verbose = True
1466
with self.assertParseError():
1467
self.check_option_syntax(options)
1468
1469
def test_dump_json_conflicts_with_action(self):
1470
for action, value in self.actions.items():
1471
options = self.parser.parse_args()
1472
setattr(options, action, value)
1473
options.dump_json = True
1474
with self.assertParseError():
1475
self.check_option_syntax(options)
1476
1477
def test_all_can_not_be_alone(self):
1478
options = self.parser.parse_args()
1479
options.all = True
1480
with self.assertParseError():
1481
self.check_option_syntax(options)
1482
1483
def test_all_is_ok_with_any_action(self):
1484
for action, value in self.actions.items():
1485
options = self.parser.parse_args()
1486
setattr(options, action, value)
1487
options.all = True
1488
self.check_option_syntax(options)
1489
1490
def test_is_enabled_fails_without_client(self):
1491
options = self.parser.parse_args()
1492
options.is_enabled = True
1493
with self.assertParseError():
1494
self.check_option_syntax(options)
1495
1496
def test_is_enabled_works_with_one_client(self):
1497
options = self.parser.parse_args()
1498
options.is_enabled = True
1499
options.client = ["foo"]
1500
self.check_option_syntax(options)
1501
1502
def test_is_enabled_fails_with_two_clients(self):
1503
options = self.parser.parse_args()
1504
options.is_enabled = True
1505
options.client = ["foo", "barbar"]
1506
with self.assertParseError():
1507
self.check_option_syntax(options)
1508
1509
def test_remove_can_only_be_combined_with_action_deny(self):
1510
for action, value in self.actions.items():
1511
if action in {"remove", "deny"}:
1512
continue
1513
options = self.parser.parse_args()
1514
setattr(options, action, value)
1515
options.all = True
1516
options.remove = True
1517
with self.assertParseError():
1518
self.check_option_syntax(options)
1519
1791
1520
1792
1521
1793
1522
def should_only_run_tests():
1807
1536
return tests
1808
1537
1809
1538
if __name__ == "__main__":
1810
try:
1811
if should_only_run_tests():
1812
# Call using ./tdd-python-script --check [--verbose]
1813
unittest.main()
1814
else:
1815
main()
1816
finally:
1817
logging.shutdown()
1539
if should_only_run_tests():
1540
# Call using ./tdd-python-script --check [--verbose]
1541
unittest.main()
1542
else:
1543
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0