diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 15:06:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 15:06:13 +0300 |
commit | 0a850868dfb85086cba8320cee9dac4657dcae6c (patch) | |
tree | 40d17228fe23d9db7b861fe2a20d024d64c50323 /doc/security | |
parent | 3744bcc0d10d24104e39985b6833a0ec51791c0a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security')
-rw-r--r-- | doc/security/asset_proxy.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/security/asset_proxy.md b/doc/security/asset_proxy.md index b480905339b..6e615028e8b 100644 --- a/doc/security/asset_proxy.md +++ b/doc/security/asset_proxy.md @@ -11,12 +11,12 @@ to log the IP address of the user. One way to mitigate this is by proxying any external images to a server you control. -GitLab can be configured to use an asset proxy server when requesting external images/videos in +GitLab can be configured to use an asset proxy server when requesting external images/videos/audio in issues, comments, etc. This helps ensure that malicious images do not expose the user's IP address when they are fetched. We currently recommend using [cactus/go-camo](https://github.com/cactus/go-camo#how-it-works) -as it supports proxying video and is more configurable. +as it supports proxying video, audio, and is more configurable. ## Installing Camo server @@ -52,7 +52,7 @@ To install a Camo server as an asset proxy: ## Using the Camo server -Once the Camo server is running and you've enabled the GitLab settings, any image or video that +Once the Camo server is running and you've enabled the GitLab settings, any image, video, or audio that references an external source will get proxied to the Camo server. For example, the following is a link to an image in Markdown: |