feat: serve files from git repository
This commit is contained in:
parent
0fff342913
commit
53bd8c54bb
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
/target
|
/target
|
||||||
tarpaulin-report.html
|
tarpaulin-report.html
|
||||||
|
.env
|
||||||
|
|
604
Cargo.lock
generated
604
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -36,6 +36,9 @@ derive_more = "0.99"
|
||||||
num_cpus = "1.13"
|
num_cpus = "1.13"
|
||||||
|
|
||||||
tokio = { version = "1", features=["sync"]}
|
tokio = { version = "1", features=["sync"]}
|
||||||
|
num_enum = "0.5.7"
|
||||||
|
|
||||||
|
mime_guess = "2.0.4"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
mktemp = "0.4.1"
|
mktemp = "0.4.1"
|
||||||
|
|
|
@ -7,7 +7,7 @@ source_code = "https://github.com/realaravinth/pages"
|
||||||
# 3. path: the directory where you'd like Pages to clone the specified repository
|
# 3. path: the directory where you'd like Pages to clone the specified repository
|
||||||
# 3. secret: a unique secret which is used to authenticate webhook calls
|
# 3. secret: a unique secret which is used to authenticate webhook calls
|
||||||
pages = [
|
pages = [
|
||||||
{ branch = "gh-pages", domain="mcaptcha.org", repo = "https://github.com/mCaptcha/website/", path ="/tmp/pages/mcaptcha/website", secret = "faee1b650ac586068a54cb160bd6353c5e16be7c64b49113fe57726e5393" },
|
{ branch = "gh-pages", domain="local.mcaptcha.org", repo = "https://github.com/mCaptcha/website/", path ="/tmp/pages/mcaptcha/website", secret = "faee1b650ac586068a54cb160bd6353c5e16be7c64b49113fe57726e5393" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[server]
|
[server]
|
||||||
|
|
|
@ -26,9 +26,11 @@ use log::info;
|
||||||
mod ctx;
|
mod ctx;
|
||||||
mod deploy;
|
mod deploy;
|
||||||
mod errors;
|
mod errors;
|
||||||
|
mod git;
|
||||||
mod meta;
|
mod meta;
|
||||||
mod page;
|
mod page;
|
||||||
mod routes;
|
mod routes;
|
||||||
|
mod serve;
|
||||||
mod settings;
|
mod settings;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
|
|
@ -18,12 +18,14 @@ use actix_web::web;
|
||||||
|
|
||||||
use crate::deploy::routes::Deploy;
|
use crate::deploy::routes::Deploy;
|
||||||
use crate::meta::routes::Meta;
|
use crate::meta::routes::Meta;
|
||||||
|
use crate::serve::routes::Serve;
|
||||||
|
|
||||||
pub const ROUTES: Routes = Routes::new();
|
pub const ROUTES: Routes = Routes::new();
|
||||||
|
|
||||||
pub struct Routes {
|
pub struct Routes {
|
||||||
pub meta: Meta,
|
pub meta: Meta,
|
||||||
pub deploy: Deploy,
|
pub deploy: Deploy,
|
||||||
|
pub serve: Serve,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Routes {
|
impl Routes {
|
||||||
|
@ -31,6 +33,7 @@ impl Routes {
|
||||||
Self {
|
Self {
|
||||||
meta: Meta::new(),
|
meta: Meta::new(),
|
||||||
deploy: Deploy::new(),
|
deploy: Deploy::new(),
|
||||||
|
serve: Serve::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,4 +41,5 @@ impl Routes {
|
||||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||||
crate::meta::services(cfg);
|
crate::meta::services(cfg);
|
||||||
crate::deploy::services(cfg);
|
crate::deploy::services(cfg);
|
||||||
|
crate::serve::services(cfg);
|
||||||
}
|
}
|
||||||
|
|
85
src/serve.rs
Normal file
85
src/serve.rs
Normal file
|
@ -0,0 +1,85 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
use actix_web::{http::header::ContentType, web, HttpRequest, HttpResponse, Responder};
|
||||||
|
|
||||||
|
use crate::errors::*;
|
||||||
|
use crate::page::Page;
|
||||||
|
use crate::AppCtx;
|
||||||
|
|
||||||
|
pub mod routes {
|
||||||
|
pub struct Serve {
|
||||||
|
pub catch_all: &'static str,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serve {
|
||||||
|
pub const fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
catch_all: "/{path:.*}",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn find_page<'a>(domain: &str, ctx: &'a AppCtx) -> Option<&'a Page> {
|
||||||
|
log::info!("looking for {domain}");
|
||||||
|
for page in ctx.settings.pages.iter() {
|
||||||
|
log::debug!("configured domains: {}", page.domain);
|
||||||
|
log::debug!("{}", page.domain.trim() == domain.trim());
|
||||||
|
if page.domain.trim() == domain.trim() {
|
||||||
|
log::debug!("found configured domains: {}", page.domain);
|
||||||
|
return Some(page);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
#[my_codegen::get(path = "crate::V1_API_ROUTES.serve.catch_all")]
|
||||||
|
async fn index(req: HttpRequest, ctx: AppCtx) -> ServiceResult<impl Responder> {
|
||||||
|
let c = req.connection_info();
|
||||||
|
let mut host = c.host();
|
||||||
|
if host.contains(':') {
|
||||||
|
host = host.split(':').next().unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if host == ctx.settings.server.domain || host == "localhost" {
|
||||||
|
Ok(HttpResponse::Ok()
|
||||||
|
.content_type(ContentType::html())
|
||||||
|
.body("Welcome to Librepages!"))
|
||||||
|
} else {
|
||||||
|
match find_page(host, &ctx) {
|
||||||
|
Some(page) => {
|
||||||
|
log::debug!("Page found");
|
||||||
|
let content = crate::git::read_file(&page.path, req.uri().path())?;
|
||||||
|
let mime = if let Some(mime) = content.mime.first_raw() {
|
||||||
|
mime
|
||||||
|
} else {
|
||||||
|
"text/html; charset=utf-8"
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(HttpResponse::Ok()
|
||||||
|
//.content_type(ContentType::html())
|
||||||
|
.content_type(mime)
|
||||||
|
.body(content.content.bytes()))
|
||||||
|
}
|
||||||
|
None => Err(ServiceError::WebsiteNotFound),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||||
|
cfg.service(index);
|
||||||
|
}
|
Loading…
Reference in a new issue