aboutsummaryrefslogtreecommitdiff
path: root/docker/manila
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-08-29 18:13:34 +0000
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-10-10 15:06:05 +0000
commit2daf4331a648cc2df6982c1a6ec47a705e038255 (patch)
tree9fe722152766faad365172b1ae442bf76453ef47 /docker/manila
parentb8a352647d57d35463e551a0d360c19fb2ad34c6 (diff)
downloadkolla-2daf4331a648cc2df6982c1a6ec47a705e038255.tar.gz
kolla-2daf4331a648cc2df6982c1a6ec47a705e038255.zip
Fix writable rootwrap/privsep config
Fixes a hypothetical security issue related to privilege escalation via rootwrap/privsep. A potential vulnerable service could previously allow writes to its rootwrap/privsep config and thus allow for more commands to be run with root privileges via rootwrap/privsep. For a succesful attack, this would also require the service to allow to run arbitrary commands via rootwrap/privsep. Thus far, no such vulnerabilities have been reported and thus this fix is simply strengthening the container images against such an issue in the future. Change-Id: I92c81c77e6a16570a108cde8031f7977930fb02a Closes-Bug: #1874298
Diffstat (limited to 'docker/manila')
-rw-r--r--docker/manila/manila-api/Dockerfile.j21
-rw-r--r--docker/manila/manila-base/Dockerfile.j22
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index dece703f3..0e6d9e252 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -16,7 +16,6 @@ COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \
&& chmod 644 /usr/local/bin/kolla_manila_extend_start \
- && chown -R manila: /var/www/cgi-bin/manila \
&& chmod 755 /var/www/cgi-bin/manila/manila-wsgi
{% block manila_api_footer %}{% endblock %}
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index d484f8f0d..727996073 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -35,7 +35,7 @@ RUN ln -s manila-base-source/* manila \
&& {{ macros.install_pip(manila_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/manila /var/cache/manila \
&& cp -r /manila/etc/manila/* /etc/manila/ \
- && chown -R manila: /etc/manila /var/cache/manila \
+ && chown -R manila: /var/cache/manila \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_manila_sudoers \