Commit graph

10095 commits

Author SHA1 Message Date
Stan Grishin
10cdd01378 luci-app-advanced-reboot: show OpenWrt info on compatible NAND routers
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-11-15 16:42:13 -07:00
Jo-Philipp Wich
3961268597 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>
2019-11-15 19:05:05 +01:00
Jo-Philipp Wich
ca98eae724 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>
2019-11-14 11:21:09 +01:00
Jo-Philipp Wich
bc060f931b 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 2e8aa301aa)
2019-11-13 17:10:21 +01:00
Jo-Philipp Wich
ef819b5039 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 8da8f38bf9)
2019-11-13 09:12:30 +01:00
Jo-Philipp Wich
bc17ef673f luci-mod-admin-full: proper SSID escaping in wifi join and iface overview
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-05 14:32:09 +01:00
Yousong Zhou
a32190c0b2 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>
2019-11-04 03:03:13 +00:00
Florian Eckert
50788da24e
Merge pull request #3246 from stangri/18.06-luci-app-vpnbypass
[18.06] luci-app-vpnbypass: bugfix: call to action has no parent node
2019-10-29 06:25:47 +01:00
Stan Grishin
f6bf361ec5 luci-app-vpnbypass: bugfix: call to action has no parent node
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-28 16:35:10 -07:00
Jo-Philipp Wich
9a1a190aee
Merge pull request #3225 from stangri/18.06-luci-app-vpnbypass
[18.06] luci-app-vpnbypass: better service control buttons
2019-10-28 10:14:53 +01:00
Florian Eckert
fbefeed973 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
ca781af2f8 from master branch.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-10-24 09:16:19 +02:00
Florian Eckert
ca781af2f8 luci-app-openvpn: add missing proto param for ipv6
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 18037444b5)
Update commit to apply cleanly
2019-10-23 09:18:39 +02:00
Stan Grishin
205de70600 luci-app-vpnbypass: better service control buttons
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-20 15:42:34 -07:00
Whitronic
ceb1f80710
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 f4212285d4)
2019-10-20 07:34:44 +02:00
Florian Eckert
42c1228875
Merge pull request #3213 from stangri/18.06-luci-app-vpnbypass
[18.06] luci-app-vpnbypass: bugfix: properly restart dnsmasq
2019-10-18 16:58:06 +02:00
Stan Grishin
11421536cd luci-app-vpnbypass: bugfix: properly restart dnsmasq
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-18 07:14:40 -07:00
Florian Eckert
afee71bd60
Merge pull request #3171 from stangri/18.06-luci-app-simple-adblock
[18.06] luci-app-simple-adblock: bugfix: fix invalid <br> entries
2019-10-14 11:36:32 +02:00
Stan Grishin
3b6317db27 luci-app-simple-adblock: bugfix: fix invalid <br> entries
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-10 05:12:33 -07:00
Jo-Philipp Wich
ee38da958a 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 f8c6eb67cd)
2019-10-09 09:57:51 +02:00
Florian Eckert
48f58d9e35
Merge pull request #3138 from stangri/18.06-luci-app-vpnbypass
luci-app-vpnbypass: fix dispatcher bug when VPN node is present
2019-10-02 08:24:47 +02:00
Stan Grishin
4ac8e206e4 luci-app-vpnbypass: fix dispatcher bug when VPN node is present
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-01 18:22:47 -07:00
Hannu Nyman
f8775ee5fe 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 cf887ba62f)
2019-09-28 21:56:44 +03:00
Hannu Nyman
a79659fdda
Merge pull request #3113 from stangri/18.06-luci-app-simple-adblock
[18.06] luci-app-simple-adblock: dnsmasq.ipset option support
2019-09-24 19:30:42 +03:00
Stan Grishin
f72558b55e luci-app-simple-adblock: dnsmasq.ipset option support
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-09-24 09:17:06 -07:00
Hannu Nyman
825daeb199
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
2019-09-20 21:01:58 +03:00
Jo-Philipp Wich
c048f23bad 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 2a143f4777)
2019-09-13 13:24:14 +02:00
Jo-Philipp Wich
14d2f9b216 luci-base: html escape values in uci changes display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7513a4ca35)
2019-09-10 17:20:27 +02:00
Jo-Philipp Wich
ff4c722a21 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 fe0e4f8b4d)
2019-09-10 17:20:27 +02:00
Stan Grishin
c731cc24bb luci-app-vpnbypass: better start/stop controls, create entry in the VPN menu if it exists
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-09-07 10:36:45 -07:00
Dirk Brenken
38f5f4b970
Merge pull request #3027 from stangri/18.06-luci-app-simple-adblock
[18.06] luci-app-simple-adblock: dns resolver value bugfix (#3000)
2019-08-29 15:26:13 +02:00
Stan Grishin
a631579969 luci-app-simple-adblock: dns resolver value bugfix (#3000)
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-29 06:21:35 -07:00
Hannu Nyman
668c820fed
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
2019-08-27 16:55:55 +03:00
Hannu Nyman
924cbef577
Merge pull request #3018 from stangri/18.06-luci-app-simple-adblock
[18.06] luci-app-simple-adblock: delete extra file
2019-08-27 16:54:53 +03:00
Stan Grishin
557988815d luci-app-simple-adblock: delete extra file
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-26 23:18:59 -07:00
Stan Grishin
88e87f6d2c luci-app-advanced-reboot: bugfix for when network.lan.ipaddr is a table
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-26 23:07:49 -07:00
Jo-Philipp Wich
7995ef34b5 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 1aa13ed51e)
2019-08-21 17:50:08 +02:00
Hannu Nyman
cb54693a77
Merge pull request #2991 from stangri/18.06-luci-app-simple-adblock
[18.06] luci-app-simple-adblock: support for varios DNS resolvers/options
2019-08-18 20:14:33 +03:00
Hannu Nyman
4608d789f2
Merge pull request #2988 from stangri/18.06-luci-app-advanced-reboot
[18.06] luci-app-advanced-reboot: support for Linksys EA8300
2019-08-18 20:13:25 +03:00
Stan Grishin
0545392d50 [18.06] luci-app-simple-adblock: support for varios DNS resolvers/options
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-17 06:15:19 -07:00
Stan Grishin
3c25ab8f7b [18.06] luci-app-advanced-reboot: luci-app-advanced-reboot: support for Linksys EA8300
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-17 04:29:16 -07:00
Jo-Philipp Wich
44683453b9 protocols: fix contains_interface() implementation in several backends
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fc8d021ed)
2019-08-06 15:21:17 +02:00
Jo-Philipp Wich
0cbc51f297 luci-lib-ip: support specifying source address in route()
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d73553e530)
2019-08-06 15:21:17 +02:00
Jo-Philipp Wich
89e029c59f luci-base: index.html: add extend cache-control directive
Fixes: #2942
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1fe45a9344)
2019-08-01 15:44:52 +02:00
xiongjie
44efaf5777 luci-base: redirect root path to /cgi-bin/luci/
Fix openwrt/luci#1062
Signed-off-by: MonwF <boluo2@gmail.com>
(cherry picked from commit fd3d2b468f)
2019-08-01 15:44:51 +02:00
Jo-Philipp Wich
28ab21dd8d 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>
2019-07-26 12:46:39 +02:00
Jo-Philipp Wich
a388be0f28 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 1b2065d0be)
2019-07-19 21:04:34 +02:00
Hannu Nyman
35357e4e41
Merge pull request #2841 from stangri/18.06-luci-app-advanced-reboot
[18.06] luci-app-advanced-reboot: fix README url in Makefile
2019-07-09 18:26:54 +03:00
Stan Grishin
0dab6af45a [18.06] luci-app-advanced-reboot: fix README url in Makefile
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-07-08 12:43:38 -07:00
Anton Kikin
9c5162d596 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 5d26fec0bf)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-08 18:24:38 +02:00
Hannu Nyman
7d8df17dfa
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
2019-07-07 08:53:14 +03:00