Uni/CZI_presence_detector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Separate scanner and website, begin with front-end for identity input

Browse source
This commit is contained in:
Jonathan Flueren 2023-08-13 19:51:44 +02:00
parent 5ccf76b8f3
commit 6720423e16
15 changed files with 91 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
public/index.php
View file

@ -1,48 +0,0 @@
<?php
$page_title = 'CZI Presence Detector';
$present_file = 'present.json';
$present = json_decode(file_get_contents($present_file), true);
$tz = 'Europe/Berlin';
$datetime = new DateTime("now", new DateTimeZone($tz));
$datetime->setTimestamp($present["timestamp"]);
?>
<html>
<head>
<title><?php echo $page_title; ?></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
<script src="bootstrap/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
</head>
<body>
<nav class="navbar navbar-light bg-light justify-content-between" style="padding: 0">
<span class="navbar-brand mb-0 h1" style="padding-left: 1rem"><?php echo $page_title; ?></span>
</nav>
<div id="content" style="padding: 2rem;">
<h2>Jetzt gerade im CZI <small>(letztes Update von <?php echo $datetime->format('H:i:s d.m.Y'); ?>)</small></h2><br>
<table class="table">
<thead>
<tr>
<th>Name</th>
<th>MAC</th>
</tr>
</thead>
<?php
foreach ($present["identities"] as $identity) {
?>
<tr>
<td><?php echo $identity; ?></td>
</tr>
<?php
}
?>
</table>
</div>
</body>
</html>

1
public/present.json
View file

@ -1 +0,0 @@
{"timestamp":1691853251,"identities":[{"mac":"ff:ff:ff:ff:ff:ff","name":"BROADCAST"}]}

0
identities.yaml → scanner/identities.yaml
View file

0
scan.sh → scanner/scan.sh
View file

0
upload.py → scanner/upload.py
View file

0
wifi_map.yaml → scanner/wifi_map.yaml
View file

0
public/bootstrap/css/bootstrap.min.css → website/bootstrap/css/bootstrap.min.css vendored
View file

0
public/bootstrap/css/bootstrap.min.css.map → website/bootstrap/css/bootstrap.min.css.map
View file

0
public/bootstrap/js/bootstrap.bundle.min.js → website/bootstrap/js/bootstrap.bundle.min.js vendored
View file

0
public/bootstrap/js/bootstrap.bundle.min.js.map → website/bootstrap/js/bootstrap.bundle.min.js.map
View file

0
website/config.php Normal file
View file

1
website/identities.json Normal file
View file

@ -0,0 +1 @@
[]

89
website/index.php Normal file
View file

@ -0,0 +1,89 @@
<?php
$page_title = 'CZI Presence Detector';
$present_file = 'present.json';
$identities_file = 'identities.json';
$name_pattern = "^([ \u00c0-\u01ffa-zA-Z'\-]){1,30}$";
$mac_pattern = '^([0-9A-Fa-f]{2}[:-s]){5}([0-9A-Fa-f]{2})$';
$present = json_decode(file_get_contents($present_file), true);
$tz = 'Europe/Berlin';
$datetime = new DateTime("now", new DateTimeZone($tz));
$datetime->setTimestamp($present["timestamp"]);
if ($_SERVER['REQUEST_METHOD'] == "POST") {
if (
preg_match($name_pattern, $_POST['name']) != 1 ||
preg_match($mac_pattern, $_POST['mac'] != 1)
) {
http_response_code(400);
die("Bad data");
}
$name = $_POST['name'];
$normalized_mac = str_replace('-', ':', strtolower($_POST['mac']));
$hashed_mac = hash('sha256', $normalized_mac);
$identities = json_decode(file_get_contents($identities_file), true);
foreach ($identities as $identity) {
if (
$identity['name'] == $name ||
$identity['mac_hash'] == $hashed_mac
) {
// TODO show error to user
die("Duplicate data");
}
}
// TODO store new identity
header("Location: /", true, 303);
exit();
}
?>
<html>
<head>
<title><?php echo $page_title; ?></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
<script src="bootstrap/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
</head>
<body>
<nav class="navbar navbar-light bg-light justify-content-between" style="padding: 0">
<span class="navbar-brand mb-0 h1" style="padding-left: 1rem"><?php echo $page_title; ?></span>
</nav>
<div id="content" style="padding: 2rem;">
<h2>Jetzt gerade im CZI <small>(letztes Update von <?php echo $datetime->format('H:i:s d.m.Y'); ?>)</small></h2><br>
<table class="table">
<thead>
<tr>
<th>Name</th>
</tr>
</thead>
<?php
foreach ($present["names"] as $name) {
?>
<tr>
<td><?php echo $name; ?></td>
</tr>
<?php
}
?>
</table>
<br><br><br>
<div class="card" style="max-width: 30rem;">
<div class="card-body">
<h5 class="card-title">Neues Gerät tracken</h5>
<form method="POST">
<input class="form-control" type="text" name="name" pattern="<?php print($name_pattern); ?>" placeholder="Gebe hier deinen Namen ein" value="" /><br>
<input class="form-control" type="text" name="mac" pattern="<?php print($mac_pattern); ?>" placeholder="Gebe hier die MAC-Adresse des zu trackenden Gerätes ein" value="" /><br>
<button class="btn btn-primary" type="submit">Speichern</button>
</form></div></div>
</div>
</body>
</html>

1
website/present.json Normal file
View file

@ -0,0 +1 @@
{"timestamp":1691853251,"names":["BROADCAST"]}

0
public/update.php → website/update.php
View file