diff --git a/CHANGELOG.md b/CHANGELOG.md index ede6b465980342157e8fdde59bb5aea4d74465c9..9b4fb4ad17acefc29f2319d64ee0ea336336f18b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed task data upload progressbar () - Email in org invitations is case sensitive () - Bug: canvas is busy when start playing, start resizing a shape and do not release the mouse cursor () +- Fixed tus upload error over https () ### Security - Updated ELK to 6.8.22 which uses log4j 2.17.0 () diff --git a/cvat/settings/base.py b/cvat/settings/base.py index 373f884d24c96b2bdf25d2378f25072dddb675d2..b6b70da0808d3b27df1b7fcd8e9f23da8ca08273 100644 --- a/cvat/settings/base.py +++ b/cvat/settings/base.py @@ -515,3 +515,7 @@ CORS_ALLOW_HEADERS = list(default_headers) + [ TUS_MAX_FILE_SIZE = 26843545600 # 25gb TUS_DEFAULT_CHUNK_SIZE = 104857600 # 100 mb +# This setting makes request secure if X-Forwarded-Proto: 'https' header is specified by our proxy +# More about forwarded headers - https://doc.traefik.io/traefik/getting-started/faq/#what-are-the-forwarded-headers-when-proxying-http-requests +# How django uses X-Forwarded-Proto - https://docs.djangoproject.com/en/2.2/ref/settings/#secure-proxy-ssl-header +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')