paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Remove legacy unauthenticated local uploads backend.

Browse Source 
This was only used in Ubuntu 14.04 Trusty.

Removing this also finally lets us simplify our security model
discussion of uploaded files.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-06-25 23:28:16 -07:00
committed by Tim Abbott
parent 6112d020f4
commit 33c941407b
3 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/production/security-model.md
View File

@@ -227,22 +227,12 @@ strength allowed is controlled by two settings in
possessing a URL to a secret file in Zulip does not provide possessing a URL to a secret file in Zulip does not provide
unauthorized users with access to that file. unauthorized users with access to that file.
We have a similar protection for the `LOCAL_UPLOADS_DIR` backend, We have a similar protection for the `LOCAL_UPLOADS_DIR` backend.
that is only unavailable on Ubuntu Trusty (this is the one place Every access
in Zulip where behavior is currently different between different OS
versions). For platforms that are not Ubuntu Trusty, every access
to an uploaded file has access control verified (confirming that the to an uploaded file has access control verified (confirming that the
browser is logged into a Zulip account that has received the browser is logged into a Zulip account that has received the
uploaded file in question). uploaded file in question).
On Ubuntu Trusty, because the older version of `nginx` available
there doesn't have proper Unicode support for the `X-Accel-Redirect`
feature, the `LOCAL_UPLOADS_DIR` backend only has the single layer
of security described at the beginning of this section (long,
randomly generated secret URLs). This could be fixed with further
engineering, but given the upcoming end-of-life of Ubuntu Trusty, we
have no plans to do that further work.
* Zulip supports using the Camo image proxy to proxy content like * Zulip supports using the Camo image proxy to proxy content like
inline image previews that can be inserted into the Zulip message inline image previews that can be inserted into the Zulip message
feed by other users over HTTPS. feed by other users over HTTPS.

12
puppet/zulip/files/nginx/zulip-include-maybe/uploads-route.direct
View File

@@ -1,12 +0,0 @@
# This Django route not under /api is shared between mobile and web
# and thus needs API headers added, in addition to the configuration
# required to have it serve files directly.
location /user_uploads {
include /etc/nginx/zulip-include/api_headers;
add_header X-Content-Type-Options nosniff;
add_header Content-Security-Policy "default-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self'; object-src 'self'; plugin-types application/pdf;";
include /etc/nginx/zulip-include/uploads.types;
alias /home/zulip/uploads/files;
}

13
puppet/zulip/manifests/nginx.pp
View File

@@ -36,18 +36,7 @@ class zulip::nginx {
# If we're not serving uploads locally, set the appropriate API headers for it. # If we're not serving uploads locally, set the appropriate API headers for it.
$uploads_route = 'puppet:///modules/zulip/nginx/zulip-include-maybe/uploads-route.noserve' $uploads_route = 'puppet:///modules/zulip/nginx/zulip-include-maybe/uploads-route.noserve'
} else { } else {
# Nginx versions 1.4.6 and older do not support quoted URLs with the $uploads_route = 'puppet:///modules/zulip/nginx/zulip-include-maybe/uploads-route.internal'
# X-Accel-Redirect / "sendfile" feature, which are required for
# unicode support in filenames. As a result, we use the fancier
# django-sendfile behavior only when a sufficiently current version
# of nginx is present (e.g.. Xenial). Older versions (e.g. Trusty)
# retain the older, less secure, file upload behavior; we expect
# that this will stop being relevant when we drop Trusty support
# from Zulip altogether, no later than when Trusty reaches EOL in 2019.
$uploads_route = $zulip::base::release_name ? {
'trusty' => 'puppet:///modules/zulip/nginx/zulip-include-maybe/uploads-route.direct',
default => 'puppet:///modules/zulip/nginx/zulip-include-maybe/uploads-route.internal',
}
} }
file { '/etc/nginx/zulip-include/uploads.route': file { '/etc/nginx/zulip-include/uploads.route':