diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-28 04:53:08 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-28 04:53:08 +0000 |
commit | 315e0143f65da3485dcbcd2f6a3172a351618aec (patch) | |
tree | b713ae472cffab249c95917c6fb6d242d54e0a87 /web/server/web_server.c | |
parent | Adding upstream version 1.18.1. (diff) | |
download | netdata-315e0143f65da3485dcbcd2f6a3172a351618aec.tar.xz netdata-315e0143f65da3485dcbcd2f6a3172a351618aec.zip |
Adding upstream version 1.19.0.upstream/1.19.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'web/server/web_server.c')
-rw-r--r-- | web/server/web_server.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/web/server/web_server.c b/web/server/web_server.c index b8b84bc3..4da08d43 100644 --- a/web/server/web_server.c +++ b/web/server/web_server.c @@ -74,46 +74,53 @@ void api_listen_sockets_setup(void) { // access lists SIMPLE_PATTERN *web_allow_connections_from = NULL; +int web_allow_connections_dns; // WEB_CLIENT_ACL SIMPLE_PATTERN *web_allow_dashboard_from = NULL; +int web_allow_dashboard_dns; SIMPLE_PATTERN *web_allow_registry_from = NULL; +int web_allow_registry_dns; SIMPLE_PATTERN *web_allow_badges_from = NULL; +int web_allow_badges_dns; SIMPLE_PATTERN *web_allow_mgmt_from = NULL; +int web_allow_mgmt_dns; SIMPLE_PATTERN *web_allow_streaming_from = NULL; +int web_allow_streaming_dns; SIMPLE_PATTERN *web_allow_netdataconf_from = NULL; +int web_allow_netdataconf_dns; void web_client_update_acl_matches(struct web_client *w) { w->acl = WEB_CLIENT_ACL_NONE; if (!web_allow_dashboard_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_dashboard_from, "dashboard")) + web_allow_dashboard_from, "dashboard", web_allow_dashboard_dns)) w->acl |= WEB_CLIENT_ACL_DASHBOARD; if (!web_allow_registry_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_registry_from, "registry")) + web_allow_registry_from, "registry", web_allow_registry_dns)) w->acl |= WEB_CLIENT_ACL_REGISTRY; if (!web_allow_badges_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_badges_from, "badges")) + web_allow_badges_from, "badges", web_allow_badges_dns)) w->acl |= WEB_CLIENT_ACL_BADGE; if (!web_allow_mgmt_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_mgmt_from, "management")) + web_allow_mgmt_from, "management", web_allow_mgmt_dns)) w->acl |= WEB_CLIENT_ACL_MGMT; if (!web_allow_streaming_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_streaming_from, "streaming")) + web_allow_streaming_from, "streaming", web_allow_streaming_dns)) w->acl |= WEB_CLIENT_ACL_STREAMING; if (!web_allow_netdataconf_from || connection_allowed(w->ifd, w->client_ip, w->client_host, sizeof(w->client_host), - web_allow_netdataconf_from, "netdata.conf")) + web_allow_netdataconf_from, "netdata.conf", web_allow_netdataconf_dns)) w->acl |= WEB_CLIENT_ACL_NETDATACONF; w->acl &= w->port_acl; |