Commit 7eae5182 authored by Clement Ho's avatar Clement Ho

Merge branch '219961-docs-aqualls-update-terms' into 'master'

Docs: Remove 'whitelist' from webhooks page

See merge request gitlab-org/gitlab!33770
parents 40b85ac2 a3d95bd3
...@@ -52,29 +52,29 @@ NOTE: **Note:** ...@@ -52,29 +52,29 @@ NOTE: **Note:**
set up by administrators. However, you can turn this off by disabling the set up by administrators. However, you can turn this off by disabling the
**Allow requests to the local network from system hooks** option. **Allow requests to the local network from system hooks** option.
## Whitelist for local requests ## Allowlist for local requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/44496) in GitLab 12.2 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/44496) in GitLab 12.2
You can allow certain domains and IP addresses to be accessible to both *system hooks* You can allow certain domains and IP addresses to be accessible to both *system hooks*
and *webhooks* even when local requests are not allowed by adding them to the and *webhooks* even when local requests are not allowed by adding them to the
whitelist. Navigate to **Admin Area > Settings > Network** (`/admin/application_settings/network`) allowlist. Navigate to **Admin Area > Settings > Network** (`/admin/application_settings/network`)
and expand **Outbound requests**: and expand **Outbound requests**:
![Outbound local requests whitelist](img/whitelist.png) ![Outbound local requests allowlist](img/allowlist_v13_0.png)
The whitelist entries can be separated by semicolons, commas or whitespaces The allowed entries can be separated by semicolons, commas or whitespaces
(including newlines) and be in different formats like hostnames, IP addresses and/or (including newlines) and be in different formats like hostnames, IP addresses and/or
IP ranges. IPv6 is supported. Hostnames that contain unicode characters should IP ranges. IPv6 is supported. Hostnames that contain unicode characters should
use IDNA encoding. use IDNA encoding.
The whitelist can hold a maximum of 1000 entries. Each entry can be a maximum of The allowlist can hold a maximum of 1000 entries. Each entry can be a maximum of
255 characters. 255 characters.
You can whitelist a particular port by specifying it in the whitelist entry. You can allow a particular port by specifying it in the allowlist entry.
For example `127.0.0.1:8080` will only allow connections to port 8080 on `127.0.0.1`. For example `127.0.0.1:8080` will only allow connections to port 8080 on `127.0.0.1`.
If no port is mentioned, all ports on that IP/domain are whitelisted. An IP range If no port is mentioned, all ports on that IP/domain are allowed. An IP range
will whitelist all ports on all IPs in that range. will allow all ports on all IPs in that range.
Example: Example:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment