Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Add an ACL for FORCE_SSL situation. #235

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add an ACL for FORCE_SSL situation. #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5003a92
Add an ACL for FORCE_SSL situation.
maskshell Nov 2, 2017
fea0791
Add an ACL for FORCE_SSL situation.
maskshell Nov 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion haproxy/helper/backend_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ def get_force_ssl_setting(details, service_alias):
setting = []
force_ssl = get_service_attribute(details, "force_ssl", service_alias)
if force_ssl:
setting.append("redirect scheme https code 301 if !{ ssl_fc }")
setting.append("acl is_forwarded_ssl req.hdr(X-Forwarded-Proto) https")
setting.append("redirect scheme https code 301 if !{ ssl_fc } !is_forwarded_ssl")
return setting


Expand Down
8 changes: 6 additions & 2 deletions tests/unit/helper/test_backend_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,12 @@ def test_get_force_ssl_setting(self):
'web-c': {'force_ssl': ''},
'web-d': {}}

self.assertEqual(["redirect scheme https code 301 if !{ ssl_fc }"], get_force_ssl_setting(details, 'web-a'))
self.assertEqual(["redirect scheme https code 301 if !{ ssl_fc }"], get_force_ssl_setting(details, 'web-b'))
self.assertEqual(["acl is_forwarded_ssl req.hdr(X-Forwarded-Proto) https",
"redirect scheme https code 301 if !{ ssl_fc } !is_forwarded_ssl"],
get_force_ssl_setting(details, 'web-a'))
self.assertEqual(["acl is_forwarded_ssl req.hdr(X-Forwarded-Proto) https",
"redirect scheme https code 301 if !{ ssl_fc } !is_forwarded_ssl"],
get_force_ssl_setting(details, 'web-b'))
self.assertEqual([], get_force_ssl_setting(details, 'web-c'))
self.assertEqual([], get_force_ssl_setting(details, 'web-d'))
self.assertEqual([], get_force_ssl_setting(details, 'web-e'))
Expand Down