rahix/forgejo-api
1
0
Fork 0
Code Activity

fix: implement review comment regarding non standard ssh port scenario

Browse source
This commit is contained in:
aviac 2024-05-11 13:00:17 +02:00
parent 5fc28346e6
commit a786cd85ad
No known key found for this signature in database
GPG key ID: 644781002BDEA982
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/lib.rs
View file

@ -262,8 +262,7 @@ where
DE: serde::de::Error, DE: serde::de::Error,
{ {
let raw_url: String = String::deserialize(deserializer).map_err(DE::custom)?; let raw_url: String = String::deserialize(deserializer).map_err(DE::custom)?;
let url = format!("ssh://{url}", url = raw_url.replace(":", "/")); parse_ssh_url(&raw_url).map_err(DE::custom)
Url::parse(url.as_str()).map_err(DE::custom)
} }
fn deserialize_optional_ssh_url<'de, D, DE>(deserializer: D) -> Result<Option<Url>, DE> fn deserialize_optional_ssh_url<'de, D, DE>(deserializer: D) -> Result<Option<Url>, DE>
@ -273,13 +272,23 @@ where
{ {
let raw_url: Option<String> = Option::deserialize(deserializer).map_err(DE::custom)?; let raw_url: Option<String> = Option::deserialize(deserializer).map_err(DE::custom)?;
raw_url raw_url
.map(|raw_url| { .as_ref()
let url = format!("ssh://{url}", url = raw_url.replace(":", "/")); .map(parse_ssh_url)
Url::parse(url.as_str()).map_err(DE::custom).map(Some) .map(|res| res.map_err(DE::custom).map(Some))
})
.unwrap_or(Ok(None)) .unwrap_or(Ok(None))
} }
fn parse_ssh_url(raw_url: &String) -> Result<Url, url::ParseError> {
// in case of a non-standard ssh-port (not 22), the ssh url coming from the forgejo API
// is actually parseable by the url crate, so try to do that first
Url::parse(raw_url).or_else(|_| {
// otherwise the ssh url is not parseable by the url crate and we try again after some
// pre-processing
let url = format!("ssh://{url}", url = raw_url.replace(":", "/"));
Url::parse(url.as_str())
})
}
impl From<structs::DefaultMergeStyle> for structs::MergePullRequestOptionDo { impl From<structs::DefaultMergeStyle> for structs::MergePullRequestOptionDo {
fn from(value: structs::DefaultMergeStyle) -> Self { fn from(value: structs::DefaultMergeStyle) -> Self {
match value { match value {