catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2398 from RDProjekt/leading-double-slashes

Browse source 
Allows leading // for mocked s3 paths (fix for #1637)
This commit is contained in:
Steve Pulec 2019-09-11 21:49:53 -05:00 • committed by GitHub
commit 12ad7d0ded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moto/s3/urls.py
View file

@ -15,4 +15,6 @@ url_paths = {
'{0}/(?P<key_or_bucket_name>[^/]+)/?$': S3ResponseInstance.ambiguous_response,
# path-based bucket + key
'{0}/(?P<bucket_name_path>[^/]+)/(?P<key_name>.+)': S3ResponseInstance.key_response,
# subdomain bucket + key with empty first part of path
'{0}//(?P<key_name>.*)$': S3ResponseInstance.key_response,
}

5
moto/server.py
View file

@ -174,10 +174,11 @@ def create_backend_app(service):
backend_app.url_map.converters['regex'] = RegexConverter
backend = list(BACKENDS[service].values())[0]
for url_path, handler in backend.flask_paths.items():
view_func = convert_flask_to_httpretty_response(handler)
if handler.__name__ == 'dispatch':
endpoint = '{0}.dispatch'.format(handler.__self__.__name__)
else:
endpoint = None
endpoint = view_func.__name__
original_endpoint = endpoint
index = 2
@ -191,7 +192,7 @@ def create_backend_app(service):
url_path,
endpoint=endpoint,
methods=HTTP_METHODS,
view_func=convert_flask_to_httpretty_response(handler),
view_func=view_func,
strict_slashes=False,
)