hurlebouc
/
gitust
mirror of https://forge.pointfixe.fr/hubert/gitust.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

config

This commit is contained in:
Hubert 2021-07-14 07:44:35 +02:00
parent 9ac8b2f4fe
commit b76338f802
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gitust.rs Normal file
View File

@ -0,0 +1,3 @@
pub struct Gitust {
pub repo_root_path : String,
}

31
src/main.rs
View File

@ -2,6 +2,7 @@ mod git;
mod ite; mod ite;
mod reader; mod reader;
mod writer; mod writer;
mod gitust;
use actix_files::Files; use actix_files::Files;
use actix_web::{get, post, web, App, HttpResponse, HttpServer, Responder, Error, HttpRequest, HttpMessage}; use actix_web::{get, post, web, App, HttpResponse, HttpServer, Responder, Error, HttpRequest, HttpMessage};
@ -33,6 +34,7 @@ use actix_web::http::header::IntoHeaderValue;
use actix_web::client::PayloadError; use actix_web::client::PayloadError;
use crate::reader::ToStream; use crate::reader::ToStream;
use crate::writer::Writer; use crate::writer::Writer;
use crate::gitust::Gitust;
#[derive(Template)] #[derive(Template)]
#[template(path = "hello.html")] #[template(path = "hello.html")]
@ -115,7 +117,7 @@ async fn chunk() -> HttpResponse {
return; return;
}; };
while true { loop {
tokio::time::delay_for(std::time::Duration::from_secs(1)).await; tokio::time::delay_for(std::time::Duration::from_secs(1)).await;
println!("send message"); println!("send message");
tx.send(Ok(Bytes::from_static(b"coucou"))); tx.send(Ok(Bytes::from_static(b"coucou")));
@ -126,7 +128,11 @@ async fn chunk() -> HttpResponse {
} }
#[get("/git/{owner}/{repo}.git")] #[get("/git/{owner}/{repo}.git")]
async fn git_main(web::Path((owner, reponame)): web::Path<(String, String)>, web::Query(GitWebQ{commit : commitnameopt, path : pathopt}) : web::Query<GitWebQ>) -> impl Responder { async fn git_main(
web::Path((owner, reponame)): web::Path<(String, String)>,
web::Query(GitWebQ{commit : commitnameopt, path : pathopt}) : web::Query<GitWebQ>,
gitust : web::Data<Gitust>
) -> impl Responder {
let commitname = match commitnameopt { let commitname = match commitnameopt {
None => {"master".to_string()} None => {"master".to_string()}
Some(s) => {s} Some(s) => {s}
@ -149,22 +155,20 @@ async fn git_main(web::Path((owner, reponame)): web::Path<(String, String)>, web
GitMainTemplate { repo, browse : browse, root : path, user_opt : Some(user)} GitMainTemplate { repo, browse : browse, root : path, user_opt : Some(user)}
} }
//#[get("/git/{owner}/{repo}.git/{path:.*}")] //#[get("/git/{owner}/{repo}.git/{path:.*}")]
async fn git_proto(mut payload : web::Payload, web::Path((owner, reponame)): web::Path<(String, String)>, mut req: HttpRequest) -> io::Result<HttpResponse>{ async fn git_proto(
mut payload : web::Payload,
web::Path((owner, reponame)): web::Path<(String, String)>,
mut req: HttpRequest,
gitust : web::Data<Gitust>
) -> io::Result<HttpResponse>{
//println!("enter git_proto"); //println!("enter git_proto");
let mut cmd = Command::new("git"); let mut cmd = Command::new("git");
cmd.arg("http-backend"); cmd.arg("http-backend");
// Required environment variables // Required environment variables
cmd.env("REQUEST_METHOD", req.method().as_str()); cmd.env("REQUEST_METHOD", req.method().as_str());
cmd.env("GIT_PROJECT_ROOT", "/home/hubert"); cmd.env("GIT_PROJECT_ROOT", &gitust.repo_root_path);
cmd.env( cmd.env("PATH_INFO", format!("/{}/{}.git",owner, reponame));
"PATH_INFO",
if req.path().starts_with('/') {
req.path().to_string()
} else {
format!("/{}", req.path())
},
);
cmd.env("REMOTE_USER", ""); cmd.env("REMOTE_USER", "");
//cmd.env("REMOTE_ADDR", req.remote_addr().to_string()); //cmd.env("REMOTE_ADDR", req.remote_addr().to_string());
cmd.env("QUERY_STRING", req.query_string()); cmd.env("QUERY_STRING", req.query_string());
@ -283,6 +287,9 @@ async fn main() -> std::io::Result<()> {
HttpServer::new(|| { HttpServer::new(|| {
let auth = HttpAuthentication::basic(basic_auth_validator); let auth = HttpAuthentication::basic(basic_auth_validator);
App::new() App::new()
.data(Gitust {
repo_root_path: "/home/hubert/gitust".to_string(),
})
.wrap(Logger::default()) .wrap(Logger::default())
// .wrap(Logger::new("%a %{User-Agent}i")) // .wrap(Logger::new("%a %{User-Agent}i"))
.wrap(CookieSession::signed(&[0; 32]).secure(false)) .wrap(CookieSession::signed(&[0; 32]).secure(false))