luci-mod-network: add WPA3-EAP and mixed WPA2/WPA3-EAP settings

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

luci-app-firewall: use Firewall.removeZone() helper

Fixes: FS#2932
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2932
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ff4dc822b62bdc4abc925a2d1a6b8641defa98a)

luci-base: firewall.js: fix Firewall.removeZone()

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

Merge pull request #3777 from aparcar/noci-19

[19.07]CI: remove circleci

CI: remove circleci

LuCI packages are mostly architecture independent and therefore require
no compile checks.

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

Merge pull request #3763 from oofnikj/openwrt-19.07

add ipv6 firewall view

luci-app-statistics: add ipv6 firewall view

Signed-off-by: Jordan Sokolic <oofnik@gmail.com>

luci-theme-rosy: mark as broken

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

themes: ensure that data-page attribute is escaped

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

Revert "luci-base: require minimum versions of rpcd and cgi-io"

This reverts commit fb679333a5c0dbba66809559dac2badbc7dcba04.

Version constraints are not correctly handled by luci-app-opkg.

Ref: https://forum.openwrt.org/t/something-changed-luci-compat/56959/5
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Revert "luci-base: move unused tools.webadmin class to luci-compat"

This reverts commit a22e8bc2e5ce44e0bc20368c6b5cb303a95e8999.

Moving the class file causes too much churn in stable due to the
need to upgrade luci-base for legacy apps.

Ref: #3726
Ref: https://forum.openwrt.org/t/package-install-issues/57010
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-firewall: tools.firewall: properly handle protocol 0

The existing code failed to anticipate that '' == 0 in JS.

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

luci-base: require minimum versions of rpcd and cgi-io

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

luci-base: move unused tools.webadmin class to luci-compat

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

luci-theme-bootstrap: fix overview wireless display quirks

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

luci-mod-status: don't drop lines with negated addresses

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

luci-mod-status: routes.js: remove debug code

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

luci-mod-status: reimplement route status page as client side view

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

luci-mod-status: reimplement log pages as client side views

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

luci-mod-status: reimplement iptables status page as client side view

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

luci-mod-status: replace iptables controller actions with cgi-io calls

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

luci-mod-network: replace controller address check action with cgi-io script

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

luci-mod-network: reimplement diagnostics page as client side view

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

luci-base: fs.js: exec_direct(): add ability to encode command as latin1

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

luci-base: fs.js: support Blob/JSON in read_direct() and exec_direct()

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

luci-base: luci.js: allow overriding response type for requests

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

luci-base: remove hardcoded cgi-bin path

Currently LuCI can be loaded only when placed in the root of the server as the cgi-bin path are hardcoded. Change the index.html to load the cgi-bin path from the current level.
Also add a new entry in the env Object to make the cgi_base path easily accessible.
This variable will be based on the position of /cgi-bin/luci.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 5e6ec8562fe828934ef835490cee405653b06d3a)

treewide: resync and merge master translations

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

luci-base: fix typos

Signed-off-by: Balázs Úr <balazs@urbalazs.hu>
(backported from commit d0bc86bcc3fc0c6668e04601344daa956cea2b32)

luci-proto-wireguard: remove peer sections when deleting interface

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

luci-base: network.js: gracefully handle deleteConfiguration() rejects

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

luci-base: network.js: add Protocol.deleteConfiguration() callback

Add a new Protocol.deleteConfiguration() callback function which can be
overridden by protocol handler to perform additional cleanup tasks, such
as unsetting related uci entries which are not part of the interface
configuration itself.

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

luci-app-adblock: Fix enter key submitting form but not showing any results.

Signed-off-by: Stefan Sundin <git@stefansundin.com>
(cherry picked from commit 872693761117238aa5caff0408612a7467bb6a89)

luci-app-firewall: don't treat zone name as network fallback

Drop obsolete extra logic which treats the zone name as covered network
name in case the network list is unset. This behaviour applied to the
pre-fw3 uci firewall, but is not supported since fw3 anymore.

Ref: https://forum.openwrt.org/t/luci-zone-creation-bug/55921
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 663134cd2d6b9603d69f59665715586f77f4610a)

luci-base: firewall.js: don't treat zone name as network fallback

Drop obsolete extra logic which treats the zone name as covered network
name in case the network list is unset. This behaviour applied to the
pre-fw3 uci firewall, but is not supported since fw3 anymore.

Ref: https://forum.openwrt.org/t/luci-zone-creation-bug/55921
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4052436d825e1e78d1734ddd4d06d2291fbc5684)

luci-mod-network: switch.js: fix internal port ordering

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

rpcd-mod-luci: use correct dlopen() flags

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

luci-app-minidlna: fix service check

The service process was renamed from `minidlna` to `minidlnad`.

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

treewide: merge master translations

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

luci-app-opkg: gracefully handle empty config files

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

luci-mod-status: hide DHCP status if dnsmasq/odhcpd aren't present

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

luci-app-firewall: snats.js: fix rewrite IP validation for SNAT target

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

treewide: resync and backport translations

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

luci-mod-network: wifi join: allow reclaiming empty wwan networks

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

luci-mod-network: wifi join: add option to lock bssid

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

luci-mod-network: wifi scan: add button to start/stop refreshes

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

luci-mod-network: explicitely configure "none" encryption in wifi join

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

luci-mod-network, luci-mod-status: harmonize wifi signal indicators

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

Merge pull request #3622 from Andy2244/luci-app-ksmbd_new-UCI-(19.07)

[19.07] luci-app-ksmbd: support new UCI option, update for 3.2.1 version

luci-app-ksmbd: support new UCI option "allow_legacy_protocols"

* support new UCI option "allow_legacy_protocols"

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

luci-app-ksmbd: update for 3.2.1 version (usmbd -> ksmbd.mountd)

* update for 3.2.1 version (usmbd -> ksmbd.mountd)

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

Merge pull request #3621 from Andy2244/luci-app-samba4_new-UCI-(19.07)

[19.07] luci-app-samba4: add support for new UCI option

luci-app-samba4: add support for new UCI option

* add support for new UCI option "allow_legacy_protocols"

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

luci-base: cbi.js: avoid double-initialization of dropdowns

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

luci-base: luci.js: L.dom.data(): gracefully handle non-node argument

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

treewide: merge master translation updates

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

luci-base: form.js: pass section_id to Button onclick handler

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

luci-base: form.js: ButtonValue: pass sid as first onclick argument

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

rpcd-mod-luci: honour dhcp leases without ip address for host hints

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

luci-base: extend rollback timeout to 90 seconds

Ref: #3628
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 81cf99a50706a75a2259296e4aab3f7b3bf5d54e)

luci-lib-ip: explicitly clear scope when allocating new userdata

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

luci-base: validation.js: fix integer and float type validation

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

luci-mod-network: dhcp.js: fix resolvefile option depends

Ref: https://forum.openwrt.org/t/resolvfile-option-not-showing/54229
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5d15363408d263fccae90b3b7ab0ebac6329eebb)

luci-app-advanced-reboot: fix faulty ip.new() invocation

Ref: https://github.com/openwrt/luci/issues/3587#issuecomment-580044459
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6638de5f626a639169ee354bd4d1e99747c8a1c4)

treewide: switch to bcp47 language codes

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

luci-app-advanced-reboot: properly handle multiple or missing lan IPs

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

luci-base: add another magic security attribute to the sysauth cookie

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

luci-mod-system: fix zram compression placeholder

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

luci-base: make swconfig port state parsing more robust

Since swconfig output varies wildly among different switch drivers, rely
on a simpler more robust parsing approach to find the required information.

Ref: https://forum.openwrt.org/t/cannot-read-property-link/50766
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6d59a6400ed055d71e0b335679d291c22bbdbd40)

luci-mod-network: handle missing switch port state information

Ref: https://github.com/openwrt/luci/issues/3565
Ref: https://forum.openwrt.org/t/cannot-read-property-link/50766
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 616d44c155ae2b4f19e8b2645744a107e38a56c7)

treewide: sync and merge master translations

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

build: add script to merge master translation into branches

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

build: i18n-scan.pl: use xgettext to extract message strings

Using xgettext has a few benefits compared to the previous perl extraction
approach. The xgettext utility is able to properly distinguish commented
from uncommented code and it is able handle concatenated constant
expressions such as `_("Some " + "string")`.

A further benefit is the ability to extract translations with disambiguation
contexts and plural translation calls.

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

build: i18n-scan.pl: support extracting translations from menu json

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

luci-proto-openconnect: explicitely escape slashes in regex literals

The unespaced slashes confuse xgettext and likely other source
scanners as well.

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

luci-proto-wireguard: explicitely escape slashes in regex literals

The unespaced slashes confuse xgettext and likely other source
scanners as well.

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

luci-app-firewall: fix variable clash leading to incorrect family display

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

luci-app-firewall: add SNAT config migration

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

luci-app-firewall: rework rule descriptions, deduplicate code

Use a simple custom format string DSL to assemble the rule description
texts in the overview page.

Also move common code for shared, complex cbi options to the firewall
tool class.

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

luci-app-firewall: consolidate duplicate option code

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

luci-app-firewall: support 'limit' and 'limit_burst' options

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

luci-app-firewall: support 'DSCP' action and matches for rules

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

luci-app-firewall: support 'MARK' action and matches for rules

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

luci-app-firewall: support 'mark' parameter for redirects

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

luci-app-firewall: support 'helper' and 'reflection_src' parameters for redirects

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

luci-app-firewall: support 'helper' and 'set_helper' parameters for rules

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

luci-app-firewall: support 'direction' and 'device' parameters for rules

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

luci-app-firewall: fix family display for port forwards

The underlying fw3 program currently only does IPv4 port forwards while
LuCI incorrectly reports IPv4 + IPv6 for each forward. Adjust the text
accordingly to fix this.

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

luci-app-firewall: introduce support for "config nat" sections

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

luci-base: add L.media() URL construction helper

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

Merge pull request #3578 from Andy2244/luci-app-smbd-rename_luci-app-ksmbd-(19.07)

[19.07] luci-app-smbd: rename to luci-app-ksmbd

luci-app-smbd: rename to luci-app-ksmbd

* follow upstream name change to ksmbd
* remove old artifacs from "applications\luci-app-cifsd\po\"

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

i18n: fix locale codes (nextdns, vpn-policy-routing)

Fix Chinese locale codes for luci-app-nextdns and luci-app-vpn-policy-routing

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

treewide: i18n - sync translations

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

luci-mod-system: remove abbreviation from LED config menu item

Remove the abbreviation coding from the menu item, as it does nor work
in menu and seems to prevent translation of the menu item.

(This was the only menu item in LuCI that had abbr logic.)

Reference to #3553

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

luci-lib-ip: explicitly initialize address scope value

Explicitly initialize the address scope value to zero in parse_cidr() and
L_setaddr() to avoid stray scope identifiers getting added when formatting
the address object as string.

Fixes: 1d2b4c777 ("luci-lib-ip: support scoped IPv6 addresses")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5cbbfaba3e2935b61b42fe339e78b3ff300c1619)

luci-theme-material: fix button position on modal save

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 71743a7ef69e9ffdf890bf895d704ecc0648548b)

luci-app-openvpn: allow and restrict file uploads to /etc/openvpn/

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

luci-compat: upload.htm: expose root_directory and initial_directory

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

luci-base: ui.js: UIFileUpload fixes

 - Introduce a new option `initial_directory` which describes the initial
   directory to display when nothing is selected, default to the root
   directory

 - Prevent stray legacy cbi reloads when deselecting files

 - Fix within-root-directory-check for initial rendering

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