adding config support for password via shared file

This commit is contained in:
anthraxx 2015-02-06 23:34:57 +01:00
parent 0e429ecb8c
commit 12be452e56
5 changed files with 19 additions and 2 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/challenge/*.o /challenge/*.o
/doorchallenge /doorchallenge
/dooris.conf

1
dooris.conf.sample Normal file
View file

@ -0,0 +1 @@
password=sesamaenderdich

3
lock
View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
source shared
echo "Initializing Space Systems..." echo "Initializing Space Systems..."
echo "22" > /sys/class/gpio/unexport echo "22" > /sys/class/gpio/unexport
@ -9,7 +10,7 @@ echo "out" > /sys/class/gpio/gpio22/direction
sleep 0.5 sleep 0.5
echo "Open Communication Channel..." echo "Open Communication Channel..."
# Silent, Output to /dev/null, Timeout after 5s and retry 12 times, each doubling the waitingtime until ten minutes. # Silent, Output to /dev/null, Timeout after 5s and retry 12 times, each doubling the waitingtime until ten minutes.
curl -s -o /dev/null -m 5 --connect-timeout 5 --retry 12 "hamburg.ccc.de/dooris/status.php?apikey=sesamaenderdich&action=close" & curl -s -o /dev/null -m 5 --connect-timeout 5 --retry 12 "hamburg.ccc.de/dooris/status.php?apikey=${password}&action=close" &
echo "Locking Space..." echo "Locking Space..."
echo "1" > /sys/class/gpio/gpio22/value echo "1" > /sys/class/gpio/gpio22/value
sleep 0.3 sleep 0.3

13
shared Executable file
View file

@ -0,0 +1,13 @@
#!/bin/sh
config="dooris.conf"
# warn if local config file is missing
if [ ! -f "${config}" ]; then
echo "WARNING: ${config} is missing!" >&2
fi
# get password config value in a safe way
password="$(grep password ${config} 2>/dev/null|cut -d= -f2|tr -d ' \t')"
if [ -z "${password}" ]; then
echo "WARNING: password in ${config} is missing!" >&2
fi

3
unlock
View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
source shared
echo "Initializing Space Systems..." echo "Initializing Space Systems..."
echo "27" > /sys/class/gpio/unexport echo "27" > /sys/class/gpio/unexport
@ -8,7 +9,7 @@ echo "Securing Communication to Space Systems..."
echo "out" > /sys/class/gpio/gpio27/direction echo "out" > /sys/class/gpio/gpio27/direction
sleep 0.5 sleep 0.5
echo "Open Communication Channel..." echo "Open Communication Channel..."
curl -s -o /dev/null -m 5 --connect-timeout 5 --retry 12 "hamburg.ccc.de/dooris/status.php?apikey=sesamaenderdich&action=open" & curl -s -o /dev/null -m 5 --connect-timeout 5 --retry 12 "hamburg.ccc.de/dooris/status.php?apikey=${password}&action=open" &
echo "Unlocking Space..." echo "Unlocking Space..."
echo "1" > /sys/class/gpio/gpio27/value echo "1" > /sys/class/gpio/gpio27/value
sleep 0.3 sleep 0.3