diff options
author | Steven Barth <steven@midlink.org> | 2008-04-26 17:14:22 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2008-04-26 17:14:22 +0000 |
commit | 22b1721823d705c7318d1eebafdfcdaead3025da (patch) | |
tree | 1b972c0c6cd63d09975f42cca36e7ad1abd11033 /contrib | |
parent | 224c2566416e84b7c359a31ead46ece00c120b9c (diff) |
* Added experimental version of DHCP-Splash for Kamikaze
* Added MAC-Address matching to luci_fw
* Added interface alias hack for Kamikaze
* ffluci.sys: Added several networking helper functions
* ffluci.http: Added function remote_addr
* Updated Haserl to 0.9.24
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/package-source/haserl-lua-0.9.23.tar.bz2 | bin | 100110 -> 0 bytes | |||
-rw-r--r-- | contrib/package-source/haserl-lua-0.9.24.tar.bz2 | bin | 0 -> 106328 bytes | |||
-rw-r--r-- | contrib/package/ffluci/Makefile | 2 | ||||
-rw-r--r-- | contrib/package/haserl-lua/Makefile | 4 | ||||
-rw-r--r-- | contrib/package/luci-splash/Makefile | 36 | ||||
-rw-r--r-- | contrib/package/luci-splash/ipkg/conffiles | 1 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash.init | 86 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash.uci | 8 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash/htdocs/cgi-bin/index.cgi | 49 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash/htdocs/index.html | 10 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash/splash.lua | 74 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash/sync.lua | 3 | ||||
-rw-r--r-- | contrib/package/luci-splash/src/luci_splash_httpd.conf | 1 |
13 files changed, 272 insertions, 2 deletions
diff --git a/contrib/package-source/haserl-lua-0.9.23.tar.bz2 b/contrib/package-source/haserl-lua-0.9.23.tar.bz2 Binary files differdeleted file mode 100644 index d48e653f9..000000000 --- a/contrib/package-source/haserl-lua-0.9.23.tar.bz2 +++ /dev/null diff --git a/contrib/package-source/haserl-lua-0.9.24.tar.bz2 b/contrib/package-source/haserl-lua-0.9.24.tar.bz2 Binary files differnew file mode 100644 index 000000000..95fdc4c1c --- /dev/null +++ b/contrib/package-source/haserl-lua-0.9.24.tar.bz2 diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile index 837df7838..32afd4a7f 100644 --- a/contrib/package/ffluci/Makefile +++ b/contrib/package/ffluci/Makefile @@ -43,9 +43,11 @@ define Package/ffluci/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(CP) $(PKG_BUILD_DIR)/core/dist/* $(1)/usr/lib/lua/ -R $(CP) $(PKG_BUILD_DIR)/core/contrib/uci/* $(1)/etc/config/ + $(CP) $(PKG_BUILD_DIR)/core/contrib/hotplug.d-20-aliases $(1)/etc/hotplug.d/iface -R $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/ffluci $(1)/www/cgi-bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/ffluci-upload $(1)/www/cgi-bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/index.cgi $(1)/www/cgi-bin diff --git a/contrib/package/haserl-lua/Makefile b/contrib/package/haserl-lua/Makefile index 6d656db59..ed4279bfd 100644 --- a/contrib/package/haserl-lua/Makefile +++ b/contrib/package/haserl-lua/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haserl-lua -PKG_VERSION:=0.9.23 +PKG_VERSION:=0.9.24 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://dev.leipzig.freifunk.net/svn/ff-luci/trunk/contrib/package-source/ \ http://firmware.freifunk-halle.net/ffluci/package-source/ -PKG_MD5SUM:=f3a0f329904791c5662d93638f92bdfd +PKG_MD5SUM:=b004005594b84e35839b1d5c330f8e03 include $(INCLUDE_DIR)/package.mk diff --git a/contrib/package/luci-splash/Makefile b/contrib/package/luci-splash/Makefile new file mode 100644 index 000000000..e1e194cbd --- /dev/null +++ b/contrib/package/luci-splash/Makefile @@ -0,0 +1,36 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-splash +PKG_VERSION:=0.1 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(INCLUDE_DIR)/package.mk + +define Package/luci-splash + SECTION:=admin + CATEGORY:=Administration + SUBMENU:=ffluci + DEPENDS:=+ffluci + TITLE:=FFLuCI DHCP-Splash +endef + +define Package/luci-splash/install + $(INSTALL_DIR) $(1)/usr/lib/luci_splash/htdocs + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_DIR) $(1)/etc/init.d + + $(CP) -a ./src/luci_splash/* $(1)/usr/lib/luci_splash/ -R + $(INSTALL_BIN) ./src/luci_splash/sync.lua $(1)/usr/lib/luci_splash + $(INSTALL_BIN) ./src/luci_splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci_splash/htdocs/cgi-bin + + $(CP) -a ./src/luci_splash.init $(1)/etc/init.d/luci_splash + $(CP) -a ./src/luci_splash.uci $(1)/etc/config/luci_splash + $(CP) -a ./src/luci_splash_httpd.conf $(1)/etc/ + + $(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles +endef + +$(eval $(call BuildPackage,luci-splash)) diff --git a/contrib/package/luci-splash/ipkg/conffiles b/contrib/package/luci-splash/ipkg/conffiles new file mode 100644 index 000000000..dcbe1ad37 --- /dev/null +++ b/contrib/package/luci-splash/ipkg/conffiles @@ -0,0 +1 @@ +/etc/config/luci_splash
\ No newline at end of file diff --git a/contrib/package/luci-splash/src/luci_splash.init b/contrib/package/luci-splash/src/luci_splash.init new file mode 100644 index 000000000..049d121ea --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash.init @@ -0,0 +1,86 @@ +#!/bin/sh /etc/rc.common +START=70 + +iface_add() { + local cfg="$1" + + config_get net "$cfg" network + [ -n "$net" ] || return 0 + + config_get iface "$net" ifname + [ -n "$iface" ] || return 0 + iface="${iface%%:*}" + + config_get ipaddr "$net" ipaddr + [ -n "$ipaddr" ] || return 0 + + config_get netmask "$net" netmask + [ -n "$netmask" ] || return 0 + + eval "$(ipcalc.sh $ipaddr $netmask)" + + iptables -t nat -A luci_splash -i "$iface" -s "$IP/$PREFIX" -j luci_splash_portal +} + +blacklist_add() { + local cfg="$1" + + config_get mac "$cfg" mac + [ -n "$mac" ] && iptables -t nat -A luci_splash_portal -m mac --mac-source "$mac" -j REJECT +} + +whitelist_add() { + local cfg="$1" + + config_get mac "$cfg" mac + [ -n "$mac" ] && iptables -t nat -A luci_splash_portal -m mac --mac-source "$mac" -j RETURN +} + +start() { + ### Read chains from config + include /lib/network + scan_interfaces + config_load luci_splash + + ### Create subchains + iptables -t nat -N luci_splash + iptables -t nat -N luci_splash_portal + iptables -t nat -N luci_splash_leases + + ### Build the main rule + config_foreach iface_add iface + + ### Build the portal rule + config_foreach blacklist_add blacklist + config_foreach whitelist_add whitelist + iptables -t nat -A luci_splash_portal -j luci_splash_leases + + ### Build the leases rule + iptables -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082 + iptables -t nat -A luci_splash_leases -j REJECT + + ### Start the splash httpd + httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci_splash/htdocs + + ### Sync leases + /usr/lib/luci_splash/sync.lua + + ### Hook in the chain + iptables -t nat -A prerouting_rule -j luci_splash +} + +stop() { + ### Hook out the chain + iptables -t nat -D prerouting_rule -j luci_splash + + ### Clear subchains + iptables -t nat -F luci_splash + iptables -t nat -F luci_splash_portal + iptables -t nat -F luci_splash_leases + + ### Delete subchains + iptables -t nat -X luci_splash + iptables -t nat -X luci_splash_portal + iptables -t nat -X luci_splash_leases +} + diff --git a/contrib/package/luci-splash/src/luci_splash.uci b/contrib/package/luci-splash/src/luci_splash.uci new file mode 100644 index 000000000..cf1232b3b --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash.uci @@ -0,0 +1,8 @@ +config iface + option network wldhcp + +config whitelist + option mac 02:CA:FF:EE:BA:BE + +config blacklist + option mac 03:CA:FF:EE:BA:BE
\ No newline at end of file diff --git a/contrib/package/luci-splash/src/luci_splash/htdocs/cgi-bin/index.cgi b/contrib/package/luci-splash/src/luci_splash/htdocs/cgi-bin/index.cgi new file mode 100644 index 000000000..0117198cf --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash/htdocs/cgi-bin/index.cgi @@ -0,0 +1,49 @@ +#!/usr/bin/haserl --shell=luac +dofile("/usr/lib/luci_splash") + +require("ffluci.template") + +function dispatch() + local mac = get_usermac() + if not mac then + return action_nodata() + end + + if isblacklisted(mac) then + return action_blocked() + end + + if iswhitelisted(mac) or haslease(mac) then + return action_allowed() + end + + return action_splash(mac) +end + +function action_splash(mac) + if ffluci.http.formvalue("activate") then + add_lease(mac) + ffluci.http.textheader() + print("Got splashed!") + else + ffluci.http.textheader() + print("Get splashed!") + end +end + +function action_allowed() + ffluci.http.textheader() + print("Already allowed!") +end + +function action_blocked() + ffluci.http.textheader() + print("Blocked!") +end + +function action_nodata() + ffluci.http.textheader() + print("No data!") +end + +dispatch()
\ No newline at end of file diff --git a/contrib/package/luci-splash/src/luci_splash/htdocs/index.html b/contrib/package/luci-splash/src/luci_splash/htdocs/index.html new file mode 100644 index 000000000..58387a5fe --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash/htdocs/index.html @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="refresh" content="0; URL=/cgi-bin/index.cgi" /> +</head> +<body style="background-color: black"> +<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">FFLuCI - Freifunk Lua Configuration Interface</a> +</body> +</html>
\ No newline at end of file diff --git a/contrib/package/luci-splash/src/luci_splash/splash.lua b/contrib/package/luci-splash/src/luci_splash/splash.lua new file mode 100644 index 000000000..b659d2001 --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash/splash.lua @@ -0,0 +1,74 @@ +package.path = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path +package.cpath = "/usr/lib/lua/?.so;" .. package.cpath + +require("ffluci.http") +require("ffluci.sys") +require("ffluci.model.uci") + +ucis = ffluci.model.uci.Session("/var/state") + +function add_lease(mac) + local key = ucis:add("luci_splash", "lease") + ucis:set("luci_splash", key, "mac", mac) + add_rule(mac) +end + +function add_rule(mac) + return os.execute("iptables -t nat -I luci_splash_leases -m mac --source-mac '"..mac.."' -j RETURN") +end + +function remove_rule(mac) + return os.execute("iptables -t nat -D luci_splash_leases -m mac --source-mac '"..mac.."' -j RETURN") +end + +function get_usermac() + local ip = ffluci.http.remote_addr() + local mac = nil + + for i, l in ipairs(ffluci.sys.net.arptable()) do + if l["IP address"] == ip then + mac = l["HW address"] + end + end + + return mac +end + +function haslease(mac) + mac = mac:lower() + local list = ucis:show("luci_splash").luci_splash + + for k, v in pairs(list) do + if v[".type"] == "lease" and v.mac and v.mac:lower() == mac then + return true + end + end + + return false +end + +function isblacklisted(mac) + mac = mac:lower() + local list = ucis:show("luci_splash").luci_splash + + for k, v in pairs(list) do + if v[".type"] == "blacklist" and v.mac and v.mac:lower() == mac then + return true + end + end + + return false +end + +function iswhitelisted(mac) + mac = mac:lower() + local list = ucis:show("luci_splash").luci_splash + + for k, v in pairs(list) do + if v[".type"] == "whitelist" and v.mac and v.mac:lower() == mac then + return true + end + end + + return false +end
\ No newline at end of file diff --git a/contrib/package/luci-splash/src/luci_splash/sync.lua b/contrib/package/luci-splash/src/luci_splash/sync.lua new file mode 100644 index 000000000..fd32a1ca1 --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash/sync.lua @@ -0,0 +1,3 @@ +#!/usr/bin/haserl --shell=luac --accept-none +dofile("splash.lua") + diff --git a/contrib/package/luci-splash/src/luci_splash_httpd.conf b/contrib/package/luci-splash/src/luci_splash_httpd.conf new file mode 100644 index 000000000..f481c22ce --- /dev/null +++ b/contrib/package/luci-splash/src/luci_splash_httpd.conf @@ -0,0 +1 @@ +E404:/index.html
\ No newline at end of file |