Fixes incorrectly encoded url current url #6685
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* url in question /%EF%AC%81?foo=bar&bz=%AC%81 * This is a unicode character, which can't be decoded from ascii. Jinja templates will handle this if it's unicode, or if it's hex encoded ascii, but can't take a non-unicode string in python 2 and put this in a template. * The querystring was being quoted, which is incorrect, as: 1) the special characters in the query string mean something 2) The rest of the querystring is already quoted. This makes it double quoted, as seen in the datastore file * We don't want to unquote urls before putting them in the template anyway. * There was s further error passing this unicode path to the template resolution, where in posix path, it fails: ``` File '/usr/lib/ckan/default/lib/python2.7/posixpath.py', line 73 in join path += '/' + b UnicodeDecodeError: 'ascii' codec can't decode byte 0xef in position 1: ordinal not in range(128) ``` The solution here is to make sure it's unicode passed into the function.
EricSoroos
changed the title
EricSoroos
changed the title
|
Let's search usage of CKAN_CURRENT_URL on popular extensions and mention this on the release notes. |
amercader
reviewed
Mar 31, 2022
There was a problem hiding this comment.
This sounds good @EricSoroos but can you add the tiny suggestion to make the tests pass, and also submit the same patch for master and 2.9? Thanks
ckan/controllers/template.py
Outdated
| @@ -29,6 +29,10 @@ def view(self, url): | |||
| By default this controller aborts the request with a 404 (Not | |||
| Found) | |||
| """ | |||
| try: | |||
| url = unicode(url.encode('utf-8')) | |||
There was a problem hiding this comment.
Suggested change
| url = unicode(url.encode('utf-8')) | |
| url = unicode(url.encode(u'utf-8')) |
5 tasks
wardi
reviewed
Jun 21, 2022
wardi
reviewed
Jun 21, 2022
|
@EricSoroos do you want to have a look at this? |
|
@amercader this looks good to me but is against the 2.8 branch. If this code doesn't exist on master anymore would we still want something similar for 2.9? |
|
@EricSoroos This needs to be fixed in master as well: Can you send a PR against master with these fixes? Thanks |
|
@amercader Will do. |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6684
Proposed fixes:
ascii. Jinja templates will handle this if it's unicode, or if it's
hex encoded ascii, but can't take a non-unicode string in python 2 and
put this in a template.
double quoted, as seen in the datastore file
anyway.
resolution, where in posix path, it fails:
The solution here is to make sure it's unicode passed into the
function.
Features:
Please [X] all the boxes above that apply