NotAShelf/circus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fc-common: allow configuring url schemes to allow for testing

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I99912d7c45f1a4664d4823ddd793b5af6a6a6964
This commit is contained in:
raf 2026-02-15 23:34:15 +03:00
commit a5768d46eb
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
4 changed files with 129 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/server/src/main.rs
View file

@ -51,6 +51,10 @@ async fn main() -> anyhow::Result<()> {
let host = cli.host.unwrap_or(config.server.host.clone());
let port = cli.port.unwrap_or(config.server.port);
fc_common::validate::warn_insecure_schemes(
&config.server.allowed_url_schemes,
);
let db = Database::new(config.database.clone()).await?;
// Bootstrap declarative projects, jobsets, and API keys from config

17
crates/server/src/routes/projects.rs
View file

@ -62,6 +62,11 @@ async fn create_project(
input
.validate()
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
fc_common::validate::validate_url_scheme(
&input.repository_url,
&state.config.server.allowed_url_schemes,
)
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
let project = fc_common::repo::projects::create(&state.pool, input)
.await
.map_err(ApiError)?;
@ -87,6 +92,13 @@ async fn update_project(
input
.validate()
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
if let Some(ref url) = input.repository_url {
fc_common::validate::validate_url_scheme(
url,
&state.config.server.allowed_url_schemes,
)
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
}
let project = fc_common::repo::projects::update(&state.pool, id, input)
.await
.map_err(ApiError)?;
@ -231,6 +243,11 @@ async fn setup_project(
create_project
.validate()
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
fc_common::validate::validate_url_scheme(
&create_project.repository_url,
&state.config.server.allowed_url_schemes,
)
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
let project = fc_common::repo::projects::create(&state.pool, create_project)
.await