Repository navigation
fix(auth): pick the push credential from the resolved forge, not the host name #1124
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,7 @@ | ||||||||||||||
| use std::process::Command; | ||||||||||||||
|
|
||||||||||||||
| use super::repo::Repository; | ||||||||||||||
| use crate::config::ForgeKind; | ||||||||||||||
| use crate::forge::gitlab::GitLabToken; | ||||||||||||||
|
|
||||||||||||||
| #[cfg(test)] | ||||||||||||||
|
|
@@ -32,24 +33,36 @@ fn is_gitlab(url: &str) -> bool { | |||||||||||||
| host_of(url).is_some_and(|host| host.contains("gitlab")) | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| fn forge_of(url: &str, configured: ForgeKind) -> Option<ForgeKind> { | ||||||||||||||
| match configured { | ||||||||||||||
| ForgeKind::Auto if is_gitlab(url) => Some(ForgeKind::Gitlab), | ||||||||||||||
| ForgeKind::Auto => crate::forge::detect_forge_with_probe(url), | ||||||||||||||
| explicit => Some(explicit), | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| pub(super) fn token_for_url(url: &str, forge: ForgeKind) -> Option<(String, String)> { | ||||||||||||||
| let ferrflow_token = std::env::var("FERRFLOW_TOKEN").ok(); | ||||||||||||||
| let gitlab_token = std::env::var("GITLAB_TOKEN").ok(); | ||||||||||||||
| let github_token = std::env::var("GITHUB_TOKEN").ok(); | ||||||||||||||
|
Comment on lines
+45
to
+47
Contributor
There was a problem hiding this comment. Nit: an empty variable counts as present here.
Suggested change
Contributor
Author
There was a problem hiding this comment. Taken in #1132 (this PR had already merged). |
||||||||||||||
| if ferrflow_token.is_none() && gitlab_token.is_none() && github_token.is_none() { | ||||||||||||||
| return None; | ||||||||||||||
| } | ||||||||||||||
| let is_gitlab = forge_of(url, forge) == Some(ForgeKind::Gitlab); | ||||||||||||||
| if let Some(token) = ferrflow_token { | ||||||||||||||
| let user = if is_gitlab { | ||||||||||||||
| GitLabToken::of(&token).git_username() | ||||||||||||||
| } else { | ||||||||||||||
| "x-access-token" | ||||||||||||||
| }; | ||||||||||||||
| return Some((user.to_string(), token)); | ||||||||||||||
| } | ||||||||||||||
| if is_gitlab { | ||||||||||||||
| let token = gitlab_token?; | ||||||||||||||
| let user = GitLabToken::of(&token).git_username(); | ||||||||||||||
| return Some((user.to_string(), token)); | ||||||||||||||
| } | ||||||||||||||
| github_token.map(|token| ("x-access-token".to_string(), token)) | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| /// Where the credential reaches git. `/proc/<pid>/cmdline` is world-readable, | ||||||||||||||
|
|
@@ -68,9 +81,9 @@ pub(super) const GIT_PASSWORD_VAR: &str = "FERRFLOW_GIT_PASSWORD"; | |||||||||||||
| const CREDENTIAL_HELPER: &str = | ||||||||||||||
| r#"!f() { echo "username=$FERRFLOW_GIT_USER"; echo "password=$FERRFLOW_GIT_PASSWORD"; }; f"#; | ||||||||||||||
|
|
||||||||||||||
| pub(super) fn configure_git_command(cmd: &mut Command, url: &str, forge: ForgeKind) { | ||||||||||||||
| scrub_trace_env(cmd); | ||||||||||||||
| if let Some((user, token)) = token_for_url(url, forge) { | ||||||||||||||
| cmd.env(GIT_USER_VAR, user); | ||||||||||||||
| cmd.env(GIT_PASSWORD_VAR, token); | ||||||||||||||
| cmd.arg("-c") | ||||||||||||||
|
|
||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit:
detect_forge_with_probefalls through todetect_forge_from_url, which matchesgithub.com/gitlab.com/codeberg.organywhere in the string, path included. This file deliberately went the other way:is_gitlabmatches onhost_of(url)only, anda_repository_name_does_not_pick_the_forgeasserts a repo name must not select the credential. The auto branch now gives that up.Concretely, remote
https://git.acme.com/tools/gitlab.com-exporter.gitwithforge: autoresolves to GitLab off the path: withFERRFLOW_TOKENset the push username flips fromx-access-tokentooauth2, and with onlyGITHUB_TOKENsettoken_for_urlreturnsNone, so the push goes out with no credential at all. The existing test does not catch it because all four of its URLs are ongithub.com.Detecting on the host keeps the probe cache key identical and leaves the SaaS short-circuits working:
(
forge_targetinpreview.rspasses the full URL too, so the API side has the same quirk. Worth fixing there in the same pass, or insidedetect_forge_from_url.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Taken in #1132 (this PR had already merged).