actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-24 22:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GhApiClient: Accept any auth_token given (#1415)

Browse source 
Fixed #1414

There are many different kinds of gh tokens and they can change the
format at anytime, so we can't check it based on its formats.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-09-27 22:02:42 +10:00 • committed by GitHub
parent e41db2a297
commit b73c253275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/binstalk-downloader/src/gh_api_client.rs
View file

@ -13,7 +13,6 @@ use percent_encoding::{
percent_decode_str, utf8_percent_encode, AsciiSet, PercentEncode, CONTROLS, percent_decode_str, utf8_percent_encode, AsciiSet, PercentEncode, CONTROLS,
}; };
use tokio::sync::OnceCell; use tokio::sync::OnceCell;
use tracing::{debug, warn};
use crate::remote; use crate::remote;
@ -132,33 +131,8 @@ struct Inner {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct GhApiClient(Arc<Inner>); pub struct GhApiClient(Arc<Inner>);
fn is_ascii_alphanumeric(s: &[u8]) -> bool {
s.iter().all(|byte| byte.is_ascii_alphanumeric())
}
fn is_valid_gh_token(token: &str) -> bool {
let token = token.as_bytes();
token.len() >= 40
&& ((&token[0..2] == b"gh"
&& token[2].is_ascii_alphanumeric()
&& token[3] == b'_'
&& is_ascii_alphanumeric(&token[4..]))
|| (token.starts_with(b"github_") && is_ascii_alphanumeric(&token[7..])))
}
impl GhApiClient { impl GhApiClient {
pub fn new(client: remote::Client, auth_token: Option<CompactString>) -> Self { pub fn new(client: remote::Client, auth_token: Option<CompactString>) -> Self {
let auth_token = auth_token.and_then(|auth_token| {
if is_valid_gh_token(&auth_token) {
debug!("Using gh api token");
Some(auth_token)
} else {
warn!("Invalid auth_token, expected 'gh*_' or `github_*` with [A-Za-z0-9], fallback to unauthorized mode");
None
}
});
Self(Arc::new(Inner { Self(Arc::new(Inner {
client, client,
release_artifacts: Default::default(), release_artifacts: Default::default(),