Skip to content

Include the query in the cache ID #25

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

Merged
kou merged 5 commits into from
Sep 28, 2026
Merged

Include the query in the cache ID #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16d3487
Include the query in the cache ID
tikkss Sep 26, 2026
bf0f9ab
Use allow list style instead of deny list style
tikkss Sep 26, 2026
5ab366b
Extract the allow list into a variable
tikkss Sep 26, 2026
6f5376f
test: confirm that a disallowed character is replaced
tikkss Sep 26, 2026
0fe7cc5
Use "+" as the query separator in the cache ID
tikkss Sep 27, 2026
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
9 changes: 8 additions & 1 deletion lib/remote_input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,17 @@ def path
def cache_path
return @cache_path if @cache_path
dirname = File.dirname(normalize_path).delete_suffix("/")
cache_id = "#{@url.host}#{dirname}".tr("/", "-")
cache_id = to_cache_id("#{@url.host}#{dirname}")
query = @url.query
cache_id += "+#{to_cache_id(query)}" if query and not query.empty?
@cache_path = CachePath.new(cache_id)
end

def to_cache_id(s)
allow_list = "0-9A-Za-z._~=-"
s.tr("^#{allow_list}", "-")
end

def normalize_path
url_path = @url.path
url_path = "/" if url_path.empty?
Expand Down
2 changes: 1 addition & 1 deletion test/test-remote-input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def test_open_with_block_raised
data("no path", ["/example.com/data", "https://example.com"])
data("root", ["/example.com/data", "https://example.com/"])
data("file", ["/example.com/file", "https://example.com/file"])
data("query", ["/example.com/file", "https://example.com/file?a=b"])
data("query", ["/example.com+a=-/file", "https://example.com/file?a=+"])
data("directory", ["/example.com-a/data", "https://example.com/a/"])
data("nested file", ["/example.com-a/file", "https://example.com/a/file"])
data("deeply nested", ["/example.com-a-b/file", "https://example.com/a/b/file"])
Expand Down
Loading