Commit graph

1168 commits

Author SHA1 Message Date
Jo-Philipp Wich
83d520ab07 luci-base: improve login/logout handling
Redirect to the canonical url after login and redirect to an url without
security token if the session expired. Also make sure that the login page
is served with status code 403, not 200 to give ajax calls a chance to
detect expired sessions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-26 17:31:21 +01:00
Jo-Philipp Wich
9feb1b8a78 luci-mod-admin-full: use sysupgrade -T to test images
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-24 14:26:51 +01:00
Jo-Philipp Wich
40066a6799 luci-base: optimize luci.tools.webadmin.iface_get_network()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-23 15:26:33 +01:00
Jo-Philipp Wich
6c16f97c4c luci-base: remove unused functions from luci.sys.net
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 23:55:11 +01:00
Jo-Philipp Wich
b24dfd52ac luci-mod-admin-mini: convert luci.sys.net.arptable() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:50:00 +01:00
Jo-Philipp Wich
213595ce85 luci-mod-admin-full: convert luci.sys.net.arptable() to luci.ip.neighbors()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:45:28 +01:00
Jo-Philipp Wich
577b772824 luci-base: rewrite luci.tools.webadmin and remove unused functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 18:25:49 +01:00
Jo-Philipp Wich
7dc9f86749 luci-mod-freifunk: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 16:44:01 +01:00
Jo-Philipp Wich
5b94c1cca2 luci-mod-admin-full: switch to luci.ip route functions
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:53:16 +01:00
Jo-Philipp Wich
0e90bf98df luci-base: depend on luci-lib-ip and remove ip.lua
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:08:09 +01:00
Jo-Philipp Wich
390c4bd5a7 luci-base: use serialize_json() in luci.http
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00
Jo-Philipp Wich
61a9a58efc luci-base: add luci.util.serialize_json()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-22 15:01:50 +01:00
Jo-Philipp Wich
41d2b33087 Update my email addresses in the license headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:49:44 +01:00
Jo-Philipp Wich
7a3493b1f7 Globally reduce copyright headers
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 23:38:38 +01:00
Jo-Philipp Wich
9980114624 luci-base: remove luci.init
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich
9e1383dd40 luci-mod-admin-full: directly require luci.version and fetch uname with library call
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Jo-Philipp Wich
2ebc394347 luci-base: use local sys module table in luci.dispatcher
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-16 21:40:49 +01:00
Luiz Angelo Daros de Luca
b34c9ae639 luci-proto-3g: add dialnumber option
UCI network already permit dialnumber option for 3g interfaces.
This adds dialnumber to luci protocol 3g. Also it introduces a
new translation string "Dial number", added to template and updated
on each language (all empty but pt-br).

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2015-01-16 15:37:13 -02:00
Jo-Philipp Wich
458469bb4f luci-mod-admin-full: display routers localtime again
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 17:41:26 +01:00
Jo-Philipp Wich
a35fffe3c3 luci-mod-admin-full: fix missing nixio.fs require
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:34:48 +01:00
Jo-Philipp Wich
7aa838988f luci-base: remove old fastindex support code, use cached module tables
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:32:03 +01:00
Jo-Philipp Wich
e2ec170445 luci-base: remove unconditional "bit" preloading
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:02:54 +01:00
Jo-Philipp Wich
6ff7bae36a luci-mod-admin-full: remove useless "bit" requires
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 16:02:25 +01:00
Jo-Philipp Wich
e91b603acc luci-base: drop luci.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:40:33 +01:00
Jo-Philipp Wich
6cc1ae506c luci-mod-failsafe: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:40:05 +01:00
Jo-Philipp Wich
b7f80a98d8 luci-mod-admin-full: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:37:46 +01:00
Jo-Philipp Wich
9780ee382e luci-mod-freifunk: switch to nixio.fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 15:11:57 +01:00
Jo-Philipp Wich
76eb057b2c luci-mod-base: drop luci.sys.sysinfo() and luci.sys.loadavg()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:26:36 +01:00
Jo-Philipp Wich
64d0031233 luci-mod-freifunk: eliminate uses of luci.sys.sysinfo()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 14:11:35 +01:00
Jo-Philipp Wich
a1f67784c9 luci-mod-admin-mini: remove uses of luci.sys.sysinfo()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 13:44:38 +01:00
Jo-Philipp Wich
46beca9fb1 luci-mod-admin-full: eliminate the use of luci.sys.sysinfo()
Fetch the required information via ubus instead of relying on the
to-be-removed luci.sys.sysinfo() and luci.sys.loadavg() functions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 13:35:10 +01:00
Jo-Philipp Wich
c159d28091 luci-base: switch luci.model.network to common ubus api
Replaces the ubus calls in luci.model.network with the common api
from luci.util.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 11:10:02 +01:00
Jo-Philipp Wich
199c8cbc4c luci-base: switch to ubus sessions
Remove luci.sauth session storage implementation and offload the session
management to the rpcd ubus backend. Also depend on rpcd due to this.
2015-01-15 11:09:05 +01:00
Jo-Philipp Wich
eb8560061a luci-base: add luci.util.ubus()
Add luci.util.ubus() convenience wrapper which establishes a connection on
the first call.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-15 11:03:31 +01:00
Jo-Philipp Wich
e55b23c6ac luci-mod-admin-full: fix luci-bwc compilation
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-11 16:22:20 +01:00
Christian Schoenebeck
42757cb549 Modified dependencies
Module luci-base
- libubus-lua not needed

Module luci-mod-admin
- libubus-lua needed

Collection luci
- luci-lib-nixio not needed, already in luci-base

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-01-10 22:33:43 +01:00
Jo-Philipp Wich
9a81d8ff32 luci-base: handle missing translations in template engine
Previously the template engine did not interpolate translation macros if no
translation catalogue could be loaded due to a missing i18n directory.

Change the offending code to return the original string in any error case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 21:19:54 +01:00
Jo-Philipp Wich
1380c7b07d luci-base: add depends on libubus-lua and luci-lib-nixio as well
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 19:58:06 +01:00
Jo-Philipp Wich
26aefe4f69 luci-base: depend on libuci-lua
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 19:54:05 +01:00
Jo-Philipp Wich
c97011fd97 luci-base: fix dependency on lua (#284)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 13:42:42 +01:00
Jo-Philipp Wich
3afecbd8ab luci-base: depend on Lua (#283)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-09 16:35:23 +01:00
Jo-Philipp Wich
db653649ff luci-mod-admin-full: fix build dep spec in previous commit (#281)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 22:24:25 +01:00
Jo-Philipp Wich
80c06a773d luci-mod-admin-full: add build dependency on libiwinfo
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 22:17:36 +01:00
Jo-Philipp Wich
4cb3aed0ca Remove obsolete .mk files
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 16:49:42 +01:00
Jo-Philipp Wich
fa84ca05d5 luci-base: luci.util: rewrite threadlocal code to not confuse minifier
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 16:26:20 +01:00
Jo-Philipp Wich
1bb4822dca 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 <jow@openwrt.org>
2015-01-08 16:26:20 +01:00
Karl Palsson
65d42ae75a luci.http.protocol: Allow posts to contain more than a single chunk
The ltn12.pump.step() loop in parse_message_body was incorrectly testing
for EOF, and returning after the first chunk, even if further chunks
were available.  The loop in parse_message_header made the correct
check, and test code making raw ajax json posts now succeeds for posts
>= 2048 bytes.

Signed-off-by: Karl Palsson <karlp@remake.is>
2014-11-21 18:18:51 +00:00
Matthias Schiffer
7bd68db7d7 modules/base: ltn12: source.file() should terminate when an empty chunk is read
The read method of nixio's file and socket objects both return an empty string
when they reach EOF, not nil, causing the consumer to loop endlessly as
source.file() never terminates.

As there is no other situation in which an empty chunk is read, just change it
to nil to terminate the consumer's loop.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2014-11-17 14:35:24 +01:00
Hannu Nyman
36357529a0 Update timezone info to 2014i (from 2011n)
Timezone information embedded in Luci is updated to 2014i.
Afaik, the old data was from version 2011n.

I used build/zoneinfo2lua.pl to pull data from my Ubuntu 14.10 buildhost
that contains 2014i version of the timezone data.

2014j has been released this week, but is not yet embedded in Ubuntu and
Turks&Caicos is the only affected country/zone.
2014i: http://mm.icann.org/pipermail/tz-announce/2014-October/000026.html
2014j: http://mm.icann.org/pipermail/tz-announce/2014-November/000027.html

This update should fix Openwrt bugs #11445 and #18323.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-11-14 17:06:30 +02:00
Jo-Philipp Wich
ef444d511d modules/admin-full: make wifi enabling/disabling more reliable
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2014-11-11 22:33:43 +01:00