New upstream release

README.md

@@ -29,19 +29,6 @@ Der Deamon besteht aus folgenden Dateien.
 * foodoor-ssh-wrapper
 * foodoor-update-keydb
 
-Zusätzlich sollte für das git-repo eine Config angelegt werden: 
-
-/root/.ssh/config
-```
-Host git.chaospott.de
-  User git
-  Port 2222
-  IdentityFile ~/.ssh/id_chaospott
-```
-
-Das IdentityFile ist der Deploy-SSH-Key, der im [Repo](https://git.chaospott.de/Chaospott/foodoor-keys) hinterlegt ist.
-
-
 ##Schüssel
 
 ###Schlüsselupdate

debian/changelog

@@ -0,0 +1,11 @@
+foodoord (2-1~foobar1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Hauro <hauro@chaospott.de>  Fri, 17 Jul 2015 20:10:27 +0200
+
+foodoord (1-1~foobar1) unstable; urgency=low
+
+  * Initial release.
+
+ -- gammlaa <gammlaa@chaospott.de>  Sat, 04 Apr 2015 16:19:46 +0100

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,15 @@
+Source: foodoord
+Section: net
+Priority: optional
+Maintainer: gammlaa <gammlaa@chaospott.de>
+Build-Depends: debhelper (>= 9), dh-python, python
+Standards-Version: 3.9.6
+Homepage: https://github.com/c3e/foodoord
+
+Package: foodoord
+Architecture: all
+X-Python-Version: any
+Depends: ${misc:Depends}, adduser, python-pifacedigitalio
+Description: Türschließsystem des foobar e.V.
+ Simsalabim!
+

debian/copyright

@@ -0,0 +1,38 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: foodoord
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use 
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2014 gammlaa <gammlaa@chaospott.de>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.

debian/foodoord.cron.d

@@ -0,0 +1 @@
+*/5 * * * * root [ -x /usr/sbin/foodoor-update-keydb ] && /usr/sbin/foodoor-update-keydb >/dev/null 2>&1

debian/foodoord.install

@@ -0,0 +1,5 @@
+foodoord.conf		etc
+foodoor			usr/sbin
+foodoord		usr/sbin
+foodoor-ssh-wrapper	usr/sbin
+foodoor-update-keydb	usr/sbin

debian/foodoord.preinst

@@ -0,0 +1,38 @@
+#!/bin/sh
+# preinst script for foodoord
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        addgroup --system foodoor
+        adduser --system --ingroup foodoor --home /var/lib/foodoor/open --disabled-password --disabled-login open
+        adduser --system --ingroup foodoor --home /var/lib/foodoor/close --disabled-password --disabled-login close
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/rules

@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+%:
+	dh $@ --with=python2
+
+override_dh_installinit:
+	mkdir debian/foodoord/etc/init.d
+	cp foodoord_initd debian/foodoord/etc/init.d/foodoord
+	dh_installinit --onlyscripts

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

foodoor

@@ -9,29 +9,15 @@ if [ ! -e $PIPE_PATH ]
  exit 1
 fi 
 
-action="$1"
-isTriggerActivated="0"
-
-if [ -z "$action" ]
- then
-  action="$SSH_ORIGINAL_COMMAND"
-  isTriggerActivated="1"
-fi 
-
-case $action in
-  close|open)
-    echo $action | tee $PIPE_PATH |sed 's/open/UNLOCKED/;s/close/LOCKED/' >  /state
+case $1 in
+  close)
+    echo close > $PIPE_PATH
    ;;
-  status)
+  open)
+    echo open > $PIPE_PATH
    ;;
   *)
-    echo "Usage: $(basename $0) { close, open, status }"
+    echo "Usage: $(basename $0) { close, open}"
     exit 1
-  ;;
+   ;;
 esac
-
-if [ $isTriggerActivated -eq 1 ]
-then
-	cat /state
-	sleep 2
-fi

foodoor-ssh-wrapper

@@ -0,0 +1,2 @@
+#!/bin/sh
+ssh -i /root/.ssh/id_rsa_gitlab_deploy $1 $2

foodoor-update-keydb

@@ -1,83 +1,38 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+export GIT_SSH="/usr/sbin/foodoor-ssh-wrapper"
 
 dest=/var/run/foodoor-keys
-temp_outfile="$dest.tmp"
-
 
 if [ ! -e "${dest}/.git/config" ]
 then
-	#echo "Repo does not exist, trying to clone..."
-	( cd /var/run && git clone --quiet --single-branch --depth=1 ssh://git.chaospott.de/Keyverwaltung/foodoor-keys.git "${dest}" )
+    #echo "Repo does not exist, trying to clone..."
+    ( cd /var/run && git clone --quiet --single-branch --depth=1 luftschleuse@nordstern.chaospott.de:/home/luftschleuse/foodoor-keys "${dest}" )
 else
-	#echo "Repo exists, updating..."
-	( cd "${dest}" && git fetch --quiet && git merge --quiet origin/master master )
+    #echo "Repo exists, updating..."
+    ( cd "${dest}" && git fetch --quiet && git merge --quiet origin/master master )
 fi
 
-rm -f ${temp_outfile}
-	find "${dest}/keys" -name '*.pub' | sort | \
-		while read keyfile
-		do
-			ssh-keygen -l -f ${keyfile} &> /dev/null
-			if [ $? -eq 0 ]; then
-				valid=false
-				keyinfo=$(ssh-keygen -l -f ${keyfile}) # The whole key information
-				crypto=$(echo "${keyinfo}" | cut -d" " -f4) # Looks like "(RSA)" or "(ED25519)"
-				key_length=$(echo "${keyinfo}" | cut -d" " -f1) 
-
-				if [ "${crypto}" == "(RSA)" ]; then
-
-					if [ ${key_length} -lt 4096 ]; then
-						echo "Key size of key ${keyfile} not equal to 4096. Not adding it to key database." >&2
-						continue
-					else
-						valid=true
-					fi
-
-				elif [ "${crypto}" == "(ED25519)" ]; then
-					valid=true
-				fi
-
-				if [ "$valid" = true ]; then
-					echo "command=\"/usr/sbin/foodoor \$action \",no-port-forwarding,no-X11-forwarding,no-agent-forwarding $(cat ${keyfile})" >> ${temp_outfile}
-				fi
-			fi
-		done
-
-for appendix in open close door
+for action in open close
 do
-    action="$appendix"
-    if [ "$action" = "door" ]
-    then
-        action=""
-    fi
-    
-    export action
-    outfile="${dest}/authorized_keys.${appendix}"
-    cat ${temp_outfile} |envsubst > ${outfile}
-	
-    # Oben
-    if [ "$(hostname)" = "foodoor" ]; then
-      install -d -o ${appendix} -g nogroup -m 0700 /var/lib/foodoor/${appendix}/.ssh
-      install -b -S .last -o ${appendix} -g nogroup -m 0600 ${outfile} /var/lib/foodoor/${appendix}/.ssh/authorized_keys
-    fi
-
-    # Unten
-    if [ "$(hostname)" = "kellertuer" ]; then
-      if [ "${action}" = "open" ]; then
-        owner="unlock"
-      elif [ "${action}" = "close" ]; then
-        owner="lock"
-      fi
-      install -d -o ${owner} -g nogroup -m 0700 /var/lib/foodoor/${action}/.ssh
-      install -b -S .last -o ${owner} -g nogroup -m 0600 ${outfile} /var/lib/foodoor/${action}/.ssh/authorized_keys
-      if [ "${appendix}" = "door" ]; then
-        install -d -o ${appendix} -g nogroup -m 0700 /var/lib/foodoor/${appendix}/.ssh
-        install -b -S .last -o ${appendix} -g nogroup -m 0600 ${outfile} /var/lib/foodoor/${appendix}/.ssh/authorized_keys
-      fi
-
-    fi
-
+    outfile="${dest}/authorized_keys.${action}"
+    rm -f ${outfile}
+    find "${dest}/keys" -name '*.pub' | sort | \
+        while read keyfile
+        do
+            valid_key=$(ssh-keygen -l -f ${keyfile})
+            if [ "$?" -eq "0" ]; then
+                if [ $(echo "${valid_key}" | cut -d" " -f1) -lt "4096" ]; then
+                    echo "Size of key ${keyfile} is less than 4096. Not adding it to key database." >&2
+                    continue
+                fi
+            fi
+            printf "command=\"/usr/sbin/foodoor ${action}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding " >> ${outfile}
+            cat "${keyfile}" >> ${outfile}
+            echo >> ${outfile}
+        done
+    install -d -o ${action} -g nogroup -m 0700 /var/lib/foodoor/${action}/.ssh
+    install -b -S .last -o ${action} -g nogroup -m 0600 ${outfile} /var/lib/foodoor/${action}/.ssh/authorized_keys
 done

foodoord

@@ -0,0 +1,140 @@
+#!/usr/bin/env python2
+
+import os
+import stat
+import time
+import pifacedigitalio
+import urllib2
+import signal
+import sys
+import grp
+from ConfigParser import SafeConfigParser
+
+#Read config
+parser = SafeConfigParser()
+parser.read('/etc/foodoord.conf')
+
+url = parser.get('door_firstlevel', 'status_url')
+old_api = parser.get('door_firstlevel_old', 'status_url')
+
+
+#Definitions for output
+LED_RED=6
+LED_GREEN=7
+RELAYS_LOCK=0
+RELAYS_UNLOCK=1
+
+#Definitions for input
+DOOR_BELL=0
+REED_RELAYS=1 #not implementet yet 
+
+#Definitions for LEDcolor
+RED=1
+GREEN=2
+ORANGE=3
+
+if __name__ == "__main__":
+
+	
+
+	def doorbell(event):
+		if (STATUS):
+			pifacedigital.relays[RELAYS_UNLOCK].toggle()
+			time.sleep(2)
+			pifacedigital.relays[RELAYS_UNLOCK].toggle()
+			#print 'got doorbell'
+
+	def close_button(event):
+		global STATUS 
+		STATUS = False
+		try:
+			urllib2.urlopen(url+'&door=aerie&locked=1', timeout=2)
+			urllib2.urlopen(old_api+'&status=closed', timeout=2)
+		except:
+			pass
+
+		set_led(RED)
+
+
+	listener = pifacedigitalio.InputEventListener()
+	listener.register(0, pifacedigitalio.IODIR_RISING_EDGE, doorbell, settle_time=10)
+	listener.register(1, pifacedigitalio.IODIR_RISING_EDGE, close_button, settle_time=5)
+	listener.activate()
+
+	def signal_handler(signal, frame):
+		listener.deactivate()
+		os.remove("/var/run/foodoord.pipe")
+
+		try:
+			urllib2.urlopen(url+'&door=aerie&locked=1', timeout=2)
+			urllib2.urlopen(old_api+'&status=closed', timeout=2)
+		except:
+			pass
+				
+		set_led(RED)
+		sys.exit(0)
+
+	def set_led(color):
+		if (color==RED):
+			pifacedigital.leds[LED_RED].turn_on()
+			pifacedigital.leds[LED_GREEN].turn_off()
+
+		elif (color==GREEN):
+			pifacedigital.leds[LED_GREEN].turn_on()
+			pifacedigital.leds[LED_RED].turn_off()
+
+		elif (color==ORANGE):
+			pifacedigital.leds[LED_RED].turn_on()
+			pifacedigital.leds[LED_GREEN].turn_on()
+
+	pifacedigital = pifacedigitalio.PiFaceDigital()
+	signal.signal(signal.SIGTERM, signal_handler)
+
+	#Startsettings 
+	STATUS = False
+	pifacedigital.leds[LED_RED].turn_on()
+
+	#Setting up FiFo to get sshd-output
+	try:
+		os.mkfifo("/var/run/foodoord.pipe")
+		os.chown("/var/run/foodoord.pipe", -1, grp.getgrnam('foodoor')[2])
+		os.chmod("/var/run/foodoord.pipe", stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP)
+	except OSError:
+		pass
+
+	with open("/var/run/foodoord.pipe", "r") as ssh_input:
+		while 1:
+			#Read sshd-output from pipe 
+			Pipe = ssh_input.readline()[:-1]
+		
+			if (Pipe == "close" and STATUS):
+				pifacedigital.relays[RELAYS_LOCK].toggle()
+				time.sleep(1)
+				pifacedigital.relays[RELAYS_LOCK].toggle()
+				STATUS = False
+
+				try:
+					urllib2.urlopen(url+'&door=aerie&locked=1', timeout=2)
+					urllib2.urlopen(old_api+'&status=closed', timeout=2)
+				except:
+					pass
+				
+				set_led(RED)
+
+			elif (Pipe == "open"):
+				pifacedigital.relays[RELAYS_UNLOCK].toggle()
+				time.sleep(2)
+				pifacedigital.relays[RELAYS_UNLOCK].toggle()
+
+				if (STATUS==False):
+					
+					try:
+						urllib2.urlopen(url+'&door=aerie&locked=0', timeout=2)
+						urllib2.urlopen(old_api+'&status=open', timeout=2)
+					except:
+						pass
+
+				STATUS = True
+				
+				set_led(GREEN)
+			time.sleep(0.1)

foodoord.conf

@@ -1,4 +1,5 @@
-[doorstatus]
+[door_firstlevel_old]
+status_url =
+
+[door_firstlevel]
 status_url = 
-key =
-secret =

foodoord_oben

@@ -1,143 +0,0 @@
-#!/usr/bin/env python3
-# vim: ts=2 sw=2 et
-
-import os
-import stat
-import time
-import pifacedigitalio
-import signal
-import sys
-import grp
-from configparser import ConfigParser
-
-#Read config
-parser = ConfigParser()
-parser.read('/etc/foodoord.conf')
-
-doorapi = parser.get('doorstatus', 'status_url')
-consumerkey = parser.get('doorstatus', 'key')
-consumersecret = parser.get('doorstatus', 'secret')
-
-
-#Definitions for output
-LED_RED=6
-LED_GREEN=7
-RELAYS_LOCK=0
-RELAYS_UNLOCK=1
-
-#Definitions for input
-DOOR_BELL=0
-REED_RELAYS=1 #not implementet yet 
-
-#Definitions for LEDcolor
-RED=1
-GREEN=2
-ORANGE=3
-
-
-def update_api(locked):
-    try:
-        os.system("/usr/bin/curl -XPOST --header 'Content-Type: application/json' --data '{ \"consumer_key\": \"" + consumerkey  + "\", \"consumer_secret\": \"" + consumersecret + "\", \"aerie\": " + str(locked).lower() + " }' '" + doorapi  + "' ")
-    except:
-        pass
-
-
-if __name__ == "__main__":
-
-  def doorbell(event):
-    if (STATUS):
-      pifacedigital.relays[RELAYS_UNLOCK].toggle()
-      time.sleep(2)
-      pifacedigital.relays[RELAYS_UNLOCK].toggle()
-      #print 'got doorbell'
-
-  def close_button(event):
-    global STATUS
-    STATUS = False
-    try:
-      update_api(True)
-    except:
-      pass
-
-    set_led(RED)
-
-
-  listener = pifacedigitalio.InputEventListener()
-  listener.register(0, pifacedigitalio.IODIR_RISING_EDGE, doorbell, settle_time=10)
-  listener.register(1, pifacedigitalio.IODIR_RISING_EDGE, close_button, settle_time=5)
-  listener.activate()
-
-  def signal_handler(signal, frame):
-    listener.deactivate()
-    os.remove("/var/run/foodoord.pipe")
-
-    try:
-      update_api(True)
-    except:
-      pass
-
-    set_led(RED)
-    sys.exit(0)
-
-  def set_led(color):
-    if (color==RED):
-      pifacedigital.leds[LED_RED].turn_on()
-      pifacedigital.leds[LED_GREEN].turn_off()
-
-    elif (color==GREEN):
-      pifacedigital.leds[LED_GREEN].turn_on()
-      pifacedigital.leds[LED_RED].turn_off()
-
-    elif (color==ORANGE):
-      pifacedigital.leds[LED_RED].turn_on()
-      pifacedigital.leds[LED_GREEN].turn_on()
-
-  pifacedigital = pifacedigitalio.PiFaceDigital()
-  signal.signal(signal.SIGTERM, signal_handler)
-
-  #Startsettings
-  STATUS = False
-  pifacedigital.leds[LED_RED].turn_on()
-
-  #Setting up FiFo to get sshd-output
-  try:
-    os.mkfifo("/var/run/foodoord.pipe")
-    os.chown("/var/run/foodoord.pipe", -1, grp.getgrnam('foodoor')[2])
-    os.chmod("/var/run/foodoord.pipe", stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP)
-  except OSError:
-    pass
-
-  with open("/var/run/foodoord.pipe", "r") as ssh_input:
-    while 1:
-      #Read sshd-output from pipe
-      Pipe = ssh_input.readline()[:-1]
-
-      if (Pipe == "close" and STATUS):
-        pifacedigital.relays[RELAYS_LOCK].toggle()
-        time.sleep(1)
-        pifacedigital.relays[RELAYS_LOCK].toggle()
-        STATUS = False
-
-        try:
-          update_api(True)
-        except:
-          pass
-
-        set_led(RED)
-
-      elif (Pipe == "open"):
-        pifacedigital.relays[RELAYS_UNLOCK].toggle()
-        time.sleep(2)
-        pifacedigital.relays[RELAYS_UNLOCK].toggle()
-
-        if (STATUS==False):
-
-          try:
-            update_api(False)
-          except:
-            pass
-
-        STATUS = True
-
-        set_led(GREEN)
-      time.sleep(0.1)

foodoord_unten

@@ -1,97 +0,0 @@
-#! /usr/bin/python3
-# vim: ts=2 sw=2 et
-
-import os
-import stat
-import time
-import signal
-import sys
-import RPi.GPIO as gpio
-import grp
-from configparser import ConfigParser
-
-#Read config
-parser = ConfigParser()
-parser.read('/etc/foodoord.conf')
-
-doorapi = parser.get('doorstatus', 'status_url')
-consumerkey = parser.get('doorstatus', 'key')
-consumersecret = parser.get('doorstatus', 'secret')
-
-#Definitions for output
-LED_RED=6
-LED_GREEN=7
-RELAYS_LOCK=0
-RELAYS_UNLOCK=1
-PIN_OPEN=24
-PIN_CLOSE=27
-#Definitions for input
-DOOR_BELL=0
-REED_RELAYS=1 #not implementet yet
-
-#Definitions for LEDcolor
-RED=1
-GREEN=2
-ORANGE=3
-
-
-
-def write_state(state):
-  try:
-    handle = open("/tmp/door_state", "w")
-    handle.write(state)
-    handle.close()
-  except:
-    pass
-
-
-def update_api(locked):
-  try:
-    os.system("/usr/bin/curl -XPOST --header 'Content-Type: application/json' --data '{ \"consumer_key\": \"" + consumerkey  + "\", \"consumer_secret\": \"" + consumersecret + "\", \"cellar\": " + str(locked).lower() + " }' '" + doorapi  + "' ")
-  except:
-    pass
-
-if __name__ == "__main__":
-    
-  #Startsettings
-  STATUS=False
-  gpio.setmode(gpio.BCM)
-  gpio.setup(PIN_OPEN, gpio.OUT)
-  gpio.setup(PIN_CLOSE, gpio.OUT)
-  #Setting up FiFo to get sshd-output
-  try:
-    os.mkfifo("/var/run/foodoord.pipe")
-    os.chown("/var/run/foodoord.pipe", -1, grp.getgrnam('foodoor')[2])
-    os.chmod("/var/run/foodoord.pipe", stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP)
-  except OSError:
-    pass
-
-  with open("/var/run/foodoord.pipe", "r") as ssh_input:
-    while 1:
-      #Read sshd-output from pipe
-      Pipe = ssh_input.readline()[:-1]
-
-      if (Pipe == "close"):
-        gpio.output(PIN_CLOSE,1)
-        time.sleep(1)
-        gpio.output(PIN_CLOSE,0)
-
-        write_state("closed")
-        update_api(True)
-
-
-      elif (Pipe == "open"):
-
-        #Locking
-        gpio.output(PIN_OPEN,1)
-        time.sleep(1)
-        gpio.output(PIN_OPEN,0)
-
-        #Save State
-        write_state("open")
-
-        #Status Update
-        update_api(False)
-                
-      time.sleep(0.2)
-