Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require Cors header values to be specified with double quotes. #1395

Merged
merged 7 commits into from
Sep 11, 2019
Merged

Require Cors header values to be specified with double quotes. #1395

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94ba388
Require Cors header values to be specified with double quotes.
stalar Sep 3, 2019
c4e6f71
Fix broken tests
stalar Sep 5, 2019
4ac4459
Merge branch 'develop' into develop
stalar Sep 5, 2019
09987fe
Code formatting
stalar Sep 5, 2019
3f80c2b
Use startswith and endswith.
stalar Sep 9, 2019
74b299a
Adjust excpetion message and add unit tests to assert exception is th…
jfuss Sep 11, 2019
e458c45
format using black
jfuss Sep 11, 2019
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
49 changes: 42 additions & 7 deletions samcli/commands/local/lib/sam_api_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,58 @@ def extract_cors(self, cors_prop):
"""
cors = None
if cors_prop and isinstance(cors_prop, dict):
allow_methods = cors_prop.get("AllowMethods", ",".join(sorted(Route.ANY_HTTP_METHODS)))
allow_methods = self.normalize_cors_allow_methods(allow_methods)
allow_methods = self._get_cors_prop(cors_prop, "AllowMethods")
if allow_methods:
allow_methods = self.normalize_cors_allow_methods(allow_methods)
else:
allow_methods = ",".join(sorted(Route.ANY_HTTP_METHODS))

allow_origin = self._get_cors_prop(cors_prop, "AllowOrigin")
allow_headers = self._get_cors_prop(cors_prop, "AllowHeaders")
max_age = self._get_cors_prop(cors_prop, "MaxAge")

cors = Cors(
allow_origin=cors_prop.get("AllowOrigin"),
allow_methods=allow_methods,
allow_headers=cors_prop.get("AllowHeaders"),
max_age=cors_prop.get("MaxAge"),
allow_origin=allow_origin, allow_methods=allow_methods, allow_headers=allow_headers, max_age=max_age
)
elif cors_prop and isinstance(cors_prop, string_types):
allow_origin = cors_prop
if allow_origin[0] != "'" or allow_origin[-1] != "'":
stalar marked this conversation as resolved.
Show resolved Hide resolved
raise InvalidSamDocumentException(
"AllowOrigin must be a quoted string " '(i.e. "\'*\'" is correct, but "*" is not).'
)
allow_origin = allow_origin.strip("'")

cors = Cors(
allow_origin=cors_prop,
allow_origin=allow_origin,
allow_methods=",".join(sorted(Route.ANY_HTTP_METHODS)),
allow_headers=None,
max_age=None,
)
return cors

@staticmethod
def _get_cors_prop(cors_dict, prop_name):
"""
Extract cors properties from dictionary and remove extra quotes.

Parameters
----------
cors_dict : dict
Resource properties for Cors

Return
------
A string with the extra quotes removed
"""
prop = cors_dict.get(prop_name)
if prop:
if (not isinstance(prop, string_types)) or prop[0] != "'" or prop[-1] != "'":
stalar marked this conversation as resolved.
Show resolved Hide resolved
raise InvalidSamDocumentException(
"{} must be a quoted string " '(i.e. "\'value\'" is correct, but "value" is not).'.format(prop_name)
)
prop = prop.strip("'")
return prop

@staticmethod
def normalize_cors_allow_methods(allow_methods):
"""
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/testdata/start_api/swagger-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Resources:
Variables:
VarName: varValue
Cors:
AllowOrigin: "*"
AllowMethods: "GET"
AllowHeaders: "origin, x-requested-with"
MaxAge: 510
AllowOrigin: "'*''"
AllowMethods: "'GET'"
AllowHeaders: "'origin, x-requested-with'"
MaxAge: "'510'"
DefinitionBody:
swagger: "2.0"
info:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/start_api/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Globals:
- image~1png
Variables:
VarName: varValue
Cors: "*"
Cors: "'*''"
Resources:
HelloWorldFunction:
Type: AWS::Serverless::Function
Expand Down
42 changes: 21 additions & 21 deletions tests/unit/commands/local/lib/test_sam_api_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ def test_provider_parse_cors_string(self):
"Type": "AWS::Serverless::Api",
"Properties": {
"StageName": "Prod",
"Cors": "*",
"Cors": "'*'",
"DefinitionBody": {
"paths": {
"/path2": {
Expand Down Expand Up @@ -873,10 +873,10 @@ def test_provider_parse_cors_dict(self):
"Properties": {
"StageName": "Prod",
"Cors": {
"AllowMethods": "POST, GET",
"AllowOrigin": "*",
"AllowHeaders": "Upgrade-Insecure-Requests",
"MaxAge": 600,
"AllowMethods": "'POST, GET'",
"AllowOrigin": "'*'",
"AllowHeaders": "'Upgrade-Insecure-Requests'",
"MaxAge": "'600'",
},
"DefinitionBody": {
"paths": {
Expand Down Expand Up @@ -918,7 +918,7 @@ def test_provider_parse_cors_dict(self):
allow_origin="*",
allow_methods=",".join(sorted(["POST", "GET", "OPTIONS"])),
allow_headers="Upgrade-Insecure-Requests",
max_age=600,
max_age="600",
)
route1 = Route(path="/path2", methods=["POST", "OPTIONS"], function_name="NoApiEventFunction")
route2 = Route(path="/path", methods=["POST", "OPTIONS"], function_name="NoApiEventFunction")
Expand All @@ -936,10 +936,10 @@ def test_provider_parse_cors_dict_star_allow(self):
"Properties": {
"StageName": "Prod",
"Cors": {
"AllowMethods": "*",
"AllowOrigin": "*",
"AllowHeaders": "Upgrade-Insecure-Requests",
"MaxAge": 600,
"AllowMethods": "'*'",
"AllowOrigin": "'*'",
"AllowHeaders": "'Upgrade-Insecure-Requests'",
"MaxAge": "'600'",
},
"DefinitionBody": {
"paths": {
Expand Down Expand Up @@ -981,7 +981,7 @@ def test_provider_parse_cors_dict_star_allow(self):
allow_origin="*",
allow_methods=",".join(sorted(Route.ANY_HTTP_METHODS)),
allow_headers="Upgrade-Insecure-Requests",
max_age=600,
max_age="600",
)
route1 = Route(path="/path2", methods=["POST", "OPTIONS"], function_name="NoApiEventFunction")
route2 = Route(path="/path", methods=["POST", "OPTIONS"], function_name="NoApiEventFunction")
Expand All @@ -999,10 +999,10 @@ def test_invalid_cors_dict_allow_methods(self):
"Properties": {
"StageName": "Prod",
"Cors": {
"AllowMethods": "GET, INVALID_METHOD",
"AllowOrigin": "*",
"AllowHeaders": "Upgrade-Insecure-Requests",
"MaxAge": 600,
"AllowMethods": "'GET, INVALID_METHOD'",
"AllowOrigin": "'*'",
"AllowHeaders": "'Upgrade-Insecure-Requests'",
"MaxAge": "'600'",
},
"DefinitionBody": {
"paths": {
Expand Down Expand Up @@ -1048,7 +1048,7 @@ def test_default_cors_dict_prop(self):
"Type": "AWS::Serverless::Api",
"Properties": {
"StageName": "Prod",
"Cors": {"AllowOrigin": "www.domain.com"},
"Cors": {"AllowOrigin": "'www.domain.com'"},
"DefinitionBody": {
"paths": {
"/path2": {
Expand Down Expand Up @@ -1085,10 +1085,10 @@ def test_global_cors(self):
"Globals": {
"Api": {
"Cors": {
"AllowMethods": "GET",
"AllowOrigin": "*",
"AllowHeaders": "Upgrade-Insecure-Requests",
"MaxAge": 600,
"AllowMethods": "'GET'",
"AllowOrigin": "'*'",
"AllowHeaders": "'Upgrade-Insecure-Requests'",
"MaxAge": "'600'",
}
}
},
Expand Down Expand Up @@ -1137,7 +1137,7 @@ def test_global_cors(self):
allow_origin="*",
allow_headers="Upgrade-Insecure-Requests",
allow_methods=",".join(["GET", "OPTIONS"]),
max_age=600,
max_age="600",
)
route1 = Route(path="/path2", methods=["GET", "OPTIONS"], function_name="NoApiEventFunction")
route2 = Route(path="/path", methods=["GET", "OPTIONS"], function_name="NoApiEventFunction")
Expand Down