From 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 3 Dec 2014 15:17:05 +0100 Subject: Rework LuCI build system * Rename subdirectories to their repective OpenWrt package names * Make each LuCI module its own standalone package * Deploy a shared luci.mk which is used by each module Makefile Signed-off-by: Jo-Philipp Wich --- .../luasrc/view/admin_status/splash.htm | 294 +++++++++++++++++++++ .../luci-app-splash/luasrc/view/splash/blocked.htm | 25 ++ .../luci-app-splash/luasrc/view/splash/splash.htm | 139 ++++++++++ .../luasrc/view/splash_splash/index.htm | 16 ++ .../luasrc/view/splash_splash/splash.htm | 25 ++ 5 files changed, 499 insertions(+) create mode 100644 applications/luci-app-splash/luasrc/view/admin_status/splash.htm create mode 100644 applications/luci-app-splash/luasrc/view/splash/blocked.htm create mode 100644 applications/luci-app-splash/luasrc/view/splash/splash.htm create mode 100644 applications/luci-app-splash/luasrc/view/splash_splash/index.htm create mode 100644 applications/luci-app-splash/luasrc/view/splash_splash/splash.htm (limited to 'applications/luci-app-splash/luasrc/view') diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm new file mode 100644 index 0000000000..61b32bab9e --- /dev/null +++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm @@ -0,0 +1,294 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2009 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +-%> + +<%- + +local utl = require "luci.util" +local ipt = require "luci.sys.iptparser".IptParser() +local uci = require "luci.model.uci".cursor_state() +local wat = require "luci.tools.webadmin" +local fs = require "nixio.fs" + +local clients = { } +local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime") or 1) * 60 * 60 +local leasefile = "/tmp/dhcp.leases" + +uci:foreach("dhcp", "dnsmasq", + function(s) + if s.leasefile then leasefile = s.leasefile end + end) + + +uci:foreach("luci_splash_leases", "lease", + function(s) + if s.start and s.mac then + clients[s.mac:lower()] = { + start = tonumber(s.start), + limit = ( tonumber(s.start) + leasetime ), + mac = s.mac:upper(), + ipaddr = s.ipaddr, + policy = "normal", + packets = 0, + bytes = 0, + } + end + end) + +for _, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do + if r.options and #r.options >= 2 and r.options[1] == "MAC" then + if not clients[r.options[2]:lower()] then + clients[r.options[2]:lower()] = { + start = 0, + limit = 0, + mac = r.options[2]:upper(), + policy = ( r.target == "RETURN" ) and "whitelist" or "blacklist", + packets = 0, + bytes = 0 + } + end + end +end + +for mac, client in pairs(clients) do + client.bytes_in = 0 + client.bytes_out = 0 + client.packets_in = 0 + client.packets_out = 0 + + if client.ipaddr then + local rin = ipt:find({table="mangle", chain="luci_splash_mark_in", destination=client.ipaddr}) + local rout = ipt:find({table="mangle", chain="luci_splash_mark_out", options={"MAC", client.mac:upper()}}) + + if rin and #rin > 0 then + client.bytes_in = rin[1].bytes + client.packets_in = rin[1].packets + end + + if rout and #rout > 0 then + client.bytes_out = rout[1].bytes + client.packets_out = rout[1].packets + end + end +end + +uci:foreach("luci_splash", "whitelist", + function(s) + if s.mac and clients[s.mac:lower()] then + clients[s.mac:lower()].policy="whitelist" + end + end) + +uci:foreach("luci_splash", "blacklist", + function(s) + if s.mac and clients[s.mac:lower()] then + clients[s.mac:lower()].policy=(s.kicked and "kicked" or "blacklist") + end + end) + +if fs.access(leasefile) then + for l in io.lines(leasefile) do + local time, mac, ip, name = l:match("^(%d+) (%S+) (%S+) (%S+)") + if time and mac and ip then + local c = clients[mac:lower()] + if c then + c.ip = ip + c.hostname = ( name ~= "*" ) and name or nil + end + end + end +end + +for i, a in ipairs(luci.sys.net.arptable()) do + local c = clients[a["HW address"]:lower()] + if c and not c.ip then + c.ip = a["IP address"] + end +end + +local function showmac(mac) + if not is_admin then + mac = mac:gsub("(%S%S:%S%S):%S%S:%S%S:(%S%S:%S%S)", "%1:XX:XX:%2") + end + return mac +end + +if luci.http.formvalue("status") == "1" then + local rv = {} + for _, c in utl.spairs(clients, + function(a,b) if clients[a].policy == clients[b].policy then + return (clients[a].start > clients[b].start) + else + return (clients[a].policy > clients[b].policy) + end + end) + do + if c.ip then + rv[#rv+1] = { + hostname = c.hostname or "?", + ip = c.ip or "?", + mac = showmac(c.mac) or "?", + timeleft = (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "expired", + trafficin = wat.byte_format(c.bytes_in) or "?", + trafficout = wat.byte_format(c.bytes_out) or "?", + policy = c.policy or "?" + } + end + end + luci.http.prepare_content("application/json") + luci.http.write_json(rv) + return +end +-%> + + + +<%+header%> + + + + + +
+

<%:Client-Splash%>

+
+ <%:Active Clients%> +
+ <% if is_admin then %>
<% end %> + + + + + + + + + + + + + + <%- + local count = 0 + for _, c in utl.spairs(clients, + function(a,b) + if clients[a].policy == clients[b].policy then + return (clients[a].start > clients[b].start) + else + return (clients[a].policy > clients[b].policy) + end + end) + do + if c.ip then + count = count + 1 + -%> + + + + + + + + + <%- + end + end + if count == 0 then + -%> + + + + <%- end -%> + +
<%:Hostname%><%:IP Address%><%:MAC Address%><%:Time remaining%><%:Traffic in/out%><%:Policy%>
<%=c.hostname or "" .. translate("unknown") .. ""%><%=c.ip or "" .. translate("unknown") .. ""%><%=showmac(c.mac)%><%= + (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or + (c.policy ~= "normal") and "-" or "" .. translate("expired") .. "" + %><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%> + <% if is_admin then %> + + + <% else %> + <%=c.policy%> + <% end %> +
+
<%:No clients connected%>
+
+ <% if is_admin then %>
<% end %> +
+
+
+ +<%+footer%> diff --git a/applications/luci-app-splash/luasrc/view/splash/blocked.htm b/applications/luci-app-splash/luasrc/view/splash/blocked.htm new file mode 100644 index 0000000000..de61ecf011 --- /dev/null +++ b/applications/luci-app-splash/luasrc/view/splash/blocked.htm @@ -0,0 +1,25 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2011 Manuel Munz + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 +-%> +<% +local contacturl = luci.dispatcher.build_url("freifunk", "contact") +%> + +<%+header%> + +

<%:Blocked%>

+ +

<%:Your access to this network has been blocked, most likely because you did something that our rules explicitly forbid.%>

+

<%:To ask for the reason why you have been blocked or ask for access again you can try to contact the owner of this access point:%> <%:Contact%>

+ +<%+footer%> + + + diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm new file mode 100644 index 0000000000..2ebee273b4 --- /dev/null +++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm @@ -0,0 +1,139 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich +Copyright 2011 Manuel Munz + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 +-%> +<% +local fs = require "luci.fs" +local has_custom_splash = fs.access("/usr/lib/luci-splash/splashtext.html") +local has_custom_splashinclude = fs.access("/usr/lib/luci-splash/splashtextinclude.html") + +function expand (e, R) + return (string.gsub(e, "###([A-Z_]+)###", R)) +end + +local community, homepage, leasetime, limit_up, limit_down + +local contacturl = luci.dispatcher.build_url("freifunk", "contact") + +local c = luci.model.uci.cursor():get_all("freifunk", "community") +if c and c.name then + name = luci.model.uci.cursor():get('profile_' .. c.name, 'profile', 'name') + if name then + community = name + else + community = c.name + end +else + community = "Freifunk" +end + +if c and c.homepage then + homepage = c.homepage +else + homepage = "http://freifunk.net" +end + +local s = luci.model.uci.cursor():get_all("luci_splash", "general") +if s then + leasetime = s.leasetime or "" + limit_up = s.limit_up or nil + limit_down = s.limit_down or nil +end + +local limit_text = "" +if limit_up and limit_down then + limit_text = "

" .. translate("Your bandwidth is limited to") .. " " .. limit_down .. "/" .. limit_up .. + " " .. translate("KB/s (Download/Upload). You may be able to remove this limit by actively contributing " .. + "to this project.") .. "

" +end + +local contact = translate('Get in %s with the operator of this access point.') +contact = contact % ('' .. translatef('Contact') .. '') + +local accepttext = translate('By accepting these rules you can use this network for %s hour(s). After this time you need to accept these rules again.') +accepttext = accepttext % leasetime + + +if has_custom_splash then + local R = { + COMMUNITY = community, + COMMUNITY_URL = homepage, + LEASETIME = leasetime, + ACCEPT = tostring(translate("Accept")), + LIMIT = limit_text, + CONTACTURL = contacturl + } + local splashtext = expand(fs.readfile("/usr/lib/luci-splash/splashtext.html"), R) + %> + <%=splashtext%> + +<% else %> + +

<%:Welcome%>

+ +

<%:You are now connected to the free wireless mesh network%> <%=community%>. + <%:Please note that we are not an internet service provider but an experimental community network.%>

+

<%:Access to the internet might be possible nevertheless, because some activists of this project share their + private internet connections. These few connections are shared between all users. That means available bandwidth + is limited and because of this we ask you not to do any of the following:%>

+
    +
  • <%:use filesharing applications on this network%>
    • +
  • <%:waste bandwidth with unneccesary downloads or streams%>
    • +
  • <%:perform any kind of illegal activities%>
    • +
+
+ + <% if limit_up and limit_down then %> + <%=limit_text%> + <% end %> + +

<%:If you use this network on a regular basis we ask for your support:%>

+ + + <% + if has_custom_splashinclude then + local splashtextinclude = fs.readfile("/usr/lib/luci-splash/splashtextinclude.html") + %> + <%=splashtextinclude%> + <% end %> + +

<%:Usage Agreement%>

+

+ <%:The open and free wireless network of volunteers ("Operators") provides the necessary equipment and Internet connections ("Infrastructure") at their own expense.%> + <%:These Terms of Use govern the use of the network by its participants' computer, PDA, or similar device ("Devices") within the network.%> + <%:Access to the network is not guaranteed. It can be interrupted at any time without notice for any reason, for certain devices, and/or may be blocked for certain users.%> +

+ +

<%:Legally Prohibited Activities%>

+

<%:The participant agrees to not perform any action and refrain from acts which may violate the law or infringe upon the rights of third parties.%>

+ +

<%:Legally Prohibited content%>

+

<%:The participant agrees to not transfer content over the network which violates the law.%>

+ +

<%:Fair Use Policy%>

+

<%:The participant agrees to not use the network in any way which will harm the infrastructure, the network itself, its operators or other participants.%>

+ +

<%:Safety%>

+

<%:The network, like the Internet, is unencrypted and open. Each participant is responsible for the safety of their own connections and devices.%>

+ +

Disclaimer

+

<%:The operator claims no liability for loss of data, unauthorized access/damage to devices, or financial losses that participants may suffer from the use of the network.%>

+ +

<%=accepttext%>

+<% end %> + + + diff --git a/applications/luci-app-splash/luasrc/view/splash_splash/index.htm b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm new file mode 100644 index 0000000000..ab754913d3 --- /dev/null +++ b/applications/luci-app-splash/luasrc/view/splash_splash/index.htm @@ -0,0 +1,16 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +-%> +<%+header%> +<%+footer%> \ No newline at end of file diff --git a/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm new file mode 100644 index 0000000000..8554913cd8 --- /dev/null +++ b/applications/luci-app-splash/luasrc/view/splash_splash/splash.htm @@ -0,0 +1,25 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2008 Steven Barth +Copyright 2008 Jo-Philipp Wich + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +-%> +<%+header%> +<%+splash/splash%> + +
+

+ + +

+
+ +<%+footer%> -- cgit v1.2.3