Chaospott/foodoord
8
1
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Compare commits

base: Chaospott:v3.0.1
Branches Tags
Chaospott:master Chaospott:LukasLenCP-patch-1 Chaospott:debian
Chaospott:3.3.3 Chaospott:3.3.1 Chaospott:3.3.0 Chaospott:3.2.0 Chaospott:3.1.0 Chaospott:v3.0.4 Chaospott:v3.0.3 Chaospott:v3.0.1 Chaospott:v3.0.0 Chaospott:v2 Chaospott:v1
...
compare: Chaospott:v3.0.3
Branches Tags
Chaospott:master Chaospott:LukasLenCP-patch-1 Chaospott:debian
Chaospott:3.3.3 Chaospott:3.3.1 Chaospott:3.3.0 Chaospott:3.2.0 Chaospott:3.1.0 Chaospott:v3.0.4 Chaospott:v3.0.3 Chaospott:v3.0.1 Chaospott:v3.0.0 Chaospott:v2 Chaospott:v1

4 Commits
v3.0.1 ... v3.0.3

Author SHA1 Message Date
Bandie
0b34242781 v3.0.3 2022-07-13 19:18:55 +02:00
Bandie
a4befbc911 Update-keydb with comments and better Algo check 2022-07-13 19:16:48 +02:00
Bandie
949fc2e4fb v3.0.2 2022-07-02 15:16:15 +02:00
Bandie
940af82f84 Get rid of Mac-Newlines 2022-07-02 15:06:11 +02:00
3 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

2
build-package
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
VERSION=3.0.1 VERSION=3.0.3
dpkg-deb --root-owner-group -b debian foodoord_${VERSION}_all.deb dpkg-deb --root-owner-group -b debian foodoord_${VERSION}_all.deb

2
debian/DEBIAN/control vendored
View File

@ -1,5 +1,5 @@
Package: foodoord Package: foodoord
Version: 3.0.1 Version: 3.0.3
Maintainer: Bandie <bandie@chaospott.de> Maintainer: Bandie <bandie@chaospott.de>
Architecture: all Architecture: all
Description: Control the doors of the club, ja! Description: Control the doors of the club, ja!

8
debian/usr/sbin/foodoor-update-keydb vendored
View File

@ -24,10 +24,10 @@ rm -f ${temp_outfile}
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
valid=false valid=false
keyinfo=$(ssh-keygen -l -f ${keyfile}) # The whole key information keyinfo=$(ssh-keygen -l -f ${keyfile}) # The whole key information
crypto=$(echo "${keyinfo}" | cut -d" " -f4) # Looks like "(RSA)" or "(ED25519)" crypto=$(echo "${keyinfo}" | sed 's/.*(\(.*\))/\1/') # Looks like "RSA" or "ED25519"
key_length=$(echo "${keyinfo}" | cut -d" " -f1) key_length=$(echo "${keyinfo}" | cut -d" " -f1)
if [ "${crypto}" == "(RSA)" ]; then if [ "${crypto}" == "RSA" ]; then
if [ ${key_length} -lt 4096 ]; then if [ ${key_length} -lt 4096 ]; then
echo "Key size of key ${keyfile} not equal to 4096. Not adding it to key database." >&2 echo "Key size of key ${keyfile} not equal to 4096. Not adding it to key database." >&2
@ -36,12 +36,12 @@ rm -f ${temp_outfile}
valid=true valid=true
fi fi
elif [ "${crypto}" == "(ED25519)" ]; then elif [ "${crypto}" == "ED25519" ]; then
valid=true valid=true
fi fi
if [ "$valid" = true ]; then if [ "$valid" = true ]; then
echo "command=\"/usr/sbin/foodoor \$action \",no-port-forwarding,no-X11-forwarding,no-agent-forwarding $(cat ${keyfile})" >> ${temp_outfile} echo "command=\"/usr/sbin/foodoor \$action \",no-port-forwarding,no-X11-forwarding,no-agent-forwarding $(cat ${keyfile} | sed 's/\r//g') ${keyfile}" >> ${temp_outfile}
fi fi
fi fi
done done