Skip to content

Commit

Permalink
Merge branch 'feature/RELENG-4905' into q/4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Sep 14, 2021
2 parents 6d2419d + cc94ffa commit 4d26d46
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions conf/nginx.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,6 @@ http {
return 400;
}

# Not allowed behind ingress.
#
if ($http_script_name) {
return 403;
}

# Canonicalize key.
#
set_by_lua_file $canonical_path /etc/nginx/canonicalize_path.ljbc;
Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/test_simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def test_simple_upload_and_copy_behind_ingress(self):
)
success = 'SUCCESSFUL'.encode('utf-8')
copy = self.session.get(url, data=success, headers={'Script-Name': '/foo'})
assert copy.status_code == 403
assert copy.status_code == 200

# Upload without ingress and download with ingress
url = '{artifacts_url}/upload/{container}/.final_status'.format(
Expand Down

0 comments on commit 4d26d46

Please sign in to comment.