Skip to content

Registry authentication enforcement #59

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

Draft
davidv1992 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Registry authentication enforcement #59

Show file tree
Hide file tree
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
17 changes: 11 additions & 6 deletions src/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn apis(
dl_dir_path: Arc<PathBuf>,
path: Vec<String>,
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
let routes = download(dl_dir_path, path)
let routes = download(db_manager.clone(), dl_dir_path, path)
.or(owners(db_manager.clone()))
.or(search(db_manager));

Expand All @@ -50,7 +50,7 @@ pub fn apis(
cache_dir_path: Arc<PathBuf>,
path: Vec<String>,
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
let routes = download(dl_dir_path, path)
let routes = download(db_manager.clone(), dl_dir_path, path)
.or(download_crates_io(http_client, cache_dir_path))
.or(owners(db_manager.clone()))
.or(search(db_manager));
Expand All @@ -68,12 +68,15 @@ pub(crate) fn into_boxed_filters(path: Vec<String>) -> BoxedFilter<()> {
})
}

#[tracing::instrument(skip(path, dl_dir_path))]
#[tracing::instrument(skip(path, dl_dir_path, db_manager))]
fn download(
db_manager: Arc<RwLock<impl DbManager>>,
dl_dir_path: Arc<PathBuf>,
path: Vec<String>,
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
into_boxed_filters(path).and(warp::fs::dir(dl_dir_path.to_path_buf()))
into_boxed_filters(path)
.and(assure_authorized(db_manager).map(|_| ()).untuple_one())
.and(warp::fs::dir(dl_dir_path.to_path_buf()))
}

#[cfg(feature = "crates-io-mirroring")]
Expand Down Expand Up @@ -180,8 +183,9 @@ fn owners(
db_manager: Arc<RwLock<impl DbManager>>,
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
warp::get()
.and(with_db_manager(db_manager))
.and(with_db_manager(db_manager.clone()))
.and(authorization_header())
.and(assure_authorized(db_manager).map(|_| ()).untuple_one())
.and(warp::path!("api" / "v1" / "crates" / String / "owners"))
.and_then(handle_owners)
}
Expand All @@ -207,7 +211,8 @@ fn search(
db_manager: Arc<RwLock<impl DbManager>>,
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
warp::get()
.and(with_db_manager(db_manager))
.and(with_db_manager(db_manager.clone()))
.and(assure_authorized(db_manager).map(|_| ()).untuple_one())
.and(warp::path!("api" / "v1" / "crates"))
.and(warp::query::<Query>())
.and_then(handle_search)
Expand Down
22 changes: 22 additions & 0 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,28 @@ pub fn authorization_header() -> impl Filter<Extract = (String,), Error = Reject
warp::header::<String>("Authorization")
}

#[tracing::instrument(skip(db_manager))]
pub fn assure_authorized(
db_manager: Arc<RwLock<impl DbManager>>,
) -> impl Filter<Extract = (u32,), Error = Rejection> + Clone {
authorization_header()
.and(with_db_manager(db_manager))
.and_then(lookup_userid)
}

#[tracing::instrument(skip(token, db_manager))]
async fn lookup_userid(
token: String,
db_manager: Arc<RwLock<impl DbManager>>,
) -> Result<u32, Rejection> {
Ok(db_manager
.write()
.await
.user_id_for_token(&token)
.map_err(warp::reject::custom)
.await?)
}

#[cfg(test)]
mod tests {
use super::package_dir_path;
Expand Down