Merge pull request #3794 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: better status/error display, better service control

luci-app-simple-adblock: better status/error display

Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-base: iface_get_network(): fix condition

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

luci-base: iface_get_network(): fix condition

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

luci-base: cbi.js: fix unintended number sign overflow in format

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

Merge pull request #3423 from stangri/18.06-luci-app-https-dns-proxy

[18.06] luci-app-https-dns-proxy: package name change, support for RFC8484 binary

luci-app-https-dns-proxy: package name change, support for RFC8484 binary

Signed-off-by: Stan Grishin <stangri@melmac.net>

i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #3368 from stangri/18.06-luci-app-advanced-reboot

luci-app-advanced-reboot: better information for snapshots

luci-app-advanced-reboot: better information for snapshots

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3338 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: add logger messages, README update

luci-app-advanced-reboot: add logger messages, README update

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3335 from stangri/18.06-luci-app-advanced-reboot

[18.06] luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors

luci-app-advanced-reboot: bugfix: luci error on reboot, logger errors

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

Merge pull request #3313 from stangri/18.06-luci-app-advanced-reboot

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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>

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>

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)

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)

luci-mod-admin-full: proper SSID escaping in wifi join and iface overview

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

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>

Merge pull request #3246 from stangri/18.06-luci-app-vpnbypass

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3225 from stangri/18.06-luci-app-vpnbypass

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

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>

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

luci-app-vpnbypass: better service control buttons

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

Merge pull request #3213 from stangri/18.06-luci-app-vpnbypass

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

luci-app-vpnbypass: bugfix: properly restart dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3171 from stangri/18.06-luci-app-simple-adblock

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

Merge pull request #3138 from stangri/18.06-luci-app-vpnbypass

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

Merge pull request #3113 from stangri/18.06-luci-app-simple-adblock

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

luci-app-simple-adblock: dnsmasq.ipset option support

Signed-off-by: Stan Grishin <stangri@melmac.net>

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

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)

luci-base: html escape values in uci changes display

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

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)

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #3027 from stangri/18.06-luci-app-simple-adblock

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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

Merge pull request #3018 from stangri/18.06-luci-app-simple-adblock

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

luci-app-simple-adblock: delete extra file

Signed-off-by: Stan Grishin <stangri@melmac.net>

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

Merge pull request #2991 from stangri/18.06-luci-app-simple-adblock

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

Merge pull request #2988 from stangri/18.06-luci-app-advanced-reboot

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

protocols: fix contains_interface() implementation in several backends

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

luci-lib-ip: support specifying source address in route()

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

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)

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)

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>

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)

Merge pull request #2841 from stangri/18.06-luci-app-advanced-reboot

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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>

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

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)

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)

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

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

Signed-off-by: Stan Grishin <stangri@melmac.net>

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)

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)

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)

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

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>

treewide: fix datetype/datatype typo

Fix the "datetype" typo also in 18.06

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

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)

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)

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)

themes: don't reset theme on package upgrades

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

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)

remove artifacts from de3be2388393ed28e44d2714c25eee9b9886e820

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

freifunk profile_berlin: add default section for 802.11s

mesh_id is set to "Mesh-Freifunk-Berlin"

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

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>

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>

luci-app-attendedsysupgrade: update to new api

there was a major rewrite of the database structure

Signed-off-by: Paul Spooren <mail@aparcar.org>

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)

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)

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)

Merge pull request #2504 from aparcar/openwrt-18.06

luci-app-attendedsysupgrade: fixup error_box

luci-app-attendedsysupgrade: fixup error_box

Signed-off-by: Paul Spooren <mail@aparcar.org>

Merge pull request #2494 from aparcar/18.06-unify

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

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>

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)

luci-app-lxc: add aarch64 to target map

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

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)

luci-base: fix UCI changelog markup mistake

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

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)