Skip to content

Make auth optional in make_meta_config #1014

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

Closed
wants to merge 1 commit into from
Closed

Make auth optional in make_meta_config #1014

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
38 changes: 22 additions & 16 deletions josh-proxy/src/bin/josh-proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#[macro_use]
extern crate lazy_static;

use josh_proxy::{MetaConfig, RepoUpdate};
use josh_proxy::{MetaConfig, RepoConfig, RepoUpdate};
use opentelemetry::global;
use opentelemetry::sdk::propagation::TraceContextPropagator;
use tracing_opentelemetry::OpenTelemetrySpanExt;
Expand Down Expand Up @@ -468,24 +468,30 @@ async fn query_meta_repo(

async fn make_meta_config(
serv: Arc<JoshProxyService>,
auth: &josh_proxy::auth::Handle,
auth: Option<&josh_proxy::auth::Handle>,
parsed_url: &FilteredRepoUrl,
) -> josh::JoshResult<MetaConfig> {
let mut meta = Default::default();

if let Ok(meta_repo) = std::env::var("JOSH_META_REPO") {
let auth = if let Ok(token) = std::env::var("JOSH_META_AUTH_TOKEN") {
josh_proxy::auth::add_auth(&token)?
} else {
auth.clone()
};
let meta_repo = std::env::var("JOSH_META_REPO");
let auth_token = std::env::var("JOSH_META_AUTH_TOKEN");

match (auth, meta_repo) {
(None, _) | (_, Err(_)) => Ok(MetaConfig {
config: RepoConfig {
repo: parsed_url.upstream_repo.clone(),
..Default::default()
},
..Default::default()
}),
(Some(auth), Ok(meta_repo)) => {
let auth = if let Ok(token) = auth_token {
josh_proxy::auth::add_auth(&token)?
} else {
auth.clone()
};

meta = query_meta_repo(serv.clone(), &meta_repo, &parsed_url.upstream_repo, &auth).await?;
} else {
meta.config.repo = parsed_url.upstream_repo.clone();
query_meta_repo(serv.clone(), &meta_repo, &parsed_url.upstream_repo, &auth).await
}
}

Ok(meta)
}

async fn serve_namespace(params: josh_rpc::calls::ServeNamespace) -> josh::JoshResult<()> {
Expand Down Expand Up @@ -766,7 +772,7 @@ async fn call_service(
}
};

let meta = make_meta_config(serv.clone(), &auth, &parsed_url).await?;
let meta = make_meta_config(serv.clone(), Some(&auth), &parsed_url).await?;

let mut filter = josh::filter::chain(
meta.config.filter,
Expand Down