Skip to content

Check for blocked repos in SSH RPC #1015

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

Check for blocked repos in SSH RPC #1015

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
29 changes: 22 additions & 7 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 @@ -643,6 +643,7 @@ fn is_repo_blocked(meta: &MetaConfig) -> bool {
}

async fn handle_serve_namespace_request(
serv: Arc<JoshProxyService>,
req: Request<hyper::Body>,
) -> josh::JoshResult<Response<hyper::Body>> {
let error_response = |status: StatusCode| Ok(make_response(hyper::Body::empty(), status));
Expand Down Expand Up @@ -674,26 +675,40 @@ async fn handle_serve_namespace_request(
Ok(parsed) => parsed,
};

let _parsed_url = if let Some(mut parsed_url) = FilteredRepoUrl::from_str(&params.query) {
let parsed_url = if let Some(mut parsed_url) = FilteredRepoUrl::from_str(&params.query) {
if parsed_url.filter_spec.is_empty() {
parsed_url.filter_spec = ":/".to_string();
}

parsed_url
} else {
return Ok(make_response(
hyper::Body::from("unable to parse query"),
hyper::Body::from("Unable to parse query"),
StatusCode::BAD_REQUEST,
));
};

let meta_config = match make_meta_config(serv.clone(), None, &parsed_url).await {
Ok(meta) => meta,
Err(e) => {
return Ok(make_response(
hyper::Body::from(format!("Error fetching meta repo: {}", e)),
StatusCode::INTERNAL_SERVER_ERROR,
));
}
};

if is_repo_blocked(&meta_config) {
return Ok(make_response(
hyper::Body::from("Access to this repo is blocked via JOSH_REPO_BLOCK"),
StatusCode::UNPROCESSABLE_ENTITY,
));
}

let serve_result = serve_namespace(params).await;
tracing::trace!("serve_result: {:?}", serve_result);

return Ok(make_response(
hyper::Body::from("handled serve_namespace request"),
StatusCode::OK,
));
return Ok(make_response(hyper::Body::empty(), StatusCode::NO_CONTENT));
}

// Entry point for fake git-upload-pack, git-receive-pack
Expand Down Expand Up @@ -726,7 +741,7 @@ async fn call_service(
}

if path == "/serve_namespace" {
return handle_serve_namespace_request(req).await;
return handle_serve_namespace_request(serv.clone(), req).await;
}

// Need to have some way of passing the filter (via remote path like what github does?)
Expand Down