oweals/luci.git
6 years agoluci-theme-bootstrap: add new style classes
Jo-Philipp Wich [Wed, 30 May 2018 12:46:10 +0000 (14:46 +0200)]
luci-theme-bootstrap: add new style classes

Add new style classes required for status page changes, also drop old
Internet Explorer compatibility script and vendor prefixed properties.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: add new style classes
Jo-Philipp Wich [Wed, 30 May 2018 12:42:00 +0000 (14:42 +0200)]
luci-theme-openwrt: add new style classes

Add new style classes required for status page changes, also drop old
Internet Explorer compatibility CSS.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix revert page
Ansuel Smith [Mon, 28 May 2018 12:42:10 +0000 (14:42 +0200)]
luci-mod-admin-full: fix revert page

This fix the strange redirect link, a bug with uwsgi where the controller
is empty and a bug with the revert page showing the apply content empty.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[drop unrelated revert.html template change]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1839 from EricLuehrsen/unbound_defdoc
Hannu Nyman [Tue, 29 May 2018 08:29:43 +0000 (11:29 +0300)]
Merge pull request #1839 from EricLuehrsen/unbound_defdoc

 luci-app-unbound: add root zone file cache option

6 years agoluci-app-unbound: add root zone file cache option 1839/head
Eric Luehrsen [Tue, 29 May 2018 04:14:00 +0000 (00:14 -0400)]
luci-app-unbound: add root zone file cache option

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
6 years agoluci-app-unbound: provide transparent defaults with documentation
Eric Luehrsen [Mon, 28 May 2018 20:30:50 +0000 (16:30 -0400)]
luci-app-unbound: provide transparent defaults with documentation

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
6 years agoluci-proto-3g: make it a self-contained package
Florian Eckert [Thu, 15 Mar 2018 09:21:05 +0000 (10:21 +0100)]
luci-proto-3g: make it a self-contained package

The follow error will appear after clicking "Switch protcol" to 3g when
luci-proto-3g was not installed.  Fix this by moving the relevant parts
from luci-proto-ppp into luci-proto-3g and making it complete as a
single protocol handler

> Missing protocol extension for proto "3g"
> cannot open /usr/lib/lua/luci/model/cbi/admin_network/proto_3g.lua: No such file or directory

Closes openwrt/luci#1815

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoMerge pull request #1822 from Ansuel/luci-cpuinfo
Dirk Brenken [Mon, 28 May 2018 14:09:09 +0000 (16:09 +0200)]
Merge pull request #1822 from Ansuel/luci-cpuinfo

luci-admin-full: add architecture info

6 years agoluci-admin-full: add architecture info 1822/head
Ansuel Smith [Fri, 25 May 2018 16:28:18 +0000 (18:28 +0200)]
luci-admin-full: add architecture info

Referring to this, #1698 , we add architecture info and we show Unknown instead of ?. This is usefull if someone needs to install opkg packages manually.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1827 from Ansuel/luci-map
Jo-Philipp Wich [Mon, 28 May 2018 13:19:30 +0000 (15:19 +0200)]
Merge pull request #1827 from Ansuel/luci-map

luci-theme-material: upgrade jquery

6 years agotreewide: convert HTML tables to div
Jo-Philipp Wich [Mon, 28 May 2018 12:57:54 +0000 (14:57 +0200)]
treewide: convert HTML tables to div

Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add element creation helper to cbi.js
Jo-Philipp Wich [Mon, 28 May 2018 12:56:15 +0000 (14:56 +0200)]
luci-base: add element creation helper to cbi.js

Add a new helper function `E()` to cbi.js which can be used to conveniently
build HTML markup.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agothemes: add forward-compatibility CSS
Jo-Philipp Wich [Mon, 28 May 2018 12:54:50 +0000 (14:54 +0200)]
themes: add forward-compatibility CSS

Subsequent changes will largely replace tables with div based markup, so
add forward compatibility style rules to keep the rendering intact.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1836 from sotux/master-zh_CN-translation
Hannu Nyman [Mon, 28 May 2018 04:59:17 +0000 (07:59 +0300)]
Merge pull request #1836 from sotux/master-zh_CN-translation

luci-app-firewall: zh_CN: update Simplified Chinese translation

6 years agoluci-app-firewall: zh_CN: update Simplified Chinese translation 1836/head
Zheng Qian [Mon, 28 May 2018 04:33:56 +0000 (12:33 +0800)]
luci-app-firewall: zh_CN: update Simplified Chinese translation

Signed-off-by: Zheng Qian <sotux82@gmail.com>
6 years agoshadowsocks-libev: fix enumerating server and ss_redir sections
Yousong Zhou [Mon, 28 May 2018 03:01:51 +0000 (11:01 +0800)]
shadowsocks-libev: fix enumerating server and ss_redir sections

The issue existed since the first revision of the rewrite and was
exposed by commit 4024d4f (luci-base: switch to ubus uci operations)

A quick scan of the current repo indicates that these are the only sites
of wrong call pattern

Fixes openwrt/packages#6113

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoMerge pull request #1834 from Ansuel/fixpo
Hannu Nyman [Sun, 27 May 2018 19:07:52 +0000 (22:07 +0300)]
Merge pull request #1834 from Ansuel/fixpo

luci-base: fix broken translation

6 years agoluci-base: fix broken translation 1834/head
Ansuel Smith [Sun, 27 May 2018 17:33:11 +0000 (19:33 +0200)]
luci-base: fix broken translation

Currently this translation refer to an old string, sync to the new one.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1828 from dibdot/lxc_fix
Dirk Brenken [Sun, 27 May 2018 18:52:31 +0000 (20:52 +0200)]
Merge pull request #1828 from dibdot/lxc_fix

luci-app-lxc: fix "plain-vanilla" integration, part 2

6 years agoluci-app-lxc: fix "plain-vanilla" integration, part 2 1828/head
Dirk Brenken [Sat, 26 May 2018 17:32:39 +0000 (19:32 +0200)]
luci-app-lxc: fix "plain-vanilla" integration, part 2

I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.

* check /etc/config/lxc in controller, not in cbi
* more controller cleanups
* remove unused 'fork_exec' function
* check path before container creation
* check space requirements before container creation
  * support new uci options 'min_space' and 'min_temp',
    default for both is 100000 KB
  * both options are configurable via LuCI CBI template
* write messages to log in case of an error
* validate the container name during creation,
  automatically remove invalid chars
* inform the user that only a stopped container can be destroyed
* add experimental ssl support (untested, disabled by default)

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1833 from ysoyipek/patch-3
Hannu Nyman [Sun, 27 May 2018 13:22:27 +0000 (16:22 +0300)]
Merge pull request #1833 from ysoyipek/patch-3

Update base.po

6 years agoUpdate base.po 1833/head
Yusuf Soyipek [Sun, 27 May 2018 13:17:15 +0000 (16:17 +0300)]
Update base.po

Some of the shortcomings in Turkish were added.

6 years agoMerge pull request #1832 from musashino205/l10n/fw-upd-ja
Hannu Nyman [Sun, 27 May 2018 12:32:38 +0000 (15:32 +0300)]
Merge pull request #1832 from musashino205/l10n/fw-upd-ja

luci-app-firewall: update Japanese translation

6 years agoluci-app-firewall: update Japanese translation 1832/head
INAGAKI Hiroshi [Sun, 27 May 2018 12:27:32 +0000 (21:27 +0900)]
luci-app-firewall: update Japanese translation

Added Japanese translations for offloading options.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-firewall: sync translations
INAGAKI Hiroshi [Sun, 27 May 2018 12:07:07 +0000 (21:07 +0900)]
luci-app-firewall: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1826 from hnyman/offload
Hannu Nyman [Sun, 27 May 2018 06:55:55 +0000 (09:55 +0300)]
Merge pull request #1826 from hnyman/offload

luci-app-firewall: expose flow offloading options

6 years agoMerge pull request #1829 from musashino205/l10n/mwan3-upd-ja
Hannu Nyman [Sat, 26 May 2018 18:33:36 +0000 (21:33 +0300)]
Merge pull request #1829 from musashino205/l10n/mwan3-upd-ja

luci-app-mwan3: update Japanese translation

6 years agoluci-app-mwan3: update Japanese translation 1829/head
INAGAKI Hiroshi [Sat, 26 May 2018 18:12:24 +0000 (03:12 +0900)]
luci-app-mwan3: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-firewall: expose flow offloading options 1826/head
Hannu Nyman [Sat, 26 May 2018 17:31:23 +0000 (20:31 +0300)]
luci-app-firewall: expose flow offloading options

Expose options related to routing/NAT flow offloading
feature in firewall3. Offloading is available in kernel 4.14+

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoluci-theme-material: upgrade jquery 1827/head
Ansuel Smith [Sat, 26 May 2018 16:58:45 +0000 (18:58 +0200)]
luci-theme-material: upgrade jquery

This upgrade jquery to latest version and solve 404 error for the useless .map file. Also it's 85kb instead of 97kb

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoi18n: one more fix for Polish translation
Hannu Nyman [Fri, 25 May 2018 14:11:47 +0000 (17:11 +0300)]
i18n: one more fix for Polish translation

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoi18n: sync, fix and cleanup translations
Hannu Nyman [Fri, 25 May 2018 13:43:09 +0000 (16:43 +0300)]
i18n: sync, fix and cleanup translations

* sync translations (aiccu removal)
* remove some other old strings
* fix Polish translation

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agoMerge pull request #1821 from TDT-AG/pr/20180521-protocols-remove-aiccu
Hannu Nyman [Fri, 25 May 2018 13:10:19 +0000 (16:10 +0300)]
Merge pull request #1821 from TDT-AG/pr/20180521-protocols-remove-aiccu

luci-proto-ipv6: remove outdated aiccu proto support

6 years agoluci-proto-ipv6: remove outdated aiccu proto support 1821/head
Florian Eckert [Fri, 25 May 2018 09:37:10 +0000 (11:37 +0200)]
luci-proto-ipv6: remove outdated aiccu proto support

Remove outdated package for luci proto section.
See commit:
https://github.com/openwrt/packages/commit/441f8a3ed1da96f6236988d672011bff11057d6b

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #1481 from TDT-AG/luci-app-openvpn-fixes
Jo-Philipp Wich [Fri, 25 May 2018 05:22:27 +0000 (07:22 +0200)]
Merge pull request #1481 from TDT-AG/luci-app-openvpn-fixes

luci-app-openvpn: several fixes

6 years agoMerge pull request #1818 from dibdot/lxc_fix
Dirk Brenken [Wed, 23 May 2018 22:26:42 +0000 (00:26 +0200)]
Merge pull request #1818 from dibdot/lxc_fix

luci-app-lxc: remove wrong leftover from last commit

6 years agoluci-app-lxc: remove wrong leftover from last commit 1818/head
Dirk Brenken [Wed, 23 May 2018 22:25:36 +0000 (00:25 +0200)]
luci-app-lxc: remove wrong leftover from last commit

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1817 from dibdot/travelmate
Dirk Brenken [Wed, 23 May 2018 21:52:03 +0000 (23:52 +0200)]
Merge pull request #1817 from dibdot/travelmate

luci-app-travelmate: fix url ampersand encoding

6 years agoluci-app-travelmate: fix url ampersand encoding 1817/head
Dirk Brenken [Wed, 23 May 2018 21:48:47 +0000 (23:48 +0200)]
luci-app-travelmate: fix url ampersand encoding

* fix ampersand encoding in wireless stations overview

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1808 from dibdot/lxc_fix
Dirk Brenken [Wed, 23 May 2018 20:22:44 +0000 (22:22 +0200)]
Merge pull request #1808 from dibdot/lxc_fix

luci-app-lxc: fix "plain-vanilla" integration

6 years agoluci-app-lxc: fix "plain-vanilla" integration 1808/head
Dirk Brenken [Sun, 20 May 2018 17:23:53 +0000 (19:23 +0200)]
luci-app-lxc: fix "plain-vanilla" integration

I've tried to get the lxc app in a more usable state. Tested with mips
and amd64 targets.

* fix missing tar/xz dependency,
  only if LXC_BUSYBOX_OPTIONS is not selected
* mute needless gpg validation warning
* tidy up controller a little bit
* fix multiple possible dispatcher errors
* fix compatibility with XHTML standard theme (looks still horrible ;-)
* inform the user about custom kernel prerequisites
* inform the user about the template download
* inform the user if no template was found

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1814 from Ansuel/lua-interpreter
Jo-Philipp Wich [Wed, 23 May 2018 07:58:53 +0000 (09:58 +0200)]
Merge pull request #1814 from Ansuel/lua-interpreter

luci-base: fix dispacher fail

6 years agoluci-base: fix dispacher fail 1814/head
Ansuel Smith [Sun, 20 May 2018 17:51:33 +0000 (19:51 +0200)]
luci-base: fix dispacher fail

http.getenv("SCRIPT_NAME") fail if it's not provided. This can happen in the login screen when we don't have any script to load.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoMerge pull request #1810 from musashino205/l10n/tmate-upd-ja
Hannu Nyman [Mon, 21 May 2018 15:07:54 +0000 (18:07 +0300)]
Merge pull request #1810 from musashino205/l10n/tmate-upd-ja

luci-app-travelmate: update Japanese translation

6 years agoluci-app-travelmate: update Japanese translation 1810/head
INAGAKI Hiroshi [Mon, 21 May 2018 14:55:39 +0000 (23:55 +0900)]
luci-app-travelmate: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1809 from musashino205/l10n/adblk-upd-ja
Hannu Nyman [Mon, 21 May 2018 14:17:13 +0000 (17:17 +0300)]
Merge pull request #1809 from musashino205/l10n/adblk-upd-ja

luci-app-adblock: update Japanese translation

6 years agoluci-app-adblock: update Japanese translation 1809/head
INAGAKI Hiroshi [Mon, 21 May 2018 14:11:24 +0000 (23:11 +0900)]
luci-app-adblock: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1805 from musashino205/l10n/base-upd-ja
Hannu Nyman [Sun, 20 May 2018 16:26:57 +0000 (19:26 +0300)]
Merge pull request #1805 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoluci-base: update Japanese translation 1805/head
INAGAKI Hiroshi [Sun, 20 May 2018 16:01:31 +0000 (01:01 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoi18n: sync translations
INAGAKI Hiroshi [Sun, 20 May 2018 13:29:33 +0000 (22:29 +0900)]
i18n: sync translations

Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-mod-admin-full: fix crash on wireless when no networks are declared
Jo-Philipp Wich [Sat, 19 May 2018 21:28:14 +0000 (23:28 +0200)]
luci-mod-admin-full: fix crash on wireless when no networks are declared

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: do not override iface section in wireless cbi map
Jo-Philipp Wich [Sat, 19 May 2018 21:26:34 +0000 (23:26 +0200)]
luci-mod-admin-full: do not override iface section in wireless cbi map

Do override the iface section id upon commit to avoid clobbering the resulting
configuration. The manual config sync is not needed anymore after switching
to uncached ubus uci operations.

Fixes #1770.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: handle potential crash in luci.model.network.interface.get_i18n()
Jo-Philipp Wich [Sat, 19 May 2018 20:11:05 +0000 (22:11 +0200)]
luci-base: handle potential crash in luci.model.network.interface.get_i18n()

Should prevent the crash mentioned in #1779.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: break circular luci.config <> luci.model.uci dependency
Jo-Philipp Wich [Sat, 19 May 2018 11:07:37 +0000 (13:07 +0200)]
luci-base: break circular luci.config <> luci.model.uci dependency

On certain environments, mainly with the embedded uhttpd interpreter, the
luci.config class cannot be loaded due to a circular dependency with the
luci.model.uci class.

Break up the dependency by deferring the loading of luci.config in
luci.model.uci until it is actually needed.

Fixes #1803, FS#1553.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1801 from dibdot/adblock
Dirk Brenken [Fri, 18 May 2018 16:31:07 +0000 (18:31 +0200)]
Merge pull request #1801 from dibdot/adblock

luci-app-adblock: respect SimpleForm size limit

6 years agoluci-app-adblock: respect SimpleForm size limit 1801/head
Dirk Brenken [Fri, 18 May 2018 16:17:31 +0000 (18:17 +0200)]
luci-app-adblock: respect SimpleForm size limit

* respect SimpleForm size limit of 100KB for advanced online editing

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-lib-json: support serializing userdata
Jo-Philipp Wich [Fri, 18 May 2018 14:59:16 +0000 (16:59 +0200)]
luci-lib-json: support serializing userdata

Fixes the following error when attempting to serialize userdata objects:

    .../json.lua:81: attempt to call local 'parser' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-rpc: fix unresolved controller reference in rpc_auth()
Jo-Philipp Wich [Fri, 18 May 2018 14:58:17 +0000 (16:58 +0200)]
luci-mod-rpc: fix unresolved controller reference in rpc_auth()

Fixes the following error:

   .../rpc.lua:85: attempt to index global 'ctrl' (a nil value)

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1769 from jow-/master
Jo-Philipp Wich [Fri, 18 May 2018 14:44:33 +0000 (16:44 +0200)]
Merge pull request #1769 from jow-/master

UCI apply/rollback workflow

6 years agoluci-base: raise maximum POST value size to 100KB
Jo-Philipp Wich [Fri, 18 May 2018 14:42:43 +0000 (16:42 +0200)]
luci-base: raise maximum POST value size to 100KB

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agolucihttp: update to latest HEAD
Jo-Philipp Wich [Fri, 18 May 2018 09:42:40 +0000 (11:42 +0200)]
lucihttp: update to latest HEAD

6ddea4c utils: fix crash with zero length input string in lh_header_attribute()
cb119de lib: add support for setting the maximum allowed data size

Fixes #1784.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1748 from hnyman/wifidata
Hannu Nyman [Fri, 18 May 2018 09:51:24 +0000 (12:51 +0300)]
Merge pull request #1748 from hnyman/wifidata

luci-base: show wifi chip identification on overview

6 years agoMerge pull request #1793 from TDT-AG/pr/20180514-luci-app-ddns-fix-output
Hannu Nyman [Wed, 16 May 2018 06:28:08 +0000 (09:28 +0300)]
Merge pull request #1793 from TDT-AG/pr/20180514-luci-app-ddns-fix-output

luci-app-ddns: fix HTML page rendering in globals section

6 years agoluci-app-ddns: fix HTML page rendering in globals section 1793/head
Helge Mader [Mon, 23 Apr 2018 11:26:41 +0000 (13:26 +0200)]
luci-app-ddns: fix HTML page rendering in globals section

Signed-off-by: Helge Mader <ma@dev.tdt.de>
6 years agoMerge pull request #1797 from Rixerx/master
Hannu Nyman [Tue, 15 May 2018 15:15:32 +0000 (18:15 +0300)]
Merge pull request #1797 from Rixerx/master

luci-base: update Polish translation

6 years agoMerge pull request #1796 from TDT-AG/pr/20180515-luci-app-mwan3-add-param
Hannu Nyman [Tue, 15 May 2018 15:15:04 +0000 (18:15 +0300)]
Merge pull request #1796 from TDT-AG/pr/20180515-luci-app-mwan3-add-param

luci-app-mwan3: add new config options and fix

6 years agoluci-base: update Polish translation 1797/head
Rixerx [Mon, 14 May 2018 20:21:30 +0000 (22:21 +0200)]
luci-base: update Polish translation

Signed-off-by: Rixerx <krystian.kozak20@gmail.com>
6 years agoluci-app-mwan3: add quality check options 1796/head
Florian Eckert [Mon, 7 May 2018 12:38:10 +0000 (14:38 +0200)]
luci-app-mwan3: add quality check options

Add new quality_check feature

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-mwan3: add dependecy to size option
Florian Eckert [Mon, 7 May 2018 08:56:22 +0000 (10:56 +0200)]
luci-app-mwan3: add dependecy to size option

This option is only valid if track-method is set to "ping".

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #1794 from dibdot/adblock
Dirk Brenken [Tue, 15 May 2018 06:07:10 +0000 (08:07 +0200)]
Merge pull request #1794 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.2

6 years agoluci-app-adblock: sync with adblock 3.5.2 1794/head
Dirk Brenken [Mon, 14 May 2018 20:09:31 +0000 (22:09 +0200)]
luci-app-adblock: sync with adblock 3.5.2

* archive sub-categories (shalla & ut_capitole) are now configurable
  via LuCI CBI template
* small bugfixes & enhancements

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-base: harden cookie sysauth=
Yousong Zhou [Sun, 13 May 2018 09:55:01 +0000 (17:55 +0800)]
luci-base: harden cookie sysauth=

A simple scan of the code indicates that currently no code in the repo
is accessing the sysauth= cookie

Closes openwrt/luci#1555

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoMerge pull request #1786 from musashino205/l10n/pagekite-add-ja
Dirk Brenken [Sat, 12 May 2018 07:36:54 +0000 (09:36 +0200)]
Merge pull request #1786 from musashino205/l10n/pagekite-add-ja

luci-app-pagekitec: add Japanese translation

6 years agoMerge pull request #1787 from TDT-AG/pr/20180509-net-mwan3-fixes
Dirk Brenken [Fri, 11 May 2018 18:26:11 +0000 (20:26 +0200)]
Merge pull request #1787 from TDT-AG/pr/20180509-net-mwan3-fixes

luci-app-mwan3: fixes

6 years agoMerge pull request #1791 from dibdot/travelmate
Dirk Brenken [Fri, 11 May 2018 18:15:20 +0000 (20:15 +0200)]
Merge pull request #1791 from dibdot/travelmate

luci-app-travelmate: fix Interface Wizard

6 years agoluci-app-travelmate: fix Interface Wizard 1791/head
Dirk Brenken [Fri, 11 May 2018 09:00:16 +0000 (11:00 +0200)]
luci-app-travelmate: fix Interface Wizard

* make sure to update the nw & fw entries only once

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1789 from ldir-EDB0/miniupdpdtweak
Hannu Nyman [Wed, 9 May 2018 19:11:48 +0000 (22:11 +0300)]
Merge pull request #1789 from ldir-EDB0/miniupdpdtweak

luci-app-upnp: change leasefile location hint

6 years agoluci-app-upnp: change leasefile location hint 1789/head
Kevin Darbyshire-Bryant [Wed, 9 May 2018 12:50:35 +0000 (13:50 +0100)]
luci-app-upnp: change leasefile location hint

Change default leasefile hint from /var/log/upnp.leases to
/var/run/miniupnpd.leases

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoluci-app-mwan3: pin diag ping command to interface device 1787/head
Florian Eckert [Wed, 9 May 2018 11:48:27 +0000 (13:48 +0200)]
luci-app-mwan3: pin diag ping command to interface device

If the physical device is not set in the diag_command then the ping will
always use the route with the lowest metric from the default routing
table.
To fix this add the physical device of the logical interface to the ping
command.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-app-mwan3: honor dynamic interface to get gateway ip
Florian Eckert [Wed, 9 May 2018 11:13:20 +0000 (13:13 +0200)]
luci-app-mwan3: honor dynamic interface to get gateway ip

If a logical interface setup and adds in the protocol handler a dynamic
interface then the gateway is configured in the dynamic interface and the
setting up logical interface does not have a gateway specified.
To fix this check first if a dynamic interface is present and use this
gateway ip if found and if no dynamich interface is set then check for a
gateway in the logical interface.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoMerge pull request #1780 from dibdot/adblock
Dirk Brenken [Wed, 9 May 2018 11:38:09 +0000 (13:38 +0200)]
Merge pull request #1780 from dibdot/adblock

luci-app-adblock: support new workflow

6 years agoluci-app-adblock: support new workflow 1780/head
Dirk Brenken [Sat, 5 May 2018 06:16:40 +0000 (08:16 +0200)]
luci-app-adblock: support new workflow

* adapt Adblock to support the new cbi apply workflow
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoMerge pull request #1777 from dibdot/travelmate
Dirk Brenken [Wed, 9 May 2018 11:19:14 +0000 (13:19 +0200)]
Merge pull request #1777 from dibdot/travelmate

luci-app-travelmate: support new workflow

6 years agoMerge pull request #1785 from EricLuehrsen/unbound_luci
Dirk Brenken [Wed, 9 May 2018 11:18:13 +0000 (13:18 +0200)]
Merge pull request #1785 from EricLuehrsen/unbound_luci

luci-app-unbound: clean up tab presentation

6 years agoluci-app-travelmate: support new workflow & re-ordering fix 1777/head
Dirk Brenken [Thu, 3 May 2018 05:53:48 +0000 (07:53 +0200)]
luci-app-travelmate: support new workflow & re-ordering fix

* Remove SimpleForm stuff from Interface Wizard
* adapt Travelmate to support new cbi apply workflow
* fix station re-odering
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
6 years agoluci-app-pagekitec: add Japanese translation 1786/head
INAGAKI Hiroshi [Fri, 4 May 2018 12:37:57 +0000 (21:37 +0900)]
luci-app-pagekitec: add Japanese translation

Added Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoluci-app-unbound: clean up tab presentation 1785/head
Eric Luehrsen [Tue, 8 May 2018 05:48:44 +0000 (01:48 -0400)]
luci-app-unbound: clean up tab presentation

Some of the options in the tabs were not placed in
optimal groups. Add tabs for DHCP and start triggers.

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
6 years agoluci-app-commands: fix link generation
Yousong Zhou [Mon, 7 May 2018 14:07:15 +0000 (22:07 +0800)]
luci-app-commands: fix link generation

Fixes openwrt/luci##824

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-mod-freifunk: fix redirect url
Yousong Zhou [Mon, 7 May 2018 14:20:18 +0000 (22:20 +0800)]
luci-mod-freifunk: fix redirect url

location.hostname lacks port info

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-app-firewall: redirect to overview page on zone details save
Florian Eckert [Tue, 20 Dec 2016 13:06:34 +0000 (14:06 +0100)]
luci-app-firewall: redirect to overview page on zone details save

This fixes an inconsistency because on the interface configuration if
you press Save&Apply it will go back to overview page.  It is also the
case with "Firewall - Traffic Rules" details.  On firewall zone it only
goes back to firewall zone-detail. Same behaviour on all pages is a good
user experience.

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-mod-admin-full: use fs.glob instead nixio.fs.glob
Yousong Zhou [Mon, 7 May 2018 13:17:42 +0000 (21:17 +0800)]
luci-mod-admin-full: use fs.glob instead nixio.fs.glob

It's how the module was named when "require"d and used by other code in
the same function

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-mod-admin-full: no menu entry for leds if "/sys/class/leds" is empty
Florian Eckert [Sun, 4 Jun 2017 16:49:27 +0000 (18:49 +0200)]
luci-mod-admin-full: no menu entry for leds if "/sys/class/leds" is empty

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-mod-admin-full: change supports_reset() test for factory reset
Florian Eckert [Wed, 29 Nov 2017 15:51:08 +0000 (16:51 +0100)]
luci-mod-admin-full: change supports_reset() test for factory reset

The check "supports_reset" only covers /proc/mtd partitions. If we have
this the commands checks for names like ubi or rootfs_data. If this is
found the system is possible for a factory reset.  But on x86 the
situation is different.  We have no /proc/mtd partitions because this
system do not use a bare metall flash.

To solve this issue check if we have an overlay and if so we could do a
factory reset. This could be applied for system which uses bare metal
flash and system which uses FTL or harddisks.

Jffs2reset is the current command used for factory reset.  It will try
to find volume "rootfs_data" and if it's mounted will delete all files
under directory /overlay

luci-mod-admin-mini also has check for reset available, but we leave it
alone for now as it uses "mtd -r erase rootfs_data"

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-app-openvpn: add license tag
Florian Eckert [Sun, 15 Jan 2017 08:28:04 +0000 (09:28 +0100)]
luci-app-openvpn: add license tag

Add missing license tag.  File headers of the application indicate so

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
6 years agoluci-base: reload log on uci system change
Florian Eckert [Wed, 22 Nov 2017 11:09:45 +0000 (12:09 +0100)]
luci-base: reload log on uci system change

If log configuration get changed in uci system no new values are applied
until reboot. Add /etc/init.d/log reload to exec option will solve this
issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-proto-ppp: add translation to ipv6 handling
Florian Eckert [Wed, 4 Apr 2018 12:04:17 +0000 (14:04 +0200)]
luci-proto-ppp: add translation to ipv6 handling

If there is no translation set, then on material theme the dropdown
selection displaced. To fix this add an translation to this dropdown.

The commit also changes source code whitespace shifting.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-base: fix i18n de typo for rc.local
Florian Eckert [Mon, 7 May 2018 05:47:17 +0000 (07:47 +0200)]
luci-base: fix i18n de typo for rc.local

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-base: add transitional /etc/init.d/ucitrack 1769/head
Jo-Philipp Wich [Wed, 2 May 2018 08:37:02 +0000 (10:37 +0200)]
luci-base: add transitional /etc/init.d/ucitrack

Ship an /etc/init.d/ucitrack for spawning a virtual service with the sole
purpose to track the configurations and dependencies formerly handled by
luci-reload.

Once all LuCI supported services ship with procd compatible init scripts,
the uci track support can be dropped.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: rework wifi configuration
Jo-Philipp Wich [Tue, 1 May 2018 19:12:12 +0000 (21:12 +0200)]
luci-mod-admin-full: rework wifi configuration

- localize variables
- get rid of redirects breaking apply workflow
- auto-adjust unusable channels when switching country
- use apply/rollback workflow when enabling/disabling networks

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agotreewide: rework uci apply workflow
Jo-Philipp Wich [Thu, 26 Apr 2018 06:52:55 +0000 (08:52 +0200)]
treewide: rework uci apply workflow

Switch to rpcd based uci apply/rollback workflow which helps to avoid soft-
bricking devices by requiring an explicit confirmation call after config
apply.

When a user now clicks "Save & Apply", LuCI first issues a call to uci apply
which commits and reloads configuration, then goes into a polling countdown
mode where it repeatedly attempts to call uci confirm.

If the committed configuration is sane, the confirm call will go through and
cancel rpcd's pending rollback timer.

If the configuration change leads to a loss of connectivity (e.g. due to bad
firewall rules or similar), the rollback mechanism will kick in after the
timeout and revert configuration files and pending changes to the pre-apply
state.

In order to cover such rare cases where a lost of connectivity is expected
and desired, the user is offered an "unchecked" apply option after timing
out, which allows committing and applying the changes anyway, without the
extra safety checks.

As a consequence of this change, the luci-reload mechanism is now completely
unsused since rpcd uses ubus config reload signals to reload affected
services, which means that only procd-enabled services will receive proper
reload treatment with the new workflow.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>