diff --git a/docs/Extensions.md b/docs/Extensions.md index 11f01c3..c4adf80 100644 --- a/docs/Extensions.md +++ b/docs/Extensions.md @@ -27,6 +27,22 @@ services: For explanations of these extensions, please refer to the [Podman Documentation](https://docs.podman.io/). +## Secrets +The following extension keys are available under `secret` configuration: + + x-podman.relabel - Configure SELinux relabeling + +For example, the following configures custom-secret to use mount with private and unshared content. +Only the current container can use a private volume. + +```yml +secrets: + custom-secret: + x-podman.relabel: Z +``` + +For explanations of these extensions, please refer to the [podman-run --volume documentation](https://docs.podman.io/en/latest/markdown/podman-run.1.html#volume-v-source-volume-host-dir-container-dir-options)). + ## Network management The following extension keys are available under network configuration: diff --git a/newsfragments/secret-selinux-relabel-option.feature b/newsfragments/secret-selinux-relabel-option.feature new file mode 100644 index 0000000..6cf6b5f --- /dev/null +++ b/newsfragments/secret-selinux-relabel-option.feature @@ -0,0 +1 @@ +- Add relabel option to secret to make possible to read the secret file by the contained process. \ No newline at end of file diff --git a/podman_compose.py b/podman_compose.py index 5cbc289..a54080f 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -616,6 +616,7 @@ def get_secret_args( declared_secret = compose.declared_secrets[secret_name] source_file = declared_secret.get("file") + x_podman_relabel = declared_secret.get("x-podman.relabel") dest_file = "" secret_opts = "" @@ -657,7 +658,18 @@ def get_secret_args( dest_file = f"/run/secrets/{sec}" else: dest_file = secret_target - volume_ref = ["--volume", f"{source_file}:{dest_file}:ro,rprivate,rbind"] + + mount_options = 'ro,rprivate,rbind' + + selinux_relabel_to_mount_option_map = {None: "", "z": ",z", "Z": ",Z"} + try: + mount_options += selinux_relabel_to_mount_option_map[x_podman_relabel] + except KeyError as exc: + raise ValueError( + f'ERROR: Run secret "{secret_name} has invalid "relabel" option related ' + + f' to SELinux "{x_podman_relabel}". Expected "z" "Z" or nothing.' + ) from exc + volume_ref = ["--volume", f"{source_file}:{dest_file}:{mount_options}"] if secret_uid or secret_gid or secret_mode: sec = secret_target if secret_target else secret_name diff --git a/tests/unit/test_container_to_args_secrets.py b/tests/unit/test_container_to_args_secrets.py index 4343bc6..1fc2af3 100644 --- a/tests/unit/test_container_to_args_secrets.py +++ b/tests/unit/test_container_to_args_secrets.py @@ -306,6 +306,18 @@ class TestContainerToArgsSecrets(unittest.IsolatedAsyncioTestCase): "file_secret", repo_root() + "/test_dirname/my_secret:/run/secrets/file_secret:ro,rprivate,rbind", ), + ( + "relabel", + {"file_secret": {"file": "./my_secret", "x-podman.relabel": "Z"}}, + "file_secret", + repo_root() + "/test_dirname/my_secret:/run/secrets/file_secret:ro,rprivate,rbind,Z", + ), + ( + "relabel", + {"file_secret": {"file": "./my_secret", "x-podman.relabel": "z"}}, + "file_secret", + repo_root() + "/test_dirname/my_secret:/run/secrets/file_secret:ro,rprivate,rbind,z", + ), ( "custom_target_name", {