diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-20 20:26:59 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-20 20:26:59 +0200 |
| commit | ec48d2d01f732ea31f8972d1c24919972cd2a6fd (patch) | |
| tree | fcd9cd04898e6aed4ac8e9732aac4eadc48e813f | |
| parent | f67d39e69a296fe8250ac73f80f0771ccb6dcc59 (diff) | |
| parent | 4ccb221f6d3455abb66e93aafdd5b6ea65859a70 (diff) | |
Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
4 files changed, 27 insertions, 1 deletions
diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile index a24b56285..3fbd88ad6 100644 --- a/applications/luci-app-fwknopd/Makefile +++ b/applications/luci-app-fwknopd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon -LUCI_DEPENDS:=+fwknopd +LUCI_DEPENDS:=+fwknopd +qrencode PKG_VERSION:=1.0 PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 diff --git a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua index 8a454dd58..84a1a23d8 100644 --- a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua +++ b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua @@ -6,6 +6,9 @@ m = Map("fwknopd", translate("Firewall Knock Operator")) s = m:section(TypedSection, "global", translate("Enable Uci/Luci control")) -- Set uci control on or off s.anonymous=true s:option(Flag, "uci_enabled", translate("Enable config overwrite"), translate("When unchecked, the config files in /etc/fwknopd will be used as is, ignoring any settings here.")) +qr = s:option(DummyValue, "note0", "dummy") +qr.template = "fwknopd-qr" +qr:depends("uci_enabled", "1") s = m:section(TypedSection, "access", translate("access.conf stanzas")) -- set the access.conf settings s.anonymous=true diff --git a/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm b/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm new file mode 100644 index 000000000..9e6e8185f --- /dev/null +++ b/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm @@ -0,0 +1 @@ +<% print(luci.sys.exec("sh /usr/sbin/gen-qr.sh")) %> diff --git a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh new file mode 100644 index 000000000..97493dafe --- /dev/null +++ b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +key_base64=$(uci get fwknopd.@access[0].KEY_BASE64) +key=$(uci get fwknopd.@access[0].KEY) +hmac_key_base64=$(uci get fwknopd.@access[0].HMAC_KEY_BASE64) +hmac_key=$(uci get fwknopd.@access[0].HMAC_KEY) + +if [ $key_base64 != "" ]; then +qr="KEY_BASE64:$key_base64" +fi +if [ $key != "" ]; then +qr="$qr KEY:$key" + +fi +if [ $hmac_key_base64 != "" ]; then +qr="$qr HMAC_KEY_BASE64:$hmac_key_base64" +fi +if [ $hmac_key != "" ]; then +qr="$qr HMAC_KEY:$hmac_key" +fi + +qrencode -o - "$qr" |