Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit 00eb79c2 authored by Pierre Jarriges's avatar Pierre Jarriges
Browse files

admin static views

parent 2aee2071
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 160 additions and 47 deletions
admin_app/auth/index.html 0 → 100644
+ 15
− 0
View file @ 00eb79c2
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Krustacea | Admin dashboard</title>
</head>
<body>
ADMIN Dahsboard
</body>
<script src='/assets/default/admin.js'></script>
</html>
\ No newline at end of file
admin_app/login/index.html 0 → 100644
+ 26
− 0
View file @ 00eb79c2
<html lang='en' prefix='og: https://ogp.me/ns#'>
<head>
<meta charset='UTF-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name='viewport' content='width=device-width, initial-scale=1.0'>
<title>Krustacea - Admin Login</title>
<link rel='stylesheet' href='/assets/default/admin.css'>
</head>
<body>
<form id='admin-login-form'>
<div>
<label for='username'>Admin Id</label>
<input type='text' name='username' />
</div>
<div>
<label for='password'>Password</label>
<input type='password' name='password' />
</div>
<input type='submit' />
</form>
</body>
<script src='/assets/default/admin.js'></script>
</html>
\ No newline at end of file
default_static/admin.js
+ 1
− 1
View file @ 00eb79c2
......@@ -3,7 +3,7 @@ document.getElementById('admin-login-form').onsubmit = function (e) {
fetch('/admin/login', { method: 'POST', body: new URLSearchParams(new FormData(e.target)) }).then(res => {
if (res.status >= 200 && res.status < 400) {
console.log(res)
window.location = '/admin/auth/workspace';
window.location = '/admin_app/auth/';
}
}).catch(err => console.log(err))
......
default_views/401.html 0 → 100644
+ 18
− 0
View file @ 00eb79c2
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Krustacea | Unauthorized</title>
</head>
<body>
<h1>Error 401 - Unauthorized</h1>
<p>
Please <a href='/admin_app/login/'>login</a> before accessing this page.
</p>
</body>
</html>
\ No newline at end of file
default_views/404.html 0 → 100644
+ 15
− 0
View file @ 00eb79c2
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Krustacea | Not Found</title>
</head>
<body>
<h1>Page Not Found</h1>
<a href="/">Back to home</a>
</body>
</html>
\ No newline at end of file
src/main.rs
+ 13
− 3
View file @ 00eb79c2
......@@ -43,6 +43,7 @@ async fn main() -> std::io::Result<()> {
let srv_conf = tls_config(&app_state.config);
let dir = website.static_files_manager.dir.clone();
let auth_service = std::sync::Arc::new(AuthService {});
HttpServer::new(move || {
App::new()
......@@ -51,14 +52,22 @@ async fn main() -> std::io::Result<()> {
.wrap(RedirectHttps::default().to_port(port_tls))
.app_data(web::Data::new(RwLock::new(app_state.clone())))
.app_data(web::Data::new(RwLock::new(website.clone())))
.service(
web::scope("/admin_app")
.service(
web::scope("/auth").wrap(auth_service.clone()).service(
Files::new("/", &dir.join("admin_app").join("auth"))
.index_file("index.html"),
),
)
.service(Files::new("/", &dir.join("admin_app")).index_file("index.html")),
)
.service(
web::scope("/admin")
.service(service::admin_login)
.service(service::admin_authenticate)
.service(
web::scope("/auth")
.wrap(AuthService {})
.service(service::admin_workspace)
.wrap(auth_service.clone())
.service(service::add_page)
.service(service::get_page_data)
.service(service::update_page)
......@@ -72,6 +81,7 @@ async fn main() -> std::io::Result<()> {
)
.service(service::files::favicon)
.service(Files::new("/", &dir).index_file("index.html"))
.default_service(web::to(service::not_found))
})
.bind(format!("{}:{}", host, port))?
.bind_rustls(format!("{}:{}", host, port_tls), srv_conf)?
......
src/middleware/authentication.rs
+ 12
− 2
View file @ 00eb79c2
use crate::{app::AdminAuthToken, AppState};
use crate::{app::AdminAuthToken, website::WebSite, AppState};
use actix_web::{
body::{EitherBody, MessageBody},
dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform},
......@@ -66,9 +66,19 @@ where
Box::pin(async move {
let mut req = req;
if let false = authenticate(&mut req, &token).await {
let f401 = req
.app_data::<web::Data<RwLock<WebSite>>>()
.expect("Failed to extract WebSite from ServiceRequest")
.read()
.expect("Failed to read WebSite")
.static_files_manager
.dir
.join("default_views")
.join("401.html");
return Ok(req.into_response(
HttpResponse::Unauthorized()
.body("<html><body>Error 401 - Unauthorized - Please go to <a href='/admin/login'>login page</a>.</body></html>") // TODO a proper 401 view ?
.body(std::fs::read_to_string(f401)?)
.map_into_right_body(),
));
}
......
src/service/admin.rs
+ 1
− 40
View file @ 00eb79c2
use crate::AppState;
use actix_web::{
get, post,
post,
web::{Data, Form},
HttpRequest, HttpResponse,
};
use std::sync::RwLock;
#[get("/workspace")]
async fn admin_workspace() -> HttpResponse {
// TODO return admin static web view with js application
actix_web::HttpResponse::Ok().body("Welcome Admin")
}
#[derive(serde::Deserialize)]
struct Credentials {
username: String,
......@@ -55,36 +49,3 @@ async fn admin_authenticate(
}
}
}
#[get("/login")]
pub async fn admin_login() -> HttpResponse {
// TODO create a module with built-in admin static views
HttpResponse::Ok().body(
"
<html lang='en' prefix='og: https://ogp.me/ns#'>
<head>
<meta charset='UTF-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name='viewport' content='width=device-width, initial-scale=1.0'>
<title>Krutacea - Admin Login</title>
<link rel='stylesheet' href='/assets/default/admin.css'>
</head>
<body>
<form id='admin-login-form'>
<div>
<label for='username'>Admin Id</label>
<input type='text' name='username'/>
</div>
<div>
<label for='password'>Password</label>
<input type='password' name='password' />
</div>
<input type='submit' />
</form>
</body>
<script src='/assets/default/admin.js'></script>
</html>
",
)
}
src/service/default.rs 0 → 100644
+ 15
− 0
View file @ 00eb79c2
use crate::website::WebSite;
use actix_web::{web::Data, HttpResponse, Responder};
use std::sync::RwLock;
pub async fn not_found(website: Data<RwLock<WebSite>>) -> impl Responder {
let f404 = website
.read()
.expect("Failed to read WebSite")
.static_files_manager
.dir
.join("default_views")
.join("404.html");
HttpResponse::NotFound().body(std::fs::read_to_string(f404).unwrap())
}
src/service/files.rs
+ 1
− 0
View file @ 00eb79c2
......@@ -22,6 +22,7 @@ pub async fn favicon(website: web::Data<RwLock<WebSite>>) -> impl Responder {
.unwrap()
.static_files_manager
.dir
.join("assets")
.join("default")
.join("favicon.ico"),
)
......
src/service/mod.rs
+ 2
− 0
View file @ 00eb79c2
mod admin;
mod default;
pub mod files;
mod website;
pub use admin::*;
pub use default::*;
pub use website::*;
src/static_files/static_files.rs
+ 41
− 1
View file @ 00eb79c2
......@@ -59,7 +59,21 @@ impl StaticFilesManager {
if let Err(err) = Self::copy_default_files(&dir) {
return Err(format!(
"Error copying StaticFilesManager default assets directory- {}",
"Error copying StaticFilesManager default assets directory - {}",
err
));
}
if let Err(err) = Self::copy_admin_web_app(&dir) {
return Err(format!(
"Error copying StaticFilesManager admin_web_app directory - {}",
err
));
}
if let Err(err) = Self::copy_default_views(&dir) {
return Err(format!(
"Error copying StaticFilesManager defult_views directory - {}",
err
));
}
......@@ -97,6 +111,32 @@ impl StaticFilesManager {
}
}
fn copy_admin_web_app(static_dir: &PathBuf) -> Result<(), String> {
let local_admin_app_dir = std::env::current_dir().unwrap().join("admin_app");
let dest = static_dir.join("admin_app");
let mut cpy_options = fs_extra::dir::CopyOptions::new();
cpy_options.content_only = true;
cpy_options.overwrite = true;
match fs_extra::dir::copy(local_admin_app_dir, dest, &cpy_options) {
Err(err) => Err(format!("{}", err)),
Ok(_) => Ok(()),
}
}
fn copy_default_views(static_dir: &PathBuf) -> Result<(), String> {
let local_admin_app_dir = std::env::current_dir().unwrap().join("default_views");
let dest = static_dir.join("default_views");
let mut cpy_options = fs_extra::dir::CopyOptions::new();
cpy_options.content_only = true;
cpy_options.overwrite = true;
match fs_extra::dir::copy(local_admin_app_dir, dest, &cpy_options) {
Err(err) => Err(format!("{}", err)),
Ok(_) => Ok(()),
}
}
fn rec_read_dir(&mut self, root: &Path, strip_from: &Path) {
for entry in root.read_dir().unwrap() {
if let Ok(entry) = entry {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Froggit est fièrement fabriqué avec amour par Lydra avec des Logiciels Libres et hébergé en France chez Scaleway | Status du service