arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 07:17:17 +00:00
Code Issues Projects Releases Wiki Activity

only set file rights if requested

Browse Source
This commit is contained in:
Evgenii Alekseev 2021-09-23 20:36:22 +03:00
parent 659db071a1
commit f333e89bd1
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ahriman/application/ahriman.py
View File

@ -357,6 +357,7 @@ def _set_user_parser(root: SubParserAction) -> argparse.ArgumentParser:
parser.add_argument("--no-reload", help="do not reload authentication module", action="store_true") parser.add_argument("--no-reload", help="do not reload authentication module", action="store_true")
parser.add_argument("-p", "--password", help="user password") parser.add_argument("-p", "--password", help="user password")
parser.add_argument("-r", "--remove", help="remove user from configuration", action="store_true") parser.add_argument("-r", "--remove", help="remove user from configuration", action="store_true")
parser.add_argument("--secure", help="set file permissions to user-only", action="store_true")
parser.set_defaults(handler=handlers.User, architecture=[""], lock=None, no_log=True, no_report=True, unsafe=True) parser.set_defaults(handler=handlers.User, architecture=[""], lock=None, no_log=True, no_report=True, unsafe=True)
return parser return parser

8
src/ahriman/application/handlers/user.py
View File

@ -52,7 +52,7 @@ class User(Handler):
User.clear_user(auth_configuration, user) User.clear_user(auth_configuration, user)
if not args.remove: if not args.remove:
User.create_configuration(auth_configuration, user, salt, args.as_service) User.create_configuration(auth_configuration, user, salt, args.as_service)
User.write_configuration(auth_configuration) User.write_configuration(auth_configuration, args.secure)
if not args.no_reload: if not args.no_reload:
client = Application(architecture, configuration, no_report=False).repository.reporter client = Application(architecture, configuration, no_report=False).repository.reporter
@ -127,13 +127,15 @@ class User(Handler):
return MUser.generate_password(salt_length) return MUser.generate_password(salt_length)
@staticmethod @staticmethod
def write_configuration(configuration: Configuration) -> None: def write_configuration(configuration: Configuration, secure: bool) -> None:
""" """
write configuration file write configuration file
:param configuration: configuration instance :param configuration: configuration instance
:param secure: if true then set file permissions to 0o600
""" """
if configuration.path is None: if configuration.path is None:
return # should never happen actually return # should never happen actually
with configuration.path.open("w") as ahriman_configuration: with configuration.path.open("w") as ahriman_configuration:
configuration.write(ahriman_configuration) configuration.write(ahriman_configuration)
configuration.path.chmod(0o600) if secure:
configuration.path.chmod(0o600)

17
tests/ahriman/application/handlers/test_handler_user.py
View File

@ -22,6 +22,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace:
args.access = UserAccess.Read args.access = UserAccess.Read
args.as_service = False args.as_service = False
args.no_reload = False args.no_reload = False
args.secure = False
args.remove = False args.remove = False
return args return args
@ -227,11 +228,23 @@ def test_write_configuration(configuration: Configuration, mocker: MockerFixture
write_mock = mocker.patch("ahriman.core.configuration.Configuration.write") write_mock = mocker.patch("ahriman.core.configuration.Configuration.write")
chmod_mock = mocker.patch("pathlib.Path.chmod") chmod_mock = mocker.patch("pathlib.Path.chmod")
User.write_configuration(configuration) User.write_configuration(configuration, secure=True)
write_mock.assert_called_once() write_mock.assert_called_once()
chmod_mock.assert_called_once() chmod_mock.assert_called_once()
def test_write_configuration_insecure(configuration: Configuration, mocker: MockerFixture) -> None:
"""
must write configuration without setting file permissions
"""
mocker.patch("pathlib.Path.open")
mocker.patch("ahriman.core.configuration.Configuration.write")
chmod_mock = mocker.patch("pathlib.Path.chmod")
User.write_configuration(configuration, secure=False)
chmod_mock.assert_not_called()
def test_write_configuration_not_loaded(configuration: Configuration, mocker: MockerFixture) -> None: def test_write_configuration_not_loaded(configuration: Configuration, mocker: MockerFixture) -> None:
""" """
must do nothing in case if configuration is not loaded must do nothing in case if configuration is not loaded
@ -241,6 +254,6 @@ def test_write_configuration_not_loaded(configuration: Configuration, mocker: Mo
write_mock = mocker.patch("ahriman.core.configuration.Configuration.write") write_mock = mocker.patch("ahriman.core.configuration.Configuration.write")
chmod_mock = mocker.patch("pathlib.Path.chmod") chmod_mock = mocker.patch("pathlib.Path.chmod")
User.write_configuration(configuration) User.write_configuration(configuration, secure=True)
write_mock.assert_not_called() write_mock.assert_not_called()
chmod_mock.assert_not_called() chmod_mock.assert_not_called()