[PATCH mygit 1/5] percent decode repository name

From: Johann150 <johann@qwertqwefsday.eu> --- Cargo.lock | 1 + Cargo.toml | 1 + src/main.rs | 3 +++ 3 files changed, 5 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 677d1e4..6da49e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1127,6 +1127,7 @@ dependencies = [ "chrono", "git2", "once_cell", + "percent-encoding", "pico-args", "pulldown-cmark", "serde", diff --git a/Cargo.toml b/Cargo.toml index 49c992f..9515e55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ async-std = { version = "1.8.0", features = ["attributes"] } chrono = "0.4" git2 = {version="0.13", default-features = false} once_cell = "1.7.2" +percent-encoding = "2.1" pico-args = "0.4" pulldown-cmark = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/src/main.rs b/src/main.rs index 6ad1499..9f264ab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,6 +84,9 @@ struct RepoHomeTemplate { } fn repo_from_request(repo_name: &str) -> Result<Repository> { + let repo_name = percent_encoding::percent_decode_str(repo_name) + .decode_utf8_lossy() + .into_owned(); let repo_path = Path::new(&CONFIG.repo_directory).join(repo_name); // TODO CLEAN PATH! VERY IMPORTANT! DONT FORGET! let r = Repository::open(repo_path)?; -- 2.20.1

Hi these look good! I'm on lunch break so I don't have time to look into this in detail -- but my only question is about the first patch -- the other 4 are ready to apply. Is there a way to do this that uses the tide crate itself rather than another crate? I havent checked but it seems like something I would expect the crate to be able to do Alex On Mon Mar 15, 2021 at 10:57 AM PDT, Johann Galle wrote: > From: Johann150 <johann@qwertqwefsday.eu> > > --- > Cargo.lock | 1 + > Cargo.toml | 1 + > src/main.rs | 3 +++ > 3 files changed, 5 insertions(+) > > diff --git a/Cargo.lock b/Cargo.lock > index 677d1e4..6da49e6 100644 > --- a/Cargo.lock > +++ b/Cargo.lock > @@ -1127,6 +1127,7 @@ dependencies = [ > "chrono", > "git2", > "once_cell", > + "percent-encoding", > "pico-args", > "pulldown-cmark", > "serde", > diff --git a/Cargo.toml b/Cargo.toml > index 49c992f..9515e55 100644 > --- a/Cargo.toml > +++ b/Cargo.toml > @@ -15,6 +15,7 @@ async-std = { version = "1.8.0", features = > ["attributes"] } > chrono = "0.4" > git2 = {version="0.13", default-features = false} > once_cell = "1.7.2" > +percent-encoding = "2.1" > pico-args = "0.4" > pulldown-cmark = "0.8" > serde = { version = "1.0", features = ["derive"] } > diff --git a/src/main.rs b/src/main.rs > index 6ad1499..9f264ab 100644 > --- a/src/main.rs > +++ b/src/main.rs > @@ -84,6 +84,9 @@ struct RepoHomeTemplate { > } > > fn repo_from_request(repo_name: &str) -> Result<Repository> { > + let repo_name = percent_encoding::percent_decode_str(repo_name) > + .decode_utf8_lossy() > + .into_owned(); > let repo_path = Path::new(&CONFIG.repo_directory).join(repo_name); > // TODO CLEAN PATH! VERY IMPORTANT! DONT FORGET! > let r = Repository::open(repo_path)?; > -- > 2.20.1

On 2021-03-15T20:01+01:00, Alex Wennerberg wrote: > Hi these look good! I'm on lunch break so I don't have time to look into this in detail -- but my only question is about the first patch -- the other 4 are ready to apply. Is there a way to do this that uses the tide crate itself rather than another crate? I havent checked but it seems like something I would expect the crate to be able to do That is something I also wondered and tried to find on <https://docs.rs/tide>. Searching for "percent", "url", "encode" or "decode" did not bring anything up. Same results for the re-exportet http-types crate. But anyway we were already indirectly dependent on the percent-encoding crate [1], so the meaning of adding this to our Crates.toml only means that we can now also access it. [1] more completely, we get this inverse dependency tree for it: $ cargo tree -i percent-encoding percent-encoding v2.1.0 ├── askama_shared v0.11.1 │   ├── askama v0.10.5 │   │   ├── askama_tide v0.13.0 │   │   │   └── grifter v0.1.0 │   │   └── grifter v0.1.0 │   └── askama_derive v0.10.5 (proc-macro) │       └── askama v0.10.5 (*) ├── cookie v0.14.4 │   └── http-types v2.10.0 │       ├── async-h1 v2.3.2 │       │   └── tide v0.16.0 │       │       ├── askama_tide v0.13.0 (*) │       │       └── grifter v0.1.0 │       ├── async-sse v4.1.0 │       │   └── tide v0.16.0 (*) │       ├── http-client v6.3.4 │       │   └── tide v0.16.0 (*) │       └── tide v0.16.0 (*) ├── form_urlencoded v1.0.1 │   ├── serde_urlencoded v0.7.0 │   │   └── http-types v2.10.0 (*) │   └── url v2.2.1 │       ├── git2 v0.13.17 │       │   └── grifter v0.1.0 │       └── http-types v2.10.00 (*) ├── grifter v0.1.0 ├── serde_qs v0.7.2 │   └── http-types v2.10.0 (*) └── url v2.2.1 (*)

Makes sense to me. I’ll merge these as soon as I get home Alex > On Mar 15, 2021, at 1:54 PM, Johann Galle <johann@qwertqwefsday.eu> wrote: > > On 2021-03-15T20:01+01:00, Alex Wennerberg wrote: > > Hi these look good! I'm on lunch break so I don't have time to look into this in detail -- but my only question is about the first patch -- the other 4 are ready to apply. Is there a way to do this that uses the tide crate itself rather than another crate? I havent checked but it seems like something I would expect the crate to be able to do > > That is something I also wondered and tried to find on <https://docs.rs/tide>. Searching for "percent", "url", "encode" or "decode" did not bring anything up. Same results for the re-exportet http-types crate. But anyway we were already indirectly dependent on the percent-encoding crate [1], so the meaning of adding this to our Crates.toml only means that we can now also access it. > > [1] more completely, we get this inverse dependency tree for it: > > $ cargo tree -i percent-encoding > percent-encoding v2.1.0 > ├── askama_shared v0.11.1 > │ ├── askama v0.10.5 > │ │ ├── askama_tide v0.13.0 > │ │ │ └── grifter v0.1.0 > │ │ └── grifter v0.1.0 > │ └── askama_derive v0.10.5 (proc-macro) > │ └── askama v0.10.5 (*) > ├── cookie v0.14.4 > │ └── http-types v2.10.0 > │ ├── async-h1 v2.3.2 > │ │ └── tide v0.16.0 > │ │ ├── askama_tide v0.13.0 (*) > │ │ └── grifter v0.1.0 > │ ├── async-sse v4.1.0 > │ │ └── tide v0.16.0 (*) > │ ├── http-client v6.3.4 > │ │ └── tide v0.16.0 (*) > │ └── tide v0.16.0 (*) > ├── form_urlencoded v1.0.1 > │ ├── serde_urlencoded v0.7.0 > │ │ └── http-types v2.10.0 (*) > │ └── url v2.2.1 > │ ├── git2 v0.13.17 > │ │ └── grifter v0.1.0 > │ └── http-types v2.10.00 (*) > ├── grifter v0.1.0 > ├── serde_qs v0.7.2 > │ └── http-types v2.10.0 (*) > └── url v2.2.1 (*)