Skip to content

Revert 5412 url reader special chars #5785

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

Closed
ales-erjavec wants to merge 2 commits into from
Closed

Revert 5412 url reader special chars #5785

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
34ce9d5
Revert "[FIX] UrlReader: Support urls with special characters"
ales-erjavec Jan 12, 2022
116d392
owfile: Parse and encode url
ales-erjavec Jan 14, 2022
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
4 changes: 1 addition & 3 deletions Orange/data/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

from os import path, remove
from tempfile import NamedTemporaryFile
from urllib.parse import urlparse, urlsplit, urlunsplit, \
unquote as urlunquote, quote
from urllib.parse import urlparse, urlsplit, urlunsplit, unquote as urlunquote
from urllib.request import urlopen, Request
from pathlib import Path

Expand Down Expand Up @@ -406,7 +405,6 @@ def __init__(self, filename):
filename = filename.strip()
if not urlparse(filename).scheme:
filename = 'http://' + filename
filename = quote(filename, safe="/:")
super().__init__(filename)

@staticmethod
Expand Down
11 changes: 0 additions & 11 deletions Orange/tests/test_url_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,3 @@ def test_zipped(self):
"http://datasets.biolab.si/core/philadelphia-crime.csv.xz"
).read()
self.assertEqual(9666, len(data))

def test_special_characters(self):
# TO-DO - replace this file with a more appropriate one (e.g. .csv)
# and change the assertion accordingly
path = "http://file.biolab.si/text-semantics/data/elektrotehniski-" \
"vestnik-clanki/detektiranje-utrdb-v-šahu-.txt"
self.assertRaises(OSError, UrlReader(path).read)


if __name__ == "__main__":
unittest.main()
4 changes: 4 additions & 0 deletions Orange/widgets/data/owfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,10 @@ def _get_reader(self) -> FileFormat:
return reader
else:
url = self.url_combo.currentText().strip()
# tolerant parse, also prevent parsing as local file
parsed = QUrl.fromUserInput(url, os.devnull)
if parsed.isValid():
url = bytes(parsed.toEncoded()).decode("ascii")
Copy link
Contributor

@VesnaT VesnaT Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem of this solution is, that the UrlReader itself still doesn't work, so the change would have to be made in every widget that uses it.

I'd rather the fix was made within the UrlReader.

Copy link
Contributor Author

@ales-erjavec ales-erjavec Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. UrlReader should not accept invalid urls and should not do anything that could break valid urls.

Copy link
Member

@markotoplak markotoplak Jan 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but valid at which level? Shouldn't we support URLs as a browser would? If there is some non-destructive encoding/decoding happening in the background, why not put it into UrlReader?

Copy link
Contributor Author

@ales-erjavec ales-erjavec Jan 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine.

return UrlReader(url)

def _update_sheet_combo(self):
Expand Down
15 changes: 15 additions & 0 deletions Orange/widgets/data/tests/test_owfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,21 @@ def test_url_no_scheme(self):

mock_urlreader.assert_called_once_with('http://' + url)

def test_url_encode(self):
def test(text, expected):
mock_urlreader = Mock()
with patch('Orange.widgets.data.owfile.UrlReader', mock_urlreader):
self.widget.url_combo.insertItem(0, text)
self.widget.url_combo.setCurrentIndex(0)
self.widget.url_combo.activated.emit(0)
mock_urlreader.assert_called_once_with(expected)

test("https://example.com/space space#f=f", "https://example.com/space%20space#f=f")
test("https://example.com/space%20space#f=f", "https://example.com/space%20space#f=f")
test("https://š.si/š#f=1", "https://xn--pga.si/%C5%A1#f=1")
test("https://xn--pga.si/%C5%A1#f=1", "https://xn--pga.si/%C5%A1#f=1")
test("https://example.com/a?q=1#f=1", "https://example.com/a?q=1#f=1")

def test_adds_origin(self):
self.open_dataset("origin1/images")
data1 = self.get_output(self.widget.Outputs.data)
Expand Down