foosinn/mac4nick
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updates

Browse source
This commit is contained in:
Stefan Schwarz 2020-08-21 18:53:33 +02:00
parent cf185c833b
commit c4d44c68a0
9 changed files with 146 additions and 87551 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/db.rs
View file

@ -48,9 +48,9 @@ LEFT OUTER JOIN
alive_hosts al
ON
mtn.macaddr = al.macaddr
AND al.erfda > NOW() - INTERVAL 24 DAY
AND al.erfda > NOW() - INTERVAL 30 MINUTE
WHERE
nickname = ?
nickname LIKE ?
ORDER BY
al.erfda DESC
",

23
src/main.rs
View file

@ -5,13 +5,12 @@ use std::io;
use tide::sessions::{MemoryStore, SessionMiddleware};
mod db;
mod forms;
mod middleware;
mod routes;
mod session;
mod templates;
pub use session::AppSession as Session;
pub const USER: &str = "foosinn";
pub const USER: &str = "hansi";
/// Configuration
#[derive(FromArgs, Debug)]
@ -30,6 +29,10 @@ struct Config {
/// session secret
#[argh(option, default = "\"thisisnotasecretthisisnotasecret\".into()")]
session_secret: String,
/// debug
#[argh(switch)]
log: bool,
}
#[derive(Clone)]
@ -44,6 +47,16 @@ pub enum Level {
Error,
}
impl Level {
fn color(&self) -> &'static str {
match self {
Level::Info => "success",
Level::Warn => "warning",
Level::Error => "danger",
}
}
}
pub type Message = (Level, String);
pub type Request = tide::Request<State>;
@ -51,6 +64,9 @@ pub type Request = tide::Request<State>;
#[async_std::main]
async fn main() -> Result<(), io::Error> {
let config: Config = argh::from_env();
if config.log {
tide::log::start();
}
let pool = MySqlPool::connect(&config.dsn)
.await
@ -60,6 +76,7 @@ async fn main() -> Result<(), io::Error> {
SessionMiddleware::new(MemoryStore::new(), config.session_secret.as_bytes());
let mut app = tide::with_state(State { pool });
app.with(middleware::ErrorHandler::default());
app.with(session_store);
app.at("/").get(routes::index);
app.at("/change").post(routes::change);

23
src/middleware.rs Normal file
View file

@ -0,0 +1,23 @@
use crate::Request;
use crate::State;
use tide::log;
use tide::utils::async_trait;
use tide::{Middleware, Next, Redirect, Result};
#[derive(Default)]
pub struct ErrorHandler {}
#[async_trait]
impl Middleware<State> for ErrorHandler {
async fn handle(&self, request: Request, next: Next<'_, State>) -> Result {
let mut resp = next.run(request).await;
if let Some(err) = resp.take_error() {
log::error!("middleware caught error", { error: err.to_string() });
return Ok(Redirect::see_other("/").into());
}
Ok(resp)
}
fn name(&self) -> &str {
"ErrorHandler"
}
}

10
src/routes.rs
View file

@ -1,7 +1,7 @@
use crate::db;
use crate::forms;
use crate::templates;
use crate::Session;
use crate::forms::ChangeForm;
use crate::session::Session;
use crate::templates::IndexTemplate;
use crate::USER;
use tide::Redirect;
@ -19,11 +19,11 @@ pub async fn index(mut request: crate::Request) -> tide::Result {
.await
.map_err(|err| dbg!(err))?;
let messages = Session::from(&mut request).pop_messages();
Ok(templates::IndexTemplate::new(my, unassinged, messages).into())
Ok(IndexTemplate::new(my, unassinged, messages).into())
}
pub async fn change(mut request: crate::Request) -> tide::Result {
let form: forms::ChangeForm = request.body_form().await?;
let form: ChangeForm = request.body_form().await?;
let message = form.handle(&request).await;
Session::from(&mut request).add_message(message);
Ok(Redirect::see_other("/").into())

8
src/session.rs
View file

@ -2,12 +2,12 @@ use crate::Message;
use crate::Request;
use serde::{Deserialize, Serialize};
pub struct AppSession<'r> {
pub struct Session<'r> {
request: &'r mut Request,
session: Inner,
}
impl<'r> AppSession<'r> {
impl<'r> Session<'r> {
pub fn add_message(&mut self, message: Message) {
self.session.add_message(message);
}
@ -17,14 +17,14 @@ impl<'r> AppSession<'r> {
}
}
impl<'r> From<&'r mut Request> for AppSession<'r> {
impl<'r> From<&'r mut Request> for Session<'r> {
fn from(request: &'r mut Request) -> Self {
let session = Inner::from(&*request);
Self { request, session }
}
}
impl<'r> Drop for AppSession<'r> {
impl<'r> Drop for Session<'r> {
fn drop(&mut self) {
self.session.commit(self.request);
}

3
static/postcss.config.js
View file

@ -1,3 +0,0 @@
module.exports = {
plugins: [require("tailwindcss"), require("autoprefixer")],
};

3
static/raw.css
View file

@ -1,3 +0,0 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

87446
static/style.css
View file

File diff suppressed because it is too large Load diff

177
templates/index.html
View file

@ -5,102 +5,109 @@
<meta charset="utf-8">
<title>macnickenson</title>
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
</head>
<body>
<body class="bg-gray-100">
<div class="container">
<h1>macnickenson</h1>
<div class="rounded-lg bg-white m-5 shadow-lg">
<h1 class="text-xl underline text-center p-2">
macnickenson
</h1>
<div class="p-2">
{% for message in messages %}
{{ message.1 }}
{% endfor %}
</div>
{% for message in messages %}
<div class="alert alert-{{ message.0.color() }}">{{ message.1 }}</div>
{% endfor %}
<div class="p-2">
<h2 class="underline">Your Devices:</h2>
<div class="mt-5">
<h2>Your Devices:</h2>
<table class="table">
<thead><tr>
<th scope="col">Mac-Address</th>
<th scope="col">Description</th>
<th scope="col">Privacy</th>
<th scope="col">Commands</th>
</tr></thead>
<tbody>
{% for device in my %}
<form action="/change" method="POST">
<div class="grid grid-cols-3 grid-gap-1">
<div class="font-mono">
{{ device.macaddr }} {{ device.present }}
<input type="hidden" name="macaddr" value="{{ device.macaddr }}" />
</div>
<div>
<input class="focus:shadow-outline border border-gray-300 px-2"
name="descr"
value="{{ device.descr }}" />
<select class="focus:shadow-outline border border-gray-300 px-2"
name="privacy">
<option value="0"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowUserAndDevice) }}
>Show User and Device</option>
<option value="1"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowUser) }}
>Show User</option>
<option value="2"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowAnonymous) }}
>Show Anonymous</option>
<option value="3"
{{ device.privacy.selected(crate::db::PrivacyLevel::HideUser) }}
>Hide User</option>
<option value="4"
{{ device.privacy.selected(crate::db::PrivacyLevel::DontLog) }}
>Dont Log</option>
</select>
</div>
<div>
<button type="submit" name="action" value="update"
class="rounded bg-gray-300 font-bold px-2 bg-green-500">
Update
</button>
<button type="submit"name="action" value="delete"
class="rounded bg-gray-300 font-bold px-2 bg-red-500">
Delete
</button>
</div>
</div>
</form>
<tr><form action="/change" method="POST">
<td>
{{ device.macaddr }}
{% if device.present %}
<span class="badge badge-success">on</span>
{% endif %}
<input type="hidden" name="macaddr" value="{{ device.macaddr }}" />
</td>
<td><input name="descr" required value="{{ device.descr }}" /></td>
<td>
<select name="privacy">
<option value="0"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowUserAndDevice) }}
>Show User and Device</option>
<option value="1"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowUser) }}
>Show User</option>
<option value="2"
{{ device.privacy.selected(crate::db::PrivacyLevel::ShowAnonymous) }}
>Show Anonymous</option>
<option value="3"
{{ device.privacy.selected(crate::db::PrivacyLevel::HideUser) }}
>Hide User</option>
<option value="4"
{{ device.privacy.selected(crate::db::PrivacyLevel::DontLog) }}
>Dont Log</option>
</select>
</td>
<td>
<div class="btn-group">
<button type="submit" name="action" value="update"
class="btn btn-primary">Update</button>
<button type="submit" name="action" value="delete"
class="btn btn-danger">Delete</button>
</div>
</td>
</form></tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="p-2">
<h2 class="underline">Unregistred Devices:</h2>
<div class="mt-5">
<h2>Unregistred Devices:</h2>
<table class="table">
<thead><tr>
<th>MAC-Address</th>
<th>IP-Address</th>
<th>Description</th>
<th>Privacy</th>
<th>Commands</th>
</tr></thead>
<tbody>
{% for device in unassinged %}
<form action="/change" method="POST">
<div class="grid grid-cols-4 grid-gap-1 p-2">
<div class="font-mono">
{{ device.macaddr }}
<input type="hidden" name="macaddr" value="{{ device.macaddr }}" />
</div>
<div class="font-mono">{{ device.ip() }}</div>
<div>
<input class="focus:shadow-outline border border-gray-300 px-2"
placeholder="awesome new device"
name="descr" />
<select class="focus:shadow-outline border border-gray-300 px-2"
name="privacy">
<option value="0">Show User and Device</option>
<option value="1">Show User</option>
<option value="2" selected>Show Anonymous</option>
<option value="3">Hide User</option>
<option value="4">Dont Log</option>
</select>
</div>
<div>
<button class="rounded bg-gray-300 font-bold px-2 bg-blue-300"
name="action" value="register" type="submit">
Register
</button>
</div>
</div>
</form>
<tr><form action="/change" method="POST">
<td>
{{ device.macaddr }}
<input type="hidden" name="macaddr" value="{{ device.macaddr }}" />
</td>
<td>{{ device.ip() }}</td>
<td>
<input placeholder="awesome new device" required name="descr" />
</td>
<td>
<select name="privacy">
<option value="0">Show User and Device</option>
<option value="1">Show User</option>
<option value="2" selected>Show Anonymous</option>
<option value="3">Hide User</option>
<option value="4">Dont Log</option>
</select>
</td>
<td>
<button name="action" value="register" type="submit"
class="btn btn-success">Register</button>
</td>
</form></tr>
{% endfor %}
</table>
</div>
<div class="shadow-lg p-2">
<div>
footer
</div>
</div>