Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci-splash: Fixes

Browse source
This commit is contained in:
Steven Barth 2008-04-26 21:29:14 +00:00
parent 035a193353
commit f801df7d4d
19 changed files with 199 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/package/ffluci/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffluci
PKG_REV:=HEAD
PKG_VERSION:=0.2+svn$(PKG_REV)
PKG_VERSION:=0.3+svn$(PKG_REV)
PKG_RELEASE:=1
PKG_BRANCH:=trunk
@ -50,7 +50,7 @@ define Package/ffluci/install
$(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
$(CP) $(PKG_BUILD_DIR)/core/contrib/hotplug.d-20-aliases $(1)/etc/hotplug.d/iface/20-aliases -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
@ -62,6 +62,7 @@ define Package/ffluci/install
$(CP) $(PKG_BUILD_DIR)/module/admin-core/contrib/uci/luci_fw $(1)/etc/config/luci_fw
$(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/init.d/luci_fw $(1)/etc/init.d/luci_fw
$(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/ffluci-flash $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/luci-splash $(1)/www/cgi-bin
$(CP) $(PKG_BUILD_DIR)/module/public-core/dist/* $(1)/usr/lib/lua/ffluci/ -R
$(CP) $(PKG_BUILD_DIR)/module/public-core/contrib/media $(1)/www/ffluci/ -R

12
contrib/package/luci-splash/Makefile
View file

@ -21,15 +21,17 @@ define Build/Compile
endef
define Package/luci-splash/install
$(INSTALL_DIR) $(1)/usr/lib/luci_splash/htdocs
$(INSTALL_DIR) $(1)/usr/lib/luci-splash/htdocs
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/crontabs
$(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/* $(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
$(INSTALL_BIN) ./src/luci_splash.init $(1)/etc/init.d/luci_splash
$(CP) -a ./src/luci_splash.init $(1)/etc/init.d/luci_splash
$(CP) -a ./src/luci_splash.cron $(1)/etc/crontabs/luci_splash
$(CP) -a ./src/luci_splash.uci $(1)/etc/config/luci_splash
$(CP) -a ./src/luci_splash_httpd.conf $(1)/etc/

31
contrib/package/luci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi Normal file
View file

@ -0,0 +1,31 @@
#!/usr/bin/haserl --shell=luac
dofile("/usr/lib/luci-splash/splash.lua")
local srv
local ip = ffluci.http.remote_addr()
for k, v in pairs(uci:show("network").network) do
if v[".type"] == "interface" then
local p = ffluci.sys.net.mask4prefix(v.netmask)
if ffluci.sys.net.belongs(ip, v.ipaddr, p) then
srv = v.ipaddr
end
end
end
if not srv then
ffluci.http.textheader()
return print("Unable to detect network settings!")
end
local action = "splash"
local mac = ip4mac(ip)
if not mac then
action = "unknown"
end
if iswhitelisted(mac) or haslease(mac) then
action = "allowed"
end
ffluci.http.redirect("http://" .. srv .. "/cgi-bin/luci-splash/" .. action)

0
contrib/package/luci-splash/src/luci_splash/htdocs/index.html → contrib/package/luci-splash/src/luci-splash/htdocs/index.html
View file

93
contrib/package/luci-splash/src/luci-splash/splash.lua Normal file
View file

@ -0,0 +1,93 @@
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")
-- Init state session
uci = ffluci.model.uci.Session("/var/state")
-- Add a lease to state and invoke add_rule
function add_lease(mac)
local key = uci:add("luci_splash", "lease")
uci:set("luci_splash", key, "mac", mac)
uci:set("luci_splash", key, "start", os.time())
add_rule(mac)
end
-- Remove a lease from state and invoke remove_rule
function remove_lease(mac)
mac = mac:lower()
for k, v in pairs(uci:show("luci_splash").luci_splash) do
if v.mac:lower() == mac then
remove_rule(mac)
uci:del("luci_splash", k)
end
end
end
-- Add an iptables rule
function add_rule(mac)
return os.execute("iptables -t nat -I luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN")
end
-- Remove an iptables rule
function remove_rule(mac)
return os.execute("iptables -t nat -D luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN")
end
-- Get the MAC-Address of current user
function ip4mac(ip)
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
-- Check whether a MAC-Address is listed in the lease state list
function haslease(mac)
mac = mac:lower()
for k, v in pairs(uci:show("luci_splash").luci_splash) do
if v[".type"] == "lease" and v.mac and v.mac:lower() == mac then
return true
end
end
return false
end
-- Check whether a MAC-Address is whitelisted
function iswhitelisted(mac)
mac = mac:lower()
for k, v in pairs(uci:show("luci_splash").luci_splash) do
if v[".type"] == "whitelist" and v.mac and v.mac:lower() == mac then
return true
end
end
return false
end
-- Returns a list of MAC-Addresses for which a rule is existing
function listrules()
local cmd = "iptables -t nat -L luci_splash_leases | grep RETURN |"
cmd = cmd .. "egrep -io [0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+"
return ffluci.util.split(ffluci.sys.exec(cmd))
end

39
contrib/package/luci-splash/src/luci-splash/sync.lua Normal file
View file

@ -0,0 +1,39 @@
#!/usr/bin/haserl --shell=luac --accept-none
dofile("/usr/lib/luci-splash/splash.lua")
local written = {}
local time = os.time()
-- Current leases in state files
local leases = uci:show("luci_splash").luci_splash
-- Convert leasetime to seconds
local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime")) * 3600
-- Clean state file
uci:revert("luci_splash")
-- For all leases
for k, v in pairs(uci:show("luci_splash")) do
if v[".type"] == "lease" then
if os.difftime(time, tonumber(v.start)) > leasetime then
-- Remove expired
remove_rule(v.mac)
else
-- Rewrite state
local n = uci:add("luci_splash", "lease")
uci:set("luci_splash", n, "mac", v.mac)
uci:set("luci_splash", n, "start", v.start)
written[v.mac] = 1
end
end
end
-- Delete rules without state
for i, r in ipairs(listrules()) do
if not written[r] then
remove_rule(r)
end
end

1
contrib/package/luci-splash/src/luci_splash.cron Normal file
View file

@ -0,0 +1 @@
*/15 * * * * /usr/lib/luci-splash/sync.lua

17
contrib/package/luci-splash/src/luci_splash.init
View file

@ -19,14 +19,15 @@ iface_add() {
eval "$(ipcalc.sh $ipaddr $netmask)"
iptables -t nat -A luci_splash -i "$iface" -s "$IP/$PREFIX" -j luci_splash_portal
iptables -t nat -A luci_splash -i "$iface" -s "$IP/$PREFIX" -j luci_splash_portal
iptables -t nat -A luci_splash_portal -i "$iface" -s "$IP/$PREFIX" -d "$ipaddr" -p tcp --dport 80 -j RETURN
}
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
[ -n "$mac" ] && iptables -t nat -A luci_splash_portal -m mac --mac-source "$mac" -j DROP
}
whitelist_add() {
@ -57,13 +58,13 @@ start() {
### 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
iptables -t nat -A luci_splash_leases -j DROP
### 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
/usr/lib/luci-splash/sync.lua
### Hook in the chain
iptables -t nat -A prerouting_rule -j luci_splash
@ -74,13 +75,13 @@ stop() {
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
iptables -t nat -F luci_splash_portal
iptables -t nat -F luci_splash
### Delete subchains
iptables -t nat -X luci_splash
iptables -t nat -X luci_splash_portal
iptables -t nat -X luci_splash_leases
iptables -t nat -X luci_splash_portal
iptables -t nat -X luci_splash
}

10
contrib/package/luci-splash/src/luci_splash.uci
View file

@ -1,8 +1,2 @@
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
config core general
option leasetime 1

49
contrib/package/luci-splash/src/luci_splash/htdocs/cgi-bin/index.cgi
View file

@ -1,49 +0,0 @@
#!/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()

74
contrib/package/luci-splash/src/luci_splash/splash.lua
View file

@ -1,74 +0,0 @@
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

3
contrib/package/luci-splash/src/luci_splash/sync.lua
View file

@ -1,3 +0,0 @@
#!/usr/bin/haserl --shell=luac --accept-none
dofile("splash.lua")

2
contrib/package/luci-splash/src/luci_splash_httpd.conf
View file

@ -1 +1 @@
E404:/index.html
E404:index.html

1
core/contrib/uci/luci
View file

@ -24,6 +24,7 @@ config event uci_oncommit
option httpd "/etc/init.d/httpd restart"
option fstab "/etc/init.d/fstab restart"
option qos "/etc/init.d/qos restart"
option luci_splash "/etc/init.d/luci_splash restart"
config internal languages
option de "Deutsch"

2
core/src/ffluci/init.lua
View file

@ -25,7 +25,7 @@ limitations under the License.
]]--
module("ffluci", package.seeall)
__version__ = "0.2"
__version__ = "0.3"
__appname__ = "FFLuCI"
dispatch = require("ffluci.dispatcher").httpdispatch

4
module/admin-core/contrib/luci-splash Normal file
View file

@ -0,0 +1,4 @@
#!/bin/sh
echo "Status: 302 Found"
echo "Location: ffluci/public/splash$PATH_INFO"
echo

3
module/admin-core/src/model/cbi/admin_network/splash.lua → module/admin-core/src/model/cbi/admin_services/splash.lua
View file

@ -3,6 +3,9 @@ require("ffluci.model.uci")
m = Map("luci_splash", "Client-Splash", [[Client-Splash ist das Freifunk Hotspot-Authentifizierungs-System.]])
s = m:section(NamedSection, "general", "core", "Allgemein")
s:option(Value, "leasetime", "Freigabezeit", "h")
s = m:section(TypedSection, "iface", "Schnittstellen")
s.addremove = true
s.anonymous = true

8
module/admin-core/src/model/menu/00admin.lua
View file

@ -18,6 +18,9 @@ end
act("httpd", "HTTP-Server")
act("dropbear", "SSH-Server")
act("dnsmasq", "Dnsmasq")
if isfile("/etc/config/luci_splash") then
act("splash", "Client-Splash")
end
add("admin", "network", "Netzwerk", 50)
act("vlan", "Switch")
@ -27,11 +30,6 @@ act("ptp", "PPPoE / PPTP")
act("routes", "Statische Routen")
act("portfw", "Portweiterleitung")
act("firewall", "Firewall")
if isfile("/etc/config/luci_splash") then
act("splash", "Client-Splash")
end
if isfile("/etc/config/qos") then
act("qos", "Quality of Service")
end

2
module/admin-core/src/view/admin_system/reboot.htm
View file

@ -6,6 +6,6 @@
<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:reboot_do Neustart durchführen%></a></p>
<% else %>
<p><%:reboot_running Bitte warten: Neustart wird durchgeführt...%></p>
<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 30000)</script>
<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 45000)</script>
<% end %>
<%+footer%>