/mandos/trunk : changes

» Changes from revision 1282

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

From Revision 1090 to 1071

expand all

Rev	Summary	Authors	Date
1090	mandos-ctl: Refactor D-Bus operations mandos-ctl: Refactor D-Bus operations * mandos-ctl (dbus): Rename imported module to "dbus_python". (main): Only create a bus object and do everything via that object. (get_mandos_dbus_object): Remove and move code into dbus or dbus_python_adapter namespaces. (if_dbus_exception_log_with_exception_and_exit): - '' - (SilenceLogger): - '' - (dbus): New; move everything dbus-specific into this module-like namespace. (dbus_python_adapter): New; move everything specific to the dbus-python D-Bus module into this module-like namespace. (command.Base.run): Take only a bus argument; use only that. Pass "client" argument as a D-Bus object path string, not a dbus-python proxy object. All derivatives adjusted. (command.IsEnabled.is_enabled): Remove. (command.Approve, command.Deny, command.Remove, command.PropertySetter): Do no logging of D-Bus commands, and use only bus, not client, to do D-Bus calls. (command.DumpJSON.dbus_boolean_to_bool): Remove; move filtering to dbus_python_adapter. (command.Enable, command.Disable, command.StopChecker, command.ApproveByDefault): Use normal Python booleans instead of dbus-python's special Boolean types. (Unique): New; move here out from inside TestPropertySetterCmd. (Test_get_mandos_dbus_object): Remove. (Test_get_managed_objects): - '' - (Test_dbus_exceptions): New. (Test_dbus_MandosBus): - '' - (Test_dbus_python_adapter_SystemBus): - '' - (Test_dbus_python_adapter_CachingBus): - '' - (Test_commands_from_options): Don't create mock client proxy objects, define dict of client properties and use a mock dbus to verify that the correct D-Bus calls are made. Also remove any types specific to dbus-python. (TestEnableCmd, TestDisableCmd, TestStartCheckerCmd, TestStopCheckerCmd, TestApproveByDefaultCmd, TestDenyByDefaultCmd): Use normal Python booleans instead of dbus-python's special Boolean types. (TestPropertySetterValueCmd.runTest): Remove; unnecessary.	Teddy Hogeborn	6 years ago
1089	mandos-ctl: Eliminate unnecessary D-Bus call mandos-ctl: Eliminate unnecessary D-Bus call * mandos-ctl (command.Base.run): Don't set self.mandos. (command.Remove): Implement .run() instead of .run_on_one_client() to avoid the command.Base.run() unnecessarily connecting to a client object.	Teddy Hogeborn	6 years ago
1088	mandos: Refactor; use classes, not instances, as namespaces mandos: Refactor; use classes, not instances, as namespaces * mandos (Avahi): Rename to "avahi". (avahi.string_array_to_txt_array): Make static method. (GnuTLS): Rename to "gnutls". (gnutls.__init__): Remove; move version check up to class body. (gnutls.Error): Don't use class name anymore.	Teddy Hogeborn	6 years ago
1087	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl (main): Remove a couple of blank lines. (SilenceLogger.__enter__): Remove unnecessary return statement. (commands.Property): Rename to "PropertySetter". (commands.PropertyValue): Rename to "PropertySetterValue". (commands.MillisecondsPropertyValueArgument): Rename to "PropertySetterValueMilliseconds". (TestPropertyCmd): Rename to "TestPropertySetterCmd". (TestPropertyValueCmd): Rename to "TestPropertySetterValueCmd".	Teddy Hogeborn	6 years ago
1086	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl: Where the clients names "foo" and "barbar" do not refer to the actual mock clients in the TestCommand class, change all occurrences of these names to "client1" and "client2" (or just "client" when only one is used) . Also change all test doubles to use correct terminology; some things called mocks are actually stubs or spies, and rename all true mocks to have "mock" in their names. Also eliminate duplicate values in tests; derive values from previously defined values whenever possible.	Teddy Hogeborn	6 years ago
1085	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl: For Python 2, use StringIO.StringIO as a replacement for io.StringIO, since Python 2's io.StringIO won't work with print redirection. (Output.run, Output.output): Remove. (DumpJSON.output): Rename to "run" and change signature to match. Also change code to print instead of returning string. (PrintTable.output): - '' -	Teddy Hogeborn	6 years ago
1084	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (TestBaseCommands.test_DumpJSON_normal): Don't run the .output method on command; instead, use capture_stdout_to_buffer(). (TestBaseCommands.test_DumpJSON_one_client): - '' - (TestBaseCommands.test_PrintTable_normal): - '' - (TestBaseCommands.test_PrintTable_verbose): - '' - (TestBaseCommands.test_PrintTable_one_client): - '' - (TestBaseCommands.capture_stdout_to_buffer): New.	Teddy Hogeborn	6 years ago
1083	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (Test_check_option_syntax.redirect_stderr_to_devnull): Override file objects instead of raw file descriptors.	Teddy Hogeborn	6 years ago
1082	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl: Change all calls to assertEqual (and related functions assertNotEqual and assertDictEqual) to always pass arguments in (expected, actual) order, for consistency.	Teddy Hogeborn	6 years ago
1081	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (TestBaseCommands.test_IsEnabled): Removed; don't test internal details of command.IsEnabled. (TestBaseCommands.test_IsEnabled_run_exits_successfully): Rename to "test_IsEnabled_exits_successfully". (TestBaseCommands.test_IsEnabled_run_exits_with_failure): Rename to "test_IsEnabled_exits_with_failure".	Teddy Hogeborn	6 years ago
1080	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (Test_string_to_delta.test_handles_basic_rfc3339): Split into multiple tests. (Test_string_to_delta.test_rfc3339_zero_seconds): New. (Test_string_to_delta.test_rfc3339_zero_days): - '' - (Test_string_to_delta.test_rfc3339_one_second): - '' - (Test_string_to_delta.test_rfc3339_two_hours): - '' - (TestCommand.setUp.MockClient.Get): Remove; unused. (TestBaseCommands.test_Remove): Remove unnecessary assertion. (TestPropertyCmd.runTest): - '' -	Teddy Hogeborn	6 years ago
1079	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl (TestBaseCommands): Rename test methods to match names of tested command. (TestBaseCommands.test_is_enabled): Rename to "test_IsEnabled". (TestBaseCommands.test_is_enabled_run_exits_successfully): Rename to "test_IsEnabled_run_exits_successfully". (TestBaseCommands.test_is_enabled_run_exits_with_failure): Rename to "test_IsEnabled_run_exits_with_failure". (TestBaseCommands.test_approve): Rename to "test_Approve". (TestBaseCommands.test_deny): Rename to "test_Deny". (TestBaseCommands.test_remove): Rename to "test_Remove".	Teddy Hogeborn	6 years ago
1078	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl (TestBaseCommands.test_remove): Remove superfluous super() call.	Teddy Hogeborn	6 years ago
1077	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl: Move all command classes into a class acting as a namespace. Remove "Cmd" suffix from command class names. All users of commands changed. Also unify all tests of base commands into one test class. (command): New. (TestBaseCommands): New. (TestIsEnableCmd, TestApproveCmd, TestDenyCmd, TestRemoveCmd, TestDumpJSONCmd, TestPrintTableCmd): Remove; move tests into TestBaseCommands.	Teddy Hogeborn	6 years ago
1076	mandos-ctl: Refactor and add a few more tests mandos-ctl: Refactor and add a few more tests * mandos-ctl (main): Remove comment and add empty line. (rfc3339_duration_to_delta): Change ValueError exception message to use \"{}\"" instead of "{!r}" so Python 2 and Python 3 output is the same. (Test_check_option_syntax.temporarily_suppress_stderr): Rename to "redirect_stderr_to_devnull". (Test_check_option_syntax .test_actions_except_is_enabled_are_ok_with_two_clients): Rename to "test_two_clients_are_ok_with_actions_except_is_enabled". (Test_check_option_syntax .test_one_client_with_all_actions_except_is_enabled): New. (Test_check_option_syntax .test_two_clients_with_all_actions_except_is_enabled): - '' -	Teddy Hogeborn	6 years ago
1075	mandos-ctl: Refactor and fix bug in tests. mandos-ctl: Refactor and fix bug in tests. * mandos-ctl (Test_check_option_syntax): Refactor and add more tests.	Teddy Hogeborn	6 years ago
1074	mandos-ctl: Add comment mandos-ctl: Add comment * mandos-ctl (Test_get_managed_objects.test_logs_and_exits_on_dbus_error): Add a comment.	Teddy Hogeborn	6 years ago
1073	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (Test_get_managed_objects): Remove some useless "@staticmethod"s.	Teddy Hogeborn	6 years ago
1072	mandos-ctl: Refactor tests mandos-ctl: Refactor tests * mandos-ctl (TestCaseWithAssertLogs): New. (Test_string_to_delta): Inherit from TestCaseWithAssertLogs and simply use self.assertLogs() when needed. (Test_get_mandos_dbus_object): - '' - (Test_get_mandos_dbus_object.CriticalFilter): Remove. (Test_get_managed_objects): - '' - and use a CountingHandler instead of a CountingFilter. (Test_get_managed_objects.CriticalFilter): Remove. (Test_SilenceLogger): Remove.	Teddy Hogeborn	6 years ago
1071	mandos-ctl: Refactor mandos-ctl: Refactor * mandos-ctl (get_mandos_dbus_object, get_managed_objects): Factor out D-Bus exception catching. (if_dbus_exception_log_with_exception_and_exit): New.	Teddy Hogeborn	6 years ago