From 151875856ed6b7563e5819a98f0a3ce104270c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 2 Dec 2014 12:52:02 +0100 Subject: [PATCH] Only apply ip filtering when valid ips list are configured in gitlab and bitbucket hooks --- taiga/hooks/bitbucket/api.py | 2 +- taiga/hooks/gitlab/api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taiga/hooks/bitbucket/api.py b/taiga/hooks/bitbucket/api.py index c88ae779..cb1c75e8 100644 --- a/taiga/hooks/bitbucket/api.py +++ b/taiga/hooks/bitbucket/api.py @@ -63,7 +63,7 @@ class BitBucketViewSet(BaseWebhookApiViewSet): valid_origin_ips = project.modules_config.config.get("bitbucket", {}).get("valid_origin_ips", settings.BITBUCKET_VALID_ORIGIN_IPS) origin_ip = get_real_ip(request) - if not origin_ip or not origin_ip in valid_origin_ips: + if valid_origin_ips and (not origin_ip or not origin_ip in valid_origin_ips): return False return project_secret == secret_key diff --git a/taiga/hooks/gitlab/api.py b/taiga/hooks/gitlab/api.py index a271ff6b..a7596910 100644 --- a/taiga/hooks/gitlab/api.py +++ b/taiga/hooks/gitlab/api.py @@ -53,7 +53,7 @@ class GitLabViewSet(BaseWebhookApiViewSet): valid_origin_ips = project.modules_config.config.get("gitlab", {}).get("valid_origin_ips", settings.GITLAB_VALID_ORIGIN_IPS) origin_ip = get_real_ip(request) - if not origin_ip or origin_ip not in valid_origin_ips: + if valid_origin_ips and (not origin_ip or origin_ip not in valid_origin_ips): return False return project_secret == secret_key