project/luci.git
5 years agotreewide: fix "Unhandled token" errors with Lua CBI maps
Jo-Philipp Wich [Sat, 16 Nov 2019 17:23:43 +0000 (18:23 +0100)]
treewide: fix "Unhandled token" errors with Lua CBI maps

The `data-type` attribute is used to bind datatype validators to a widget
while some templates used the same attribute to denote the name of the
underlying widget.

Change the `data-type` attributes referring to the widget name to
`data-widget` in order to stop the JS token error spam.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 13e9e3e9e8633c7a54fe5fec1481e9df62594982)

5 years agoMerge pull request #3313 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Sat, 16 Nov 2019 09:22:50 +0000 (11:22 +0200)]
Merge pull request #3313 from stangri/18.06-luci-app-advanced-reboot

luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers

5 years agoluci-app-advanced-reboot: show OpenWrt info on compatible NAND routers 3313/head
Stan Grishin [Fri, 15 Nov 2019 23:42:13 +0000 (16:42 -0700)]
luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-app-firewall: fix stored XSS in rule-details.lua
Jo-Philipp Wich [Fri, 15 Nov 2019 18:05:05 +0000 (19:05 +0100)]
luci-app-firewall: fix stored XSS in rule-details.lua

A previous fix to this file failed to address a second instance of the
same issue.

Fixes: c048f23ba ("luci-app-firewall: fix stored XSS in rule- and forward detail pages")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-compat: add transitional package
Jo-Philipp Wich [Thu, 14 Nov 2019 10:21:09 +0000 (11:21 +0100)]
luci-compat: add transitional package

Add an empty luci-compat package to allow forward compatibility with
openwrt-19.07 and master for packages that support all three branches.

Ref: https://forum.openwrt.org/t/luci-compat-and-18-06/48369
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-nlbwon: fix parsing relative interval values from config
Jo-Philipp Wich [Wed, 13 Nov 2019 16:08:58 +0000 (17:08 +0100)]
luci-app-nlbwon: fix parsing relative interval values from config

Fixes: #3302
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2e8aa301aa2a1aa07438de8dd962c21f0c8559f2)

5 years agoluci-lib-jsonc: store large JSON integer values as Lua doubles
Jo-Philipp Wich [Wed, 13 Nov 2019 08:03:38 +0000 (09:03 +0100)]
luci-lib-jsonc: store large JSON integer values as Lua doubles

Fixes: #3293
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8da8f38bf97c925f6f113d3b4793edb23e7e0dc2)

5 years agoluci-mod-admin-full: proper SSID escaping in wifi join and iface overview
Jo-Philipp Wich [Tue, 5 Nov 2019 13:32:09 +0000 (14:32 +0100)]
luci-mod-admin-full: proper SSID escaping in wifi join and iface overview

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-mod-system: validate log_ip as "host" instead of just ipaddr
Yousong Zhou [Mon, 4 Nov 2019 03:03:13 +0000 (03:03 +0000)]
luci-mod-system: validate log_ip as "host" instead of just ipaddr

Fixes FS#2444

A replicate of commit 90051b685 on master branch

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
5 years agoMerge pull request #3246 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Tue, 29 Oct 2019 05:25:47 +0000 (06:25 +0100)]
Merge pull request #3246 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: bugfix: call to action has no parent node

5 years agoluci-app-vpnbypass: bugfix: call to action has no parent node 3246/head
Stan Grishin [Mon, 28 Oct 2019 23:35:10 +0000 (16:35 -0700)]
luci-app-vpnbypass: bugfix: call to action has no parent node

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoMerge pull request #3225 from stangri/18.06-luci-app-vpnbypass
Jo-Philipp Wich [Mon, 28 Oct 2019 09:14:53 +0000 (10:14 +0100)]
Merge pull request #3225 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: better service control buttons

5 years agoluci-app-openvpn: fix traceback for undefined fs value
Florian Eckert [Thu, 24 Oct 2019 07:16:12 +0000 (09:16 +0200)]
luci-app-openvpn: fix traceback for undefined fs value

This will fix the traceback for undefined fs value.
The bug was added by the cherry-pick commit
ca781af2f8052d2469d3e6f533208c9e6e9648d4 from master branch.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
5 years agoluci-app-openvpn: add missing proto param for ipv6
Florian Eckert [Mon, 14 Oct 2019 08:44:25 +0000 (10:44 +0200)]
luci-app-openvpn: add missing proto param for ipv6

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 18037444b57104a0a62f6c1c16f308ee2dd81a36)
Update commit to apply cleanly

5 years agoluci-app-vpnbypass: better service control buttons 3225/head
Stan Grishin [Sun, 20 Oct 2019 22:42:34 +0000 (15:42 -0700)]
luci-app-vpnbypass: better service control buttons

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-proto-vpnc: expose defaultroute option in proto_vpnc.lua
Whitronic [Thu, 8 Nov 2018 11:25:43 +0000 (11:25 +0000)]
luci-proto-vpnc: expose defaultroute option in proto_vpnc.lua

Sometimes people only want the VPN connection to be a route to a specific
network, not the default gateway for all traffic.

I've tested this on my router and works fine!

Submitted-by: Whitronic <joao.f.vieira@gmail.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f4212285d474a9f75a55d7c39ae1ac70dc04d1e0)

5 years agoMerge pull request #3213 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Fri, 18 Oct 2019 14:58:06 +0000 (16:58 +0200)]
Merge pull request #3213 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: bugfix: properly restart dnsmasq

5 years agoluci-app-vpnbypass: bugfix: properly restart dnsmasq 3213/head
Stan Grishin [Fri, 18 Oct 2019 14:14:40 +0000 (07:14 -0700)]
luci-app-vpnbypass: bugfix: properly restart dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoMerge pull request #3171 from stangri/18.06-luci-app-simple-adblock
Florian Eckert [Mon, 14 Oct 2019 09:36:32 +0000 (11:36 +0200)]
Merge pull request #3171 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: fix invalid <br> entries

5 years agoluci-app-simple-adblock: bugfix: fix invalid <br> entries 3171/head
Stan Grishin [Thu, 10 Oct 2019 12:12:33 +0000 (05:12 -0700)]
luci-app-simple-adblock: bugfix: fix invalid <br> entries

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-base: fix CSRF prevention for arcombine targets
Jo-Philipp Wich [Wed, 9 Oct 2019 07:55:44 +0000 (09:55 +0200)]
luci-base: fix CSRF prevention for arcombine targets

The dispatcher failed to propagate the child target post security
requirements to the arcombine() dispatch target so far - fix this
by recursively testing the post security requirements.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f8c6eb67cd9da09ee20248fec6ab742069635e47)

5 years agoMerge pull request #3138 from stangri/18.06-luci-app-vpnbypass
Florian Eckert [Wed, 2 Oct 2019 06:24:47 +0000 (08:24 +0200)]
Merge pull request #3138 from stangri/18.06-luci-app-vpnbypass

luci-app-vpnbypass: fix dispatcher bug when VPN node is present

5 years agoluci-app-vpnbypass: fix dispatcher bug when VPN node is present 3138/head
Stan Grishin [Wed, 2 Oct 2019 01:22:47 +0000 (18:22 -0700)]
luci-app-vpnbypass: fix dispatcher bug when VPN node is present

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agotimezone data: update to 2019c
Hannu Nyman [Sat, 28 Sep 2019 18:45:21 +0000 (18:45 +0000)]
timezone data: update to 2019c

Update timezone data to 2019c

http://mm.icann.org/pipermail/tz-announce/2019-September/000057.html

2019c:
* Fiji observes DST from 2019-11-10 to 2020-01-12.
* Norfolk Island starts observing Australian-style DST.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit cf887ba62f4a2aec06ec169eba3f3829967ee344)

5 years agoMerge pull request #3113 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Tue, 24 Sep 2019 16:30:42 +0000 (19:30 +0300)]
Merge pull request #3113 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: dnsmasq.ipset option support

5 years agoluci-app-simple-adblock: dnsmasq.ipset option support 3113/head
Stan Grishin [Tue, 24 Sep 2019 16:17:06 +0000 (09:17 -0700)]
luci-app-simple-adblock: dnsmasq.ipset option support

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoMerge pull request #3045 from stangri/18.06-luci-app-vpnbypass
Hannu Nyman [Fri, 20 Sep 2019 18:01:58 +0000 (21:01 +0300)]
Merge pull request #3045 from stangri/18.06-luci-app-vpnbypass

[18.06] luci-app-vpnbypass: better start/stop controls, create entry in the VPN menu if it exists

5 years agoluci-app-firewall: fix stored XSS in rule- and forward detail pages
Jo-Philipp Wich [Fri, 13 Sep 2019 11:23:23 +0000 (13:23 +0200)]
luci-app-firewall: fix stored XSS in rule- and forward detail pages

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2a143f4777e5ec57dfc6c63d55bf80600486efd7)

5 years agoluci-base: html escape values in uci changes display
Jo-Philipp Wich [Tue, 10 Sep 2019 15:16:01 +0000 (17:16 +0200)]
luci-base: html escape values in uci changes display

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7513a4ca35815f60187b7d33fdd2ee3aa5cb4a2b)

5 years agoluci-base, luci-mod-network: fix bridge state change quirks
Jo-Philipp Wich [Tue, 10 Sep 2019 15:05:15 +0000 (17:05 +0200)]
luci-base, luci-mod-network: fix bridge state change quirks

Fixes: #2997
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fe0e4f8b4d50cb7ce4e65f747d4ed2de6a030b73)

5 years agoluci-app-vpnbypass: better start/stop controls, create entry in the VPN menu if it... 3045/head
Stan Grishin [Sat, 7 Sep 2019 17:36:45 +0000 (10:36 -0700)]
luci-app-vpnbypass: better start/stop controls, create entry in the VPN menu if it exists

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoMerge pull request #3027 from stangri/18.06-luci-app-simple-adblock
Dirk Brenken [Thu, 29 Aug 2019 13:26:13 +0000 (15:26 +0200)]
Merge pull request #3027 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: dns resolver value bugfix (#3000)

5 years agoluci-app-simple-adblock: dns resolver value bugfix (#3000) 3027/head
Stan Grishin [Thu, 29 Aug 2019 13:21:35 +0000 (06:21 -0700)]
luci-app-simple-adblock: dns resolver value bugfix (#3000)

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoMerge pull request #3015 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Tue, 27 Aug 2019 13:55:55 +0000 (16:55 +0300)]
Merge pull request #3015 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: bugfix for when network.lan.ipaddr is a table

5 years agoMerge pull request #3018 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Tue, 27 Aug 2019 13:54:53 +0000 (16:54 +0300)]
Merge pull request #3018 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: delete extra file

5 years agoluci-app-simple-adblock: delete extra file 3018/head
Stan Grishin [Tue, 27 Aug 2019 06:18:59 +0000 (23:18 -0700)]
luci-app-simple-adblock: delete extra file

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-app-advanced-reboot: bugfix for when network.lan.ipaddr is a table 3015/head
Stan Grishin [Tue, 27 Aug 2019 06:07:49 +0000 (23:07 -0700)]
luci-app-advanced-reboot: bugfix for when network.lan.ipaddr is a table

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-mod-system: prevent clearing rc.local on unrelated submit actions
Jo-Philipp Wich [Wed, 12 Jun 2019 15:47:30 +0000 (17:47 +0200)]
luci-mod-system: prevent clearing rc.local on unrelated submit actions

Fixes: #2760
Fixes: 1c09ee5e4 ("luci-mod-system: fix SimpleForm usage on file editing pages")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1aa13ed51ed1c1b62b1ed296383907d953a62698)

5 years agoMerge pull request #2991 from stangri/18.06-luci-app-simple-adblock
Hannu Nyman [Sun, 18 Aug 2019 17:14:33 +0000 (20:14 +0300)]
Merge pull request #2991 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: support for varios DNS resolvers/options

5 years agoMerge pull request #2988 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Sun, 18 Aug 2019 17:13:25 +0000 (20:13 +0300)]
Merge pull request #2988 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: support for Linksys EA8300

5 years ago[18.06] luci-app-simple-adblock: support for varios DNS resolvers/options 2991/head
Stan Grishin [Sat, 17 Aug 2019 13:15:19 +0000 (06:15 -0700)]
[18.06] luci-app-simple-adblock: support for varios DNS resolvers/options

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years ago[18.06] luci-app-advanced-reboot: luci-app-advanced-reboot: support for Linksys EA8300 2988/head
Stan Grishin [Sat, 17 Aug 2019 11:29:16 +0000 (04:29 -0700)]
[18.06] luci-app-advanced-reboot: luci-app-advanced-reboot: support for Linksys EA8300

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoprotocols: fix contains_interface() implementation in several backends
Jo-Philipp Wich [Tue, 6 Aug 2019 13:19:15 +0000 (15:19 +0200)]
protocols: fix contains_interface() implementation in several backends

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fc8d021edc6d60b49b607c917d23b0655a69d47)

5 years agoluci-lib-ip: support specifying source address in route()
Jo-Philipp Wich [Tue, 6 Aug 2019 11:37:51 +0000 (13:37 +0200)]
luci-lib-ip: support specifying source address in route()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d73553e5303587ccecf05a91ead258054c9a70eb)

5 years agoluci-base: index.html: add extend cache-control directive
Jo-Philipp Wich [Thu, 1 Aug 2019 13:43:08 +0000 (15:43 +0200)]
luci-base: index.html: add extend cache-control directive

Fixes: #2942
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fe45a934445378115bfd09a48136c23b0df3a63)

5 years agoluci-base: redirect root path to /cgi-bin/luci/
xiongjie [Wed, 10 Oct 2018 05:04:17 +0000 (13:04 +0800)]
luci-base: redirect root path to /cgi-bin/luci/

Fix openwrt/luci#1062
Signed-off-by: MonwF <boluo2@gmail.com>
(cherry picked from commit fd3d2b468fe8d7d6335743d8b3fc5bb6d88708f7)

5 years agoluci-base: handle application/json replies with charset specification
Jo-Philipp Wich [Wed, 10 Jul 2019 17:24:33 +0000 (01:24 +0800)]
luci-base: handle application/json replies with charset specification

On my router, the response header Content-Type is
`application/json; charset=UTF-8` instead of `application/json`, so
almost every feature is broken.

Fixes: #2851
Suggested-by: zhanhb <6323014+zhanhb@users.noreply.github.com>
[reword commit subject]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-proto-ppp: align keepalive defaults with current OpenWrt
Jo-Philipp Wich [Thu, 30 Aug 2018 13:28:19 +0000 (15:28 +0200)]
luci-proto-ppp: align keepalive defaults with current OpenWrt

Disabling LCP echos by *not* setting "option keepalive" was broken in
OpenWrt since https://dev.archive.openwrt.org/ticket/2373.html so setting
"0" in LuCI had the effect of reverting back to "5, 1" while the help
suggested otherwise.

Support for "keepalive 0" was fixed with https://git.openwrt.org/555c59230
so align LuCI now to emit "option keepalive 0" instead of removing the
option when entering "0" in the gui.

Fixes #2112
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1b2065d0be7f74cb93fac7f208ee4f28666d3f69)

5 years agoMerge pull request #2841 from stangri/18.06-luci-app-advanced-reboot
Hannu Nyman [Tue, 9 Jul 2019 15:26:54 +0000 (18:26 +0300)]
Merge pull request #2841 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: fix README url in Makefile

5 years ago[18.06] luci-app-advanced-reboot: fix README url in Makefile 2841/head
Stan Grishin [Mon, 8 Jul 2019 19:43:38 +0000 (12:43 -0700)]
[18.06] luci-app-advanced-reboot: fix README url in Makefile

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoFix a overview page style issue for various themes
Anton Kikin [Fri, 28 Jun 2019 15:37:30 +0000 (18:37 +0300)]
Fix a overview page style issue for various themes

Fixed a overview page style issue with interface boxes for
bootstrap, material and rosy themes.

The issue only appears in the Chrome browser and lies in the
fact that the block with the device name and MAC address gets
out of the  interface block.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(backported from commit 5d26fec0bf3701f5a0b875bacd0b2f3898449e96)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoMerge pull request #2831 from stangri/openwrt-18.06-luci-app-advanced-reboot
Hannu Nyman [Sun, 7 Jul 2019 05:53:14 +0000 (08:53 +0300)]
Merge pull request #2831 from stangri/openwrt-18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: kernel version length bugfix + add routers

5 years ago[18.06] luci-app-advanced-reboot: kernel version length bugfix + add routers 2831/head
Stan Grishin [Sat, 6 Jul 2019 21:51:42 +0000 (14:51 -0700)]
[18.06] luci-app-advanced-reboot: kernel version length bugfix + add routers

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agoluci-base: hide autocomplete-preventing password input with bigger offset
Yousong Zhou [Fri, 28 Jun 2019 16:03:37 +0000 (16:03 +0000)]
luci-base: hide autocomplete-preventing password input with bigger offset

Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 3a24c2dbaa9b781504bb2847153e2514bcbe717e)

5 years agoluci-base: nowrap for password input and reveal button
Yousong Zhou [Fri, 28 Jun 2019 15:53:05 +0000 (15:53 +0000)]
luci-base: nowrap for password input and reveal button

Fixes openwrt/luci#2624

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit 609f5290c8d582def0a6334519f5e31aad19abde)

5 years agoluci-base: remove fake password field from tab order
Jo-Philipp Wich [Fri, 17 Aug 2018 04:58:53 +0000 (06:58 +0200)]
luci-base: remove fake password field from tab order

Set a negative tabindex on the dummy password field to not break the form
tab order flow.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 8c77975d1bfc9f79580b83f5b5e591b8b4cae67f)

5 years agoMerge pull request #2827 from stangri/openwrt-18.06-luci-app-simple-adblock
Hannu Nyman [Sat, 6 Jul 2019 06:26:55 +0000 (09:26 +0300)]
Merge pull request #2827 from stangri/openwrt-18.06-luci-app-simple-adblock

luci-app-simple-adblock: sync with the latest version of simple-adblock

5 years agoluci-app-simple-adblock: sync with the latest version of simple-adblock 2827/head
Stan Grishin [Fri, 5 Jul 2019 15:44:03 +0000 (08:44 -0700)]
luci-app-simple-adblock: sync with the latest version of simple-adblock

Signed-off-by: Stan Grishin <stangri@melmac.net>
5 years agotimezone data: update to 2019b
Hannu Nyman [Fri, 5 Jul 2019 14:56:04 +0000 (17:56 +0300)]
timezone data: update to 2019b

Update timezone data to 2019b

http://mm.icann.org/pipermail/tz-announce/2018-December/000055.html
http://mm.icann.org/pipermail/tz/2019-July/028249.html

2019a:
* Palestine "springs forward" on 2019-03-30 instead of 2019-03-23.
* Brazil no longer observes DST.

2019b:
* Palestine's 2019 spring-forward transition was on 03-29, not 03-30.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2f769ee0872aab8dd31bd793739b7a527e8789f6)

5 years agolucihttp: update to latest Git HEAD
Jo-Philipp Wich [Fri, 5 Jul 2019 06:26:26 +0000 (08:26 +0200)]
lucihttp: update to latest Git HEAD

a34a17d src: allow overriding buffer size from cli in multipart tester
730a46f lib: fix potentially lost bytes in boundary parsing across buffer limits
8734af2 lib: add buffer tracing to multipart parser
913051b src: add file dump option to multipart test utility
c419539 src: allow specifying custom buffer sizes in multipart testcases
f6e0564 lib: fix handling of empty multipart fields

Fixes: #2816
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 66c8ebfeffcffdcfcdf64888b7685dca26f82ff5)

5 years agoluci-base: show niced processes on Status/Processes page
Hannu Nyman [Sun, 30 Jun 2019 16:57:31 +0000 (19:57 +0300)]
luci-base: show niced processes on Status/Processes page

Modify the process status filter to allow also the processes
with a nice value to be visible on the Status/Processes page.

Filter out the top process itself.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1c80eb196282c7119fd26bc03451f4d6ca3710ac)

5 years agoMerge pull request #2776 from pmelange/18x-freifunk-profiles-dns-server-update
Jo-Philipp Wich [Wed, 19 Jun 2019 08:54:54 +0000 (10:54 +0200)]
Merge pull request #2776 from pmelange/18x-freifunk-profiles-dns-server-update

18.06.x freifunk community-profiles: update profiles to use the new digitalcourage nameservers

5 years agocommunity-profiles: update profiles to use the new digitalcourage nameservers 2776/head
pmelange [Tue, 18 Jun 2019 10:35:18 +0000 (12:35 +0200)]
community-profiles: update profiles to use the new digitalcourage nameservers

The old digitalcourage nameservers 85.214.20.141 and 2a01:238:42f6:ac00:2a29:4f7f:b6d:ef46
will be retired in 2020.  The new nameservers are 46.182.19.48 and 2a02:2970:1002::18.

The change is announced https://digitalcourage.de/support/zensurfreier-dns-server

This fixes https://github.com/freifunk/openwrt-packages/issues/11

This is cherry-picked from https://github.com/freifunk/openwrt-packages/pull/16/commits/2c4a93e646607b0e2a2faa272c985beff52606e1

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agotreewide: fix datetype/datatype typo
Hannu Nyman [Sun, 16 Jun 2019 15:04:18 +0000 (18:04 +0300)]
treewide: fix datetype/datatype typo

Fix the "datetype" typo also in 18.06

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agolucihttp: fix library packaging after 0dd887883
Jo-Philipp Wich [Thu, 24 Jan 2019 11:18:33 +0000 (12:18 +0100)]
lucihttp: fix library packaging after 0dd887883

Adjust ABI_VERSION and install recipes accordingly.

Fixes: 0dd887883 ("lucihttp: update to latest Git HEAD")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c8e95785869ebb2862b524b96568f2ea20ce9b8c)

5 years agoluci-mod-system: fix SimpleForm usage on file editing pages
Jo-Philipp Wich [Wed, 5 Jun 2019 14:01:16 +0000 (16:01 +0200)]
luci-mod-system: fix SimpleForm usage on file editing pages

When a value identical to the stored one is submitted, the CBI framework
will not emit an option write event and therfore not store the value in
the form data dictionary passed to SimpleForm.handle().

This usage pattern usally works be accident for file editor views such
as admin_system/crontab because \r\n windows style line endings are
substituted with unix \n ones before writing the data, defeating the
equality check in CBI.

When a single line without trailing newline is submitted however, the
CBI will not see a difference to the data stored in the file and clear
out the value on subsequent saves.

This commit alignes the logic used by various SimpleForm views to
behave identically and predictable:

 - File data is handled in the SimpleForm.handle() callback
 - The forcewrite property is used to disable equality checks
 - Submission of an empty string empties the backing file

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1c09ee5e42550d6339bffa58d4cba3461948e19c)

5 years agolucihttp: update to latest Git HEAD
Jo-Philipp Wich [Wed, 5 Jun 2019 11:22:15 +0000 (13:22 +0200)]
lucihttp: update to latest Git HEAD

f6e0564 lib: fix handling of empty multipart fields
91c01c3 lib: fix multipart state transition in boundary parsing

Fixes: #2737
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 15608fd2e5283fd6dd3ee4e9bf783029d0cae8c3)

5 years agothemes: don't reset theme on package upgrades
Jo-Philipp Wich [Mon, 3 Jun 2019 14:49:10 +0000 (16:49 +0200)]
themes: don't reset theme on package upgrades

Fixes: #2743
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 5fd071aadbcaa3b136a37fa2cbcb9799b0153e2a)

5 years agoluci-mod-admin-network: fix VLAN "add" button for empty switches
Jo-Philipp Wich [Tue, 7 May 2019 06:54:23 +0000 (08:54 +0200)]
luci-mod-admin-network: fix VLAN "add" button for empty switches

Fixes OpenWrt FS#2270.

Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2270
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6b7afabcdd270a5215a225553dda08e0cd1c5e40)

5 years agoremove artifacts from de3be2388393ed28e44d2714c25eee9b9886e820
pmelange [Wed, 20 Mar 2019 14:38:42 +0000 (15:38 +0100)]
remove artifacts from de3be2388393ed28e44d2714c25eee9b9886e820

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agofreifunk profile_berlin: add default section for 802.11s
pmelange [Fri, 8 Feb 2019 00:49:25 +0000 (01:49 +0100)]
freifunk profile_berlin: add default section for 802.11s

mesh_id is set to "Mesh-Freifunk-Berlin"

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agofreifunk-common: add default configuration for 802.11s interfaces
pmelange [Fri, 8 Feb 2019 00:43:14 +0000 (01:43 +0100)]
freifunk-common: add default configuration for 802.11s interfaces

The defaults are

config 'defaults' 'wifi_iface_80211s'
       option 'mode' 'mesh'
       option 'encryption' 'none'
       option 'mesh_id' 'Mesh-Freifunk'
       option 'mesh_fwding' '0'

The decision for the name of the section can be found here:
https://github.com/freifunk/openwrt-packages/pull/3

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-app-attendedsysupgrade: refactor and format
Paul Spooren [Sun, 24 Feb 2019 21:24:24 +0000 (22:24 +0100)]
luci-app-attendedsysupgrade: refactor and format

* Reuse `request_dict` between requests.
* used vim Autoformat plugin to make the javascript code nice.
* add board_name as it eventually replaces board/model in requests

Signed-off-by: Paul Spooren <mail@aparcar.org>
5 years agoluci-app-attendedsysupgrade: update to new api
Paul Spooren [Tue, 19 Feb 2019 18:12:18 +0000 (19:12 +0100)]
luci-app-attendedsysupgrade: update to new api

there was a major rewrite of the database structure

Signed-off-by: Paul Spooren <mail@aparcar.org>
5 years agoluci-app-nlbwmon: Fixed incorrect period parameter/display 2538/head
Jo-Philipp Wich [Fri, 1 Feb 2019 18:54:32 +0000 (13:54 -0500)]
luci-app-nlbwmon: Fixed incorrect period parameter/display

Switch from using the unreliable string data constructor syntax to
a more explicit year / month / day variant and pass through the
period value as-is in order to ensure that the proper start date
is requested from the backend.

This should fix issues with prevent the display of older data
periods in the nlbwmon gui.

Ref: https://github.com/jow-/nlbwmon/issues/25
Ref: https://github.com/openwrt/luci/pull/2496
Suggested-by: Aktanusa <chanam.geo@yahoo.com>
[squashed commits, add a more thorough commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit bd56c1aac650c9d60d9f66bb0c923b0346f3fa41)

5 years agotreewide: avoid double-escaping CBI section labels
Jo-Philipp Wich [Tue, 12 Feb 2019 07:32:02 +0000 (08:32 +0100)]
treewide: avoid double-escaping CBI section labels

Since the section labels are already HTML-escaped implicitely by the
striptags() function, we must not escape them again in attr() or
ifattr().

Fixes: #2524
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit eda8f02dac3caa4d0f52cd1e860d7a392c295df3)

5 years agoluci-base: dispatcher: support raw values in attr() and ifattr()
Jo-Philipp Wich [Tue, 12 Feb 2019 07:28:21 +0000 (08:28 +0100)]
luci-base: dispatcher: support raw values in attr() and ifattr()

Extend the attr() and ifattr() template functions to take an optional
further parameter indicating that the passed value should not be escaped.

This is needed for cases where the input already is escaped through
other means, e.g. when the value was previously filtered through the
striptags() template helper.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4141243762aafb7960d67f871c97907307005f87)

5 years agoMerge pull request #2504 from aparcar/openwrt-18.06
Hannu Nyman [Sun, 3 Feb 2019 09:46:02 +0000 (11:46 +0200)]
Merge pull request #2504 from aparcar/openwrt-18.06

luci-app-attendedsysupgrade: fixup error_box

5 years agoluci-app-attendedsysupgrade: fixup error_box 2504/head
Paul Spooren [Sun, 3 Feb 2019 00:20:13 +0000 (01:20 +0100)]
luci-app-attendedsysupgrade: fixup error_box

Signed-off-by: Paul Spooren <mail@aparcar.org>
5 years agoMerge pull request #2494 from aparcar/18.06-unify
Hannu Nyman [Sat, 2 Feb 2019 14:09:05 +0000 (16:09 +0200)]
Merge pull request #2494 from aparcar/18.06-unify

18.06: luci-app-attendedsysupgrade: new api, unify status

5 years agoluci-app-attendedsysupgrade: new api, unify status 2494/head
Paul Spooren [Fri, 25 Jan 2019 15:14:46 +0000 (16:14 +0100)]
luci-app-attendedsysupgrade: new api, unify status

to distinguish between installed packages and requested packages, the
API call is now "installed" instead of "packages".

The clients now decide on their own if they want http or https,
therefore the server doesn't reply with full links, only the path.

Add missing variable declarations in JavaScript code

Fix typos in UI strings

Also unify "info_box" and "error_box" to "status_box"

Signed-off-by: Paul Spooren <mail@aparcar.org>
5 years agoluci-mod-rpc: drop "secret" value from rpc session objects
Jo-Philipp Wich [Wed, 30 Jan 2019 15:48:51 +0000 (16:48 +0100)]
luci-mod-rpc: drop "secret" value from rpc session objects

Drop the "secret" value from RPC session objects in order to make them
compatible with ordinary web sessions used by the LuCI web interface.

That secret value was never used for anything and is the only difference
compared to normal LuCI login sessions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 766643fcf18b5710462b88adeabe5e4706ed09cf)

5 years agoluci-app-lxc: add aarch64 to target map
Josef Schlehofer [Tue, 29 Jan 2019 22:04:04 +0000 (23:04 +0100)]
luci-app-lxc: add aarch64 to target map

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit f335624407e4c5c04be0d676010369aa55652798)

5 years agoluci-app-lxc: add i686 to target map
James Buren [Sun, 18 Nov 2018 20:57:37 +0000 (14:57 -0600)]
luci-app-lxc: add i686 to target map
Add i686 to target map so i386 container templates are usable.

Signed-off-by: James Buren <ryuo@ryuo.xyz>
(cherry picked from commit 9630e7e9948b9cce3cba213932aba1895ac15031)

5 years agoluci-base: fix UCI changelog markup mistake
Anton Kikin [Tue, 11 Dec 2018 23:05:59 +0000 (02:05 +0300)]
luci-base: fix UCI changelog markup mistake

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 43c7cb344c6a331d5e52d6869c036ac1afe81480)

5 years agotreewide: rework uci change display
Jo-Philipp Wich [Sat, 4 Aug 2018 20:09:49 +0000 (22:09 +0200)]
treewide: rework uci change display

 - Use native rpcd uci changes format instead of incompletely converting
   back and forth between the old and the new format
 - Rework uci changelog template to print the equivalent uci commands
   for the various changes
 - Rework theme headers to properly count the uncomitted changes
 - Rework theme CSS to properly style new changelog

Fixes: #2170
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 849d153851db2fc193c1c82648dbe719463d3a38)

5 years agoluci-base: fix cbi dropdown quirks with MS Edge
Jo-Philipp Wich [Wed, 17 Oct 2018 05:43:54 +0000 (07:43 +0200)]
luci-base: fix cbi dropdown quirks with MS Edge

On MS Edge, the behaviour of "value" attributes on "li" elements is
unreliable, so use the "data-" prefix to circumvent the problem.

Ref: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/19320991/
Fixes: #2224
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9e6949849d7a34d17a7e43c79038f26a9b98d879)

5 years agoMerge pull request #2451 from pmelange/backport/PR2450-luci_mod-freifunk_basics
Jo-Philipp Wich [Fri, 11 Jan 2019 15:14:56 +0000 (16:14 +0100)]
Merge pull request #2451 from pmelange/backport/PR2450-luci_mod-freifunk_basics

Backport 18.06: luci-mod-freifunk: fix the list of community profiles

5 years agoMerge pull request #2449 from pmelange/backport/PR2448-luci_mod-freifunk_get_all
Jo-Philipp Wich [Fri, 11 Jan 2019 15:14:37 +0000 (16:14 +0100)]
Merge pull request #2449 from pmelange/backport/PR2448-luci_mod-freifunk_get_all

Backport 18.06: luci-mod-freifunk: replace calls to get_all() with separate get() calls

5 years agoluci-mod-freifunk: fix the list of community profiles 2451/head
pmelange [Fri, 11 Jan 2019 12:29:48 +0000 (13:29 +0100)]
luci-mod-freifunk: fix the list of community profiles

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-mod-freifunk: replace calls to get_all() with separate get() calls 2449/head
pmelange [Fri, 11 Jan 2019 11:54:55 +0000 (12:54 +0100)]
luci-mod-freifunk: replace calls to get_all() with separate get() calls

The get_all() function has changed and how it was used before no
longer works properly.  These changes not only change to individual
get() calls, but actually adds to the readability of the code and reduces
file size.

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agotimezone data: update to 2018i
Hannu Nyman [Wed, 2 Jan 2019 19:27:12 +0000 (21:27 +0200)]
timezone data: update to 2018i

Update timezone data to 2018i

http://mm.icann.org/pipermail/tz-announce/2018-December/000053.html
http://mm.icann.org/pipermail/tz-announce/2018-December/000054.html

2018h:
* Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21.
* New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move.
* Metlakatla, Alaska observes PST this winter only.
* Guess Morocco will continue to adjust clocks around Ramadan.
* Add predictions for Iran from 2038 through 2090.

2018i:
* São Tomé and Príncipe switches from +01 to +00 on 2019-01-01.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c7776c8959b1297b03de9eb836edf3a447b0b6fa)

5 years agoMerge pull request #2355 from pmelange/freifunk_backport_18.06
Jo-Philipp Wich [Thu, 6 Dec 2018 23:09:43 +0000 (00:09 +0100)]
Merge pull request #2355 from pmelange/freifunk_backport_18.06

Freifunk-berlin backport 18.06 - OLSR changes and community profiles

5 years agoluci-app-olsr: reenable the "auto refresh" feature 2355/head
pmelange [Sun, 18 Nov 2018 13:26:23 +0000 (14:26 +0100)]
luci-app-olsr: reenable the "auto refresh" feature

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-app-olsr change ccs style to use class "left" instead of "style=text-align:...
pmelange [Sat, 17 Nov 2018 22:40:37 +0000 (23:40 +0100)]
luci-app-olsr change ccs style to use class "left" instead of "style=text-align: left"

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agoluci-app-olsr: make cosmetic changes.
pmelange [Thu, 15 Nov 2018 13:55:42 +0000 (14:55 +0100)]
luci-app-olsr: make cosmetic changes.

modify the status tables so that then headers and columns align, values
left justified.

Additionally, add the openwrt style interface name to the interfaces table,
change huge  ETX numbers to 'infinate', and add the german translation for
'Selected'.

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
5 years agocommunity-profiles: change subnet of mesh_network option for Berlin
Philipp Borgers [Mon, 24 Sep 2018 11:43:51 +0000 (13:43 +0200)]
community-profiles: change subnet of mesh_network option for Berlin

The mesh_network option is used to check the user input. The wizard
checks if the input ip address is part of the mesh_network. We use
multiple /16 networks. There is no support for multiple ranges so we the
10.0.0.0/8.

For reference the ip list:

https://wiki.freifunk.net/IP-Netze

Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
5 years agoget rid of library version numbers in luci olsrd code
Philipp Borgers [Thu, 25 Oct 2018 19:54:42 +0000 (21:54 +0200)]
get rid of library version numbers in luci olsrd code

Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
5 years agocommunity-profiles: create profile for Fürstenwalde
Martin Hübner [Tue, 23 Oct 2018 16:43:58 +0000 (18:43 +0200)]
community-profiles: create profile for Fürstenwalde

New profile for Fürstenwalde. At the moment we use parts of the Berlin-
infrastructure. Thus I have not changed the ip-address-related things.

Signed-off-by: Martin Hübner <martin.hubner@web.de>
[reword and rewrap commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agoluci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin
pmelange [Mon, 5 Nov 2018 15:27:40 +0000 (16:27 +0100)]
luci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>