adopt new wireless hardware

This commit is contained in:
jtf 2017-09-07 22:12:10 +02:00
parent a1b71842b5
commit fbec34f6fa
2 changed files with 14 additions and 21 deletions

View file

@ -1,14 +1,14 @@
#!/bin/sh -e #!/bin/sh -e
header() { header() {
echo -en 'Content-type: text/html echo -e 'Content-type: text/html\nStrict-Transport-Security: max-age=86400000\n'
Strict-Transport-Security: max-age=86400000\n\n'
} }
header_redir_display() { # let nginx do it!
header #header_redir_display() {
echo "<head><meta http-equiv=\"Refresh\" content=\"0; $SCRIPT_NAME?secret=$secret\"></head>" # header
} # echo "<head><meta http-equiv=\"Refresh\" content=\"0; $SCRIPT_NAME?secret=$secret\"></head>"
#}
## enforce SSL ## enforce SSL
#if [ $SERVER_PORT -ne 443 ]; then #if [ $SERVER_PORT -ne 443 ]; then
@ -19,23 +19,19 @@ header_redir_display() {
# extract parameters # extract parameters
# tr -dc removes all characters, this prevents things like xss # tr -dc removes all characters, this prevents things like xss
getp() { getp() {
echo "$REQUEST_URI" | sed 's/.*?//' | sed 's/%20/ /g' | tr "?&" "\n" | tr -dc "0-9a-z_= \n" | egrep "^$1=" | sed "s/^$1=//" echo "$REQUEST_URI" | sed 's/.*?//' | sed 's/%20/ /g' \
| tr "?&" "\n" | tr --complement --delete "0-9a-z_= \n" | egrep "^$1=" | sed "s/^$1=//"
} }
secret=$(getp secret) secret=$(getp secret)
hashed_secret=$(echo "$secret" | md5sum | cut -f1 -d\ ) hashed_secret=$(echo "$secret" | md5sum | cut -f1 -d\ )
cmd=$(getp cmd) cmd=$(getp cmd)
#echo "secret $secret" >/var/www/cgi-bin/2
#echo "hashed_secret $hashed_secret" >>/var/www/cgi-bin/2
#echo "cmd $cmd" >>/var/www/cgi-bin/2
# check secret # check secret
# the secrets file has to contain the hashes on a single line, comments are allowed on seperate lines # the secrets file has to contain the hashes on a single line, comments are allowed on seperate lines
# secrets can only contain the characters that are allowed in getp() with tr -dc # secrets can only contain the characters that are allowed in getp() with tr -dc
if [ -z "$secret" ] || ! grep -q "^$hashed_secret$" /etc/door-token-hashs; then if [ -z "$secret" ] || ! grep -q "^$hashed_secret$" /etc/door-token-hashs; then
header header
[ -z "$secret" ] || echo "<html><p>Ich bin mir nicht sicher. Mir scheint du bist doch ein Kohlkopf oder Anderes!</p>" [ -z "$secret" ] || echo "<html><p>Ich bin mir nicht sicher. Mir scheint, du bist doch ein Kohlkopf oder Anderes!</p>"
cat /var/www/tpl/secret.html cat /var/www/tpl/secret.html
exit exit
fi fi
@ -43,8 +39,8 @@ fi
# control relais card # control relais card
if [ -n "$cmd" ]; then if [ -n "$cmd" ]; then
case "$cmd" in case "$cmd" in
indoor_lock) pin=17; delay1=0; delay2=1;; # indoor_unlock) pin=17; delay1=0; delay2=1;; unused pin
indoor_unlock) pin=4; delay1=0; delay2=1;; indoor_lock) pin=4; delay1=0; delay2=1;;
indoor_open) pin=27; delay1=0; delay2=1;; indoor_open) pin=27; delay1=0; delay2=1;;
outdoor_buzz) pin=22; delay1=15; delay2=5;; outdoor_buzz) pin=22; delay1=15; delay2=5;;
*) header; echo 'Do not hack the hackerspace!'"$cmd"; exit;; *) header; echo 'Do not hack the hackerspace!'"$cmd"; exit;;

View file

@ -11,13 +11,10 @@
<body> <body>
<form method="GET" action="#"> <form method="GET" action="#">
<input type=hidden name=secret value="XSECRET_HEREX"> <input type=hidden name=secret value="XSECRET_HEREX">
<h2>Hauptfunktionen</h2> <h2>Schließfunktionen</h2>
<button class="main_button main_open" type="submit" name="cmd" value="indoor_open">Tür öffnen</button> <button class="main_button main_open" type="submit" name="cmd" value="indoor_open">Tür öffnen</button><br/>
<button class="main_button" type="submit" name="cmd" value="outdoor_buzz">Haustüröffner</button> <button class="main_button" type="submit" name="cmd" value="outdoor_buzz">Haustüröffner</button><br/>
<h2>weitere Funktionen</h2>
<button class="main_close" type="submit" name="cmd" value="indoor_lock">Tür abschließen</button> <button class="main_close" type="submit" name="cmd" value="indoor_lock">Tür abschließen</button>
<button type="submit" name="cmd" value="indoor_unlock">Tür aufschließen</button>
</form> </form>
</body> </body>