taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only apply ip filtering when valid ips list are configured in gitlab and bitbucket hooks

remotes/origin/enhancement/email-actions
Jesús Espino 2014-12-02 12:52:02 +01:00 committed by David Barragán Merino
parent edcb186871
commit 151875856e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taiga/hooks/bitbucket/api.py
View File

@ -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) valid_origin_ips = project.modules_config.config.get("bitbucket", {}).get("valid_origin_ips", settings.BITBUCKET_VALID_ORIGIN_IPS)
origin_ip = get_real_ip(request) 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 False
return project_secret == secret_key return project_secret == secret_key

2
taiga/hooks/gitlab/api.py
View File

@ -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) valid_origin_ips = project.modules_config.config.get("gitlab", {}).get("valid_origin_ips", settings.GITLAB_VALID_ORIGIN_IPS)
origin_ip = get_real_ip(request) 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 False
return project_secret == secret_key return project_secret == secret_key