Compare commits
2 Commits
v0.21.2
...
chore/upda
Author | SHA1 | Date | |
---|---|---|---|
1ef65037a1 | |||
5d4b90167b |
@ -1,3 +0,0 @@
|
||||
[advisories]
|
||||
# TODO: check if chrono fixed this
|
||||
ignore = [ "RUSTSEC-2020-0159", "RUSTSEC-2020-0071" ]
|
1095
Cargo.lock
generated
1095
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
42
Cargo.toml
42
Cargo.toml
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "hoc"
|
||||
version = "0.21.2"
|
||||
version = "0.18.0"
|
||||
authors = ["Valentin Brandl <vbrandl@riseup.net>"]
|
||||
edition = "2018"
|
||||
build = "build.rs"
|
||||
@ -13,34 +13,34 @@ path = "src/main.rs"
|
||||
name = "hoc"
|
||||
|
||||
[dependencies]
|
||||
actix-rt = "2.6.0"
|
||||
actix-web = "4.0.0-rc.3"
|
||||
actix-rt = "2.2.0"
|
||||
actix-web = "4.0.0-beta.8"
|
||||
badge = "0.3.0"
|
||||
bytes = "1.1.0"
|
||||
bytes = "1.0.1"
|
||||
config = { version = "0.11.0", features = ["toml"] }
|
||||
dotenv = "0.15.0"
|
||||
futures = "0.3.21"
|
||||
git2 = "0.13.25"
|
||||
futures = "0.3.17"
|
||||
git2 = "0.13.20"
|
||||
lazy_static = "1.4.0"
|
||||
number_prefix = "0.4.0"
|
||||
openssl-probe = "0.1.5"
|
||||
reqwest = "0.11.9"
|
||||
serde = "1.0.136"
|
||||
serde_derive = "1.0.136"
|
||||
serde_json = "1.0.79"
|
||||
tracing = "0.1.31"
|
||||
tracing-actix-web = "0.5.0-rc.3"
|
||||
tracing-bunyan-formatter = "0.3.2"
|
||||
openssl-probe = "0.1.4"
|
||||
reqwest = "0.11.4"
|
||||
serde = "1.0.126"
|
||||
serde_derive = "1.0.123"
|
||||
serde_json = "1.0.64"
|
||||
tracing = "0.1.26"
|
||||
tracing-actix-web = "0.4.0-beta.11"
|
||||
tracing-bunyan-formatter = "0.2.4"
|
||||
tracing-futures = "0.2.5"
|
||||
tracing-log = "0.1.2"
|
||||
tracing-subscriber = { version = "0.3.9", features = ["registry", "env-filter"] }
|
||||
tracing-subscriber = { version = "0.2.19", features = ["registry", "env-filter"] }
|
||||
|
||||
[build-dependencies]
|
||||
ructe = "0.14.0"
|
||||
vergen = { version = "6.0.2", default-features = false, features = ["git"] }
|
||||
ructe = "0.13.4"
|
||||
vergen = { version = "5.1.13", default-features = false, features = ["git"] }
|
||||
|
||||
[dev-dependencies]
|
||||
awc = "3.0.0-beta.21"
|
||||
ructe = "0.14.0"
|
||||
tempfile = "3.3.0"
|
||||
tokio = "1.17.0"
|
||||
awc = "3.0.0-beta.7"
|
||||
ructe = "0.13.4"
|
||||
tempfile = "3.2.0"
|
||||
tokio = "1.11.0"
|
||||
|
@ -19,8 +19,8 @@ The API is as simple as
|
||||
https://<host>/<service>/<user>/<repo>
|
||||
```
|
||||
|
||||
where `<service>` is one of `gitub`, `gitlab`, `bitbucket` or `sourcehut`. The HoC data can also be received as JSON by
|
||||
appending `/json` to the reuqest path:
|
||||
where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can also be received as JSON by appending
|
||||
`/json` to the reuqest path:
|
||||
|
||||
```
|
||||
https://<host>/<service>/<user>/<repo>/json
|
||||
|
9
build.rs
9
build.rs
@ -1,12 +1,15 @@
|
||||
extern crate ructe;
|
||||
extern crate vergen;
|
||||
|
||||
use ructe::{Ructe, RucteError};
|
||||
use ructe::Ructe;
|
||||
use vergen::{vergen, Config, ShaKind};
|
||||
|
||||
fn main() -> Result<(), RucteError> {
|
||||
fn main() {
|
||||
let mut config = Config::default();
|
||||
*config.git_mut().sha_kind_mut() = ShaKind::Short;
|
||||
vergen(config).expect("Unable to generate static repo info");
|
||||
Ructe::from_env()?.compile_templates("templates")
|
||||
Ructe::from_env()
|
||||
.expect("ructe")
|
||||
.compile_templates("templates")
|
||||
.unwrap();
|
||||
}
|
||||
|
49
src/lib.rs
49
src/lib.rs
@ -462,13 +462,11 @@ async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse>
|
||||
p404(repo_count)
|
||||
}
|
||||
|
||||
#[get("/tacit-css.min.css")]
|
||||
async fn css() -> HttpResponse {
|
||||
fn css() -> HttpResponse {
|
||||
HttpResponse::Ok().content_type("text/css").body(CSS)
|
||||
}
|
||||
|
||||
#[get("/favicon.ico")]
|
||||
async fn favicon32() -> HttpResponse {
|
||||
fn favicon32() -> HttpResponse {
|
||||
HttpResponse::Ok().content_type("image/png").body(FAVICON)
|
||||
}
|
||||
|
||||
@ -479,21 +477,48 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
|
||||
web::Data::new(AtomicUsize::new(count::count_repositories(&settings.repodir).unwrap()));
|
||||
let state = web::Data::new(State { settings });
|
||||
Ok(HttpServer::new(move || {
|
||||
let app = App::new()
|
||||
App::new()
|
||||
.app_data(state.clone())
|
||||
.app_data(repo_count.clone())
|
||||
.wrap(tracing_actix_web::TracingLogger::default())
|
||||
.wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
|
||||
.service(index)
|
||||
.service(health_check)
|
||||
.service(css)
|
||||
.service(favicon32)
|
||||
.service(web::resource("/tacit-css.min.css").route(web::get().to(css)))
|
||||
.service(web::resource("/favicon.ico").route(web::get().to(favicon32)))
|
||||
.service(generate)
|
||||
.default_service(web::to(async_p404));
|
||||
let app = GitHub::register_service(app);
|
||||
let app = Gitlab::register_service(app);
|
||||
let app = Bitbucket::register_service(app);
|
||||
Sourcehut::register_service(app)
|
||||
.service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
|
||||
.service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
|
||||
.service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
|
||||
.service(web::resource("/sourcehut/{user}/{repo}").to(calculate_hoc::<Sourcehut>))
|
||||
.service(
|
||||
web::resource("/github/{user}/{repo}/delete")
|
||||
.route(web::post().to(delete_repo_and_cache::<GitHub>)),
|
||||
)
|
||||
.service(
|
||||
web::resource("/gitlab/{user}/{repo}/delete")
|
||||
.route(web::post().to(delete_repo_and_cache::<Gitlab>)),
|
||||
)
|
||||
.service(
|
||||
web::resource("/bitbucket/{user}/{repo}/delete")
|
||||
.route(web::post().to(delete_repo_and_cache::<Bitbucket>)),
|
||||
)
|
||||
.service(
|
||||
web::resource("/sourcehut/{user}/{repo}/delete")
|
||||
.route(web::post().to(delete_repo_and_cache::<Sourcehut>)),
|
||||
)
|
||||
.service(web::resource("/github/{user}/{repo}/json").to(json_hoc::<GitHub>))
|
||||
.service(web::resource("/gitlab/{user}/{repo}/json").to(json_hoc::<Gitlab>))
|
||||
.service(web::resource("/bitbucket/{user}/{repo}/json").to(json_hoc::<Bitbucket>))
|
||||
.service(web::resource("/sourcehut/{user}/{repo}/json").to(json_hoc::<Sourcehut>))
|
||||
.service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
|
||||
.service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
|
||||
.service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
|
||||
.service(web::resource("/github/{user}/{repo}/view").to(overview::<GitHub>))
|
||||
.service(web::resource("/gitlab/{user}/{repo}/view").to(overview::<Gitlab>))
|
||||
.service(web::resource("/bitbucket/{user}/{repo}/view").to(overview::<Bitbucket>))
|
||||
.service(web::resource("/sourcehut/{user}/{repo}/view").to(overview::<Sourcehut>))
|
||||
.default_service(web::to(async_p404))
|
||||
})
|
||||
.workers(workers)
|
||||
.listen(listener)?
|
||||
|
@ -1,31 +1,7 @@
|
||||
use crate::{calculate_hoc, delete_repo_and_cache, json_hoc, overview};
|
||||
|
||||
use actix_web::{
|
||||
dev::{ServiceFactory, ServiceRequest},
|
||||
web, App,
|
||||
};
|
||||
|
||||
pub(crate) trait Service: Sized + 'static {
|
||||
pub(crate) trait Service {
|
||||
fn domain() -> &'static str;
|
||||
fn url_path() -> &'static str;
|
||||
fn commit_url(repo: &str, commit_ref: &str) -> String;
|
||||
|
||||
fn register_service<T>(app: App<T>) -> App<T>
|
||||
where
|
||||
T: ServiceFactory<ServiceRequest, Config = (), Error = actix_web::Error, InitError = ()>,
|
||||
{
|
||||
let url_path = Self::url_path();
|
||||
app.service(
|
||||
web::resource(format!("/{url_path}/{{user}}/{{repo}}")).to(calculate_hoc::<Self>),
|
||||
)
|
||||
.service(
|
||||
web::resource(format!("/{url_path}/{{user}}/{{repo}}/delete"))
|
||||
.route(web::post().to(delete_repo_and_cache::<Self>)),
|
||||
)
|
||||
.service(web::resource(format!("/{url_path}/{{user}}/{{repo}}/json")).to(json_hoc::<Self>))
|
||||
.service(web::resource(format!("/view/{url_path}/{{user}}/{{repo}}")).to(overview::<Self>))
|
||||
.service(web::resource(format!("/{url_path}/{{user}}/{{repo}}/view")).to(overview::<Self>))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Serialize)]
|
||||
|
4
static/tacit-css.min.css
vendored
4
static/tacit-css.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1,31 +0,0 @@
|
||||
mod util;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn favicon() {
|
||||
let test_app = util::spawn_app().await;
|
||||
|
||||
let client = awc::Client::default();
|
||||
|
||||
let response = client
|
||||
.get(&format!("{}/favicon.ico", test_app.address))
|
||||
.send()
|
||||
.await
|
||||
.expect("Failed to execute request");
|
||||
|
||||
assert!(response.status().is_success());
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn tacit_css() {
|
||||
let test_app = util::spawn_app().await;
|
||||
|
||||
let client = awc::Client::default();
|
||||
|
||||
let response = client
|
||||
.get(&format!("{}/tacit-css.min.css", test_app.address))
|
||||
.send()
|
||||
.await
|
||||
.expect("Failed to execute request");
|
||||
|
||||
assert!(response.status().is_success());
|
||||
}
|
Reference in New Issue
Block a user