Skip to content

fix partial urlencoded link support #146195

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −12
Open

fix partial urlencoded link support #146195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,6 +2167,7 @@ version = "0.1.0"
dependencies = [
"html5ever",
"regex",
"urlencoding",
]

[[package]]
Expand Down Expand Up @@ -5825,6 +5826,12 @@ dependencies = [
"percent-encoding",
]

[[package]]
name = "urlencoding"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"

[[package]]
name = "utf-8"
version = "0.7.6"
Expand Down
1 change: 1 addition & 0 deletions src/tools/linkchecker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ path = "main.rs"
[dependencies]
regex = "1"
html5ever = "0.29.0"
urlencoding = "2.1.3"
13 changes: 1 addition & 12 deletions src/tools/linkchecker/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,7 @@ enum FileEntry {
type Cache = HashMap<String, FileEntry>;

fn small_url_encode(s: &str) -> String {
s.replace('<', "%3C")
.replace('>', "%3E")
.replace(' ', "%20")
.replace('?', "%3F")
.replace('\'', "%27")
.replace('&', "%26")
.replace(',', "%2C")
.replace(':', "%3A")
.replace(';', "%3B")
.replace('[', "%5B")
.replace(']', "%5D")
.replace('\"', "%22")
urlencoding::encode(s).to_string()
}

impl Checker {
Expand Down
3 changes: 3 additions & 0 deletions src/tools/linkchecker/tests/valid/inner/bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@

<h2 id="barfrag">Bar</h2>

<!-- testing urlecoded anchor link against a non-urlencoded heading IDs -->
<h2 id="barfrag-è">Bar</h2>

</body>
</html>
8 changes: 8 additions & 0 deletions src/tools/linkchecker/tests/valid/inner/foo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@
<a href="https://example.com/doesnotexist">external links not validated</a>
<a href="redir.html#redirfrag">Redirect</a>

<!-- testing urlecoded anchor link against a non-urlencoded heading IDs -->
<a href="#localfrag-%C3%A8"></a>
<a href="bar.html#barfrag-%C3%A8"></a>
<a href="redir.html#redirfrag-%C3%A8"></a>

<h2 id="localfrag">Local</h2>

<!-- testing urlecoded anchor link against a non-urlencoded heading IDs -->
<h2 id="localfrag-è">Local</h2>

</body>
</html>
3 changes: 3 additions & 0 deletions src/tools/linkchecker/tests/valid/inner/redir-target.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<html>
<body>
<h2 id="redirfrag">Redir</h2>

<!-- testing urlecoded anchor link against a non-urlencoded heading IDs -->
<h2 id="redirfrag-è">Redir</h2>
</body>
</html>
Loading