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