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)

luci-mod-status: refactor luci-bwc

 - Read interface statistics from /sys/class/net/
 - Discover all wireless interfaces, not just specifically named ones

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

luci-theme-material: fix apply dropdown color

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

luci-theme-*: remove modal max-height #3383 v2

Signed-off-by: MartB <mart.b@outlook.de>
(cherry picked from commit c6122af7ea9918439abc20c32603197045259b27)

luci-theme-bootstrap: add CSS fixes for tooltip elements

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

luci-base: form.js: add a new "contains" dependency mode

By tagging option dependencies with `!contains`, dependencies are
considered satisfied when the value is contained in the value of
a related field, instead of being equal to it.

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

luci-base: form.js: don't stringify node arguments in CBIValue.value()

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

luci-base: ui.js: support clearChoices()/addChoices() for DynLists

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

luci-base: ui.js: use placeholder as select placeholder in DynLists

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

luci-base: ui.js: properly handle rich choices in Dropdowns, DynLists

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

luci-base: fs.js: properly escape arguments in exec_direct()

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

luci-base: fs.js: add read_direct() and exec_direct() functions

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

luci-base: cbi.js: collapse whitespace before language string hashing

To mirror the behavior of the Lua runtime, we need to collapse whitepace
in translation source strings before doing the string table lookup.

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

luci-base: add system cert bundle detection

Add detection mechanism for system cert CA bundle installed by the
ca-bundle package. Used by LuCI to detect whether the "Use system
certificates" certificate validation option should be enabled.

Signed-off-by: David Lam <david@thedavid.net>
(cherry picked from commit 27b21c2a6262a8c383c783e98320746f22fe8f6f)

luci-app-travelmate: bugfix add/editing WPA3 uplinks

* see forum post
https://forum.openwrt.org/t/travelmate-support-thread/5155/318

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 9ca877e08e6d23f76751fff8c458e1985bebb1f7)

luci-app-vpn-policy-routing: styling bugfix

Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit 87b9fabc89445564e23aa983b74f0a720ce0312a)

luci-proto-modemmanager: drop package

The corresponding modemmanager package is not available in 19.07.

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

luci-theme-bootstrap: fix invalid dropdown state styling

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

luci-base: form.js: fix immediate validation of activated options

When form options are activated because their dependencies are satisified,
ensure that an immediate validation is triggered to highlight potential
errors without having the user to activate another form control first.

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

treewide: i18n - sync translations

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

Merge pull request #3493 from stangri/19.07-luci-app-advanced-reboot

[19.07] luci-app-advanced-reboot: pluggable device files, highlight current partition

luci-app-advanced-reboot: pluggable device files, highlight current partition

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

build: sort location annotation table in i18n sync process

The scanning routine has caused unnecessary changes to the .po files
if a string has been found in multiple files and those files have been
found in different order than the previous time.

Sort the location annotations to avoid unnecessary changes to the .po files.
(sort is alphabetic, so the line numbers are also sorted alphabetically)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[apply a Schwartzian transform to sort locations by path, then line number]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 460bdfe814a34ca5300e7a1a57efecff590dd414)

Merge pull request #3468 from urbalazs/translation-backport-19.07-20200105

i18n: backport translations from master branch

i18n: backport translations from master branch

Signed-off-by: Balázs Úr <balazs@urbalazs.hu>

Merge pull request #3459 from Andy2244/luci-app-smbd-rename-(19.07)

[19.07] luci-app-smbd: rename change cifsd->smbd

luci-app-firewall: fix zone network default

When a `config zone` section lacks an `option network` or `list network`
setting, its contained interface list defaults to the name of the zone,
e.g. a zone named `foo` will implicitely contain the network `foo` unless
a deviating or empty `option network` is specified.

Adjust the zones.js model accordingly to reflect that implicit default.

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

luci-app-smbd: rename change cifsd->smbd

* update for name change cifsd->smbd
* add version code for: kmod, usmbd
* regen translations
* update acl's

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

Merge pull request #3456 from stangri/19.07-luci-app-vpn-policy-routing

luci-app-vpn-policy-routing: add note about default routing

luci-app-vpn-policy-routing: add note about default routing

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

Merge pull request #3447 from stangri/19.07-luci-app-vpn-policy-routing

[19.07] luci-app-vpn-policy-routing: initial release

luci-app-vpn-policy-routing: initial release

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

luci-app-firewall: update rule ip hints based on address family

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

luci-base: form.js: implement AbstractValue.getUIElement()

Introduce a new method `getUIElement()` which simplifies obtaining the
underlying per-section UI widget class instance for a from option object.

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

luci-base: ui.js: implement UIDropdown.{add,clear}Choices()

The new `addChoices()` and `clearChoices()` functions allow clearing and
adding new options to existing dropdown instances respectively.

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

luci-base: ui.js: expose UIElement class as AbstractElement

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

Merge pull request #3439 from urbalazs/translation-backport-19.07-20191227

i18n: backport translations from master branch

luci-app-firewall: store week- and monthday restrictions as strings

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

i18n: backport translations from master branch

Signed-off-by: Balázs Úr <balazs@urbalazs.hu>

luci-theme-bootstrap: fix background of large modal overlays.

Signed-off-by: MartB <mart.b@outlook.de>
(cherry picked from commit 7f9eb4638b0fa5d7b08270b232bb6bbe13b2e570)

i18n: sync translations

Sync translations.

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

Merge pull request #3422 from stangri/19.07-luci-app-https-dns-proxy

[19.07] 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>

ocserv: fix the public key ID calculation

New versions of certtool change its output format and thus break
the previous parsing. This update works with certtool 3.5.x or later.
It also restricts the output to valid values for openconnect 7.x or
later for simplification.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
(cherry picked from commit c81ca8dae3e914b41b754e1cdc7cad3aeead9e66)

luci-mod-network: dhcp.js: fix default state of nonwildcard

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

luci-mod-network: fix rebind list validation

Fixes: 62e28f4b0 ("luci-mod-network: dhcp.js: fix address and rebind list validation")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3cdd4969466de7efd2cfe0534119acdc6f35218e)

luci-mod-network: dhcp.js: fix address and rebind list validation

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

luci-mod-network: re-add DHCPv6 lease status to dnsmasq page

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

luci-lib-httpclient: accept scoped IPv6 addresses

Ref: https://github.com/openwrt/luci/issues/3380
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d87169c0f60f9e7c1f8a61b2809473802093ff31)

luci-lib-ip: support scoped IPv6 addresses

Ref: https://github.com/openwrt/luci/issues/3380
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f7a7f89e0ce324115098f4496e3e72d8bb63613a)

luci-base: ui.js: ensure that select choice labels are properly escaped

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

luci-base: ui.js: properly escape dynlist items for rendering

Ref: https://forum.openwrt.org/t/luci-theme-openwrt-reports-error/49736
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ee360669474ddc7d94dd2853b2411da929fb5593)

luci-app-statistics: update misleading load view

Fixes: #3301

During my tests and developing with the collectd and so
luci-app-statistics I noticed that the values displayed in the Y-axis
are misleading, because probably the individual values are added
together in each case. So the view is not corrected.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit b50974a20c9dac0d6b8b479d2e6b54b3c5703ab6)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

i18n: sync translations

Sync translations.

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

Merge pull request #3367 from stangri/19.07-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>

luci-base: luci.js: further nested Class.super() call fixes

Use stacks keyed by class id + symbol internally to not clobber the
prototype scope pointer when repeatedly calling super() in invoked
methods.

Ref: https://github.com/openwrt/luci/issues/3316#issuecomment-558531111
Fixes: 374c23cda ("luci-base: luci.js: properly handle nested Class.super() calls")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4a08fdd2d374083366787c4124e6b4de48bf7b77)

luci-base: luci.js: properly handle nested Class.super() calls

Introduce a unique __id__ attribute per class and use that, together with
the symbol name being looked up to, to form a unique key which is used to
store the prototype scope pointer.

This fixes cases where a call to super() invokes a procedure which is
calling super() as well on a different class or symbol.

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

Merge pull request #3359 from Andy2244/luci-app-cifsd_fix-defaults_19.07

luci-app-cifsd: fix defaults (none writeable default shares) [19.07]

Merge pull request #3361 from Andy2244/luci-app-samba4_fix-defaults_19.07

luci-app-samba4: fix defaults (none writeable default shares) [19.07]

luci-app-samba4: fix defaults (none writeable default shares)

* align defaults with upstream
* mark our default UCI changes and enforce updates to config

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

luci-app-cifsd: fix defaults (none writeable default shares)

* align defaults with upstream
* mark our default UCI changes and enforce updates to config

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

Merge pull request #3346 from Andy2244/luci-app-samba4_switch-js-api_19.07

uci-app-samba4: switch to luci static javascript api [19.07]

Merge pull request #3339 from Andy2244/cifsd-19.07

luci-app-cifsd: enable cifsd app [19.07]

uci-app-samba4: switch to luci static javascript api

* switch to luci static javascript api
* add version info
* remove 'home' option
* regenerate translations

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

luci-app-cifsd: enable cifsd app

* enable luci cifsd app
* add version info
* enable guest ok default
* refresh translations

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

luci-base: luci.js: add optional apply unchecked action

Turn the "Save & Apply" button into a combo button which allows to
toggle between apply with rollback and unchecked apply modes.

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

themes: add necessary styles for ComboButton

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

luci-base: ui.js: add ComboButton widget

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

luci-theme-bootstrap: allow textarea resizing

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

luci-app-firewall: remove obsolete "conntrack" option

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

luci-base: validation.js: fix "unique" validator

Previous refactoring renamed the "data-type" attribute of widget markup
containers to "data-widget", breaking the "unique" validator as it relies
on it to lookup options.

Fixes: #3341
Fixes: 13e9e3e9e ("treewide: fix "Unhandled token" errors with Lua CBI maps")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4f0d67a2897d6592cb0f7562fa042dd4987fd7eb)

Merge pull request #3337 from stangri/19.07-luci-app-advanced-reboot

[19.07] 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 #3334 from stangri/19.07-luci-app-advanced-reboot

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