Commit graph

12464 commits

Author SHA1 Message Date
Stan Grishin
86a3625348
Merge pull request #5218 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: update to 2021-07-29-1
2021-08-03 22:14:31 -07:00
Stan Grishin
e259f12211 luci-app-https-dns-proxy: update to 2021-07-29-1
* add HTTP/2-only supporting providers: Mullvad, Digitale-Gesellschaft, dns.sb and Rubyfish.cn
* switch default provider from Google to Cloudflare
* add IPv6 addresses for bootstrap resolvers for Google DNS
* add secondary bootstrap resolver (Cloudflare's) to all providers with a single bootstrap resolver
* modify model/cbi file to show HTTP/2-only providers (and help texts) on HTTP/2-supporting systems

Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-07-31 10:58:13 +00:00
Ansuel Smith
7b931da477 luci-mod-network: handle multiple mac for static lease
The mac section for the static lease doesn't correctly handle when multiple mac are set for a rule.
Fixes: #4291

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 6c9a6c334e)
2021-07-08 08:27:20 +02:00
Paul Spooren
9eb2efd141 luci-app-attendedsysupgrade: sync with master branch
Upgrade the app to stay compatible with the running upgrade server.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2021-07-04 18:11:06 -10:00
Hauke Mehrtens
15ca915da9 themes: Call striptags() on hostname to prevent XSS
This calls striptags() on the hostname to prevent any XSS over the
hostname. This should fix CVE-2021-33425 as far as I understood it.

If someone adds some Javascript into system.@system[0].hostname it would
have been directly added to the page, this prevents the problem.

This can only be exploited by someone being able to modify the uci
configuration, normally a user with such privileges could also just
modify the webpage.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 5cbd79d7e3)
2021-06-09 21:07:45 +02:00
Hannu Nyman
91f3929500 treewide: i18n - Backport translations from master
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-06-08 20:03:35 +03:00
Jo-Philipp Wich
d0cf6e4a57 luci-mod-status: fix potential XSS via specially crafted DNS names
When an upstream NS returns PTR domain names containing HTML, it is
added verbatim to the connection status table.

Prevent this issue by HTML escaping any values in the source and
destination columns.

Fixes: CVE-2021-32019
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3c66c5b165)
2021-05-12 12:03:19 +02:00
Hannu Nyman
ec81a49945 treewide: backport translations i18n
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-08 17:09:09 +03:00
Hannu Nyman
c19c7167e3 treewide: i18n - Backport translations
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-17 19:09:12 +03:00
Jo-Philipp Wich
d763f9767e luci-base: form.js: fix AbstractValue.textvalue() for uci list options
Serialize the uci list value into a space separated string before passing
it to String.format() for HTML escaping. Without that change, empty strings
were returned whenever the underlying uci get operation yieled an array.

Fixes: #4993
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5c792aefc7)
2021-04-16 17:33:04 +02:00
Ptilopsis Leucotis
5b28343fbe [19.07] luci-app-fwknopd: add support for ENABLE_CMD_EXEC
Add support for execution commands on the fwknopd server.

Signed-off-by: Ptilopsis Leucotis <PtilopsisLeucotis@yandex.com>
2021-04-14 10:17:39 +03:00
Stan Grishin
c56d9f2f58
Merge pull request #4976 from stangri/19.07-luci-app-simple-adblock
[19.07 luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
2021-04-11 09:38:53 -07:00
Stan Grishin
bf1b37b0c2 luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-04-10 18:45:11 +00:00
Henrique de Moraes Holschuh
254083c17c luci-mod-system: implement system.description, system.notes
Implement two new text "options" for UCI system config, intended to
help humans describe the device.

"system.description" is a short, single-line description suitable for
selector UIs in remote administration applications, or remote UCI (over
ubus RPC), etc.  It would also be suitable as a default for LLDP/SNMP
"system description".

"system.notes" is a multi-line, free-form text field that can be used in
any way the user wishes, e.g. to hold installation notes, or unit serial
number and inventory number, location, etc.

Signed-off-by: Henrique de Moraes Holschuh <henrique@nic.br>
2021-04-06 23:21:46 +03:00
Hannu Nyman
7456e2aada treewide: Backport translations and sync
Backport from master and sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-03-27 11:05:01 +02:00
Jo-Philipp Wich
41ab871af0 luci-app-opkg: fix parsing empty package repository indexes
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3bcbcbf088)
2021-03-20 17:16:20 +01:00
Hannu Nyman
731d2e37d4 treewide: i18n backport and sync
Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-03-13 09:45:36 +02:00
Stan Grishin
55da49fe80
Merge pull request #4908 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: explicit package version
2021-03-12 19:06:27 -08:00
Stan Grishin
b1ddaa662c
Merge pull request #4905 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: explicit package version
2021-03-12 19:06:10 -08:00
Stan Grishin
67dcd1c2d0
Merge pull request #4902 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: explicit package version
2021-03-12 19:05:50 -08:00
Stan Grishin
0f30222997
Merge pull request #4899 from stangri/19.07-luci-app-advanced-reboot
[19.07] luci-app-advanced-reboot: explicit package version
2021-03-12 19:05:31 -08:00
Florian Eckert
b4025cf242
Merge pull request #4844 from oofnikj/4510_backport_gre
luci-proto-gre: backport to 19.07
2021-03-11 08:04:23 +01:00
Stan Grishin
bad5bf8f2c luci-app-vpn-policy-routing: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:21:35 +00:00
Stan Grishin
2aebe454e7 luci-app-simple-adblock: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:20:22 +00:00
Stan Grishin
e28381b0bb luci-app-https-dns-proxy: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:19:28 +00:00
Stan Grishin
57d4c965e2 luci-app-advanced-reboot: explicit package version
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-10 15:10:57 +00:00
Stan Grishin
310f532e26
Merge pull request #4884 from stangri/19.07-luci-app-https-dns-proxy
[19.07] luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020
2021-03-09 20:35:34 -08:00
Stan Grishin
88e19b940d
Merge pull request #4887 from stangri/19.07-luci-app-simple-adblock
[19.07] luci-app-simple-adblock: bugfix: template layout on theme-openwrt-2020
2021-03-09 20:35:15 -08:00
Stan Grishin
193f40d30c
Merge pull request #4890 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: bugfix: template layout on theme-openwrt-2020
2021-03-09 20:34:56 -08:00
Stan Grishin
c079f601e3 luci-app-vpn-policy-routing: bugfix: template layout on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:49:09 +00:00
Stan Grishin
3b2180b500 luci-app-simple-adblock: bugfix: template layout on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:46:43 +00:00
Stan Grishin
8d6189614d luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:42:18 +00:00
Stan Grishin
a607f9c5c8
Merge pull request #4871 from stangri/19.07-luci-app-vpn-policy-routing
[19.07] luci-app-vpn-policy-routing: sync with principal app
2021-03-03 13:18:09 -08:00
Stan Grishin
ce2452e6e5 luci-app-vpn-policy-routing: sync with principal app
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-03 21:17:01 +00:00
Jo-Philipp Wich
c3db6905c3 luci-app-firewall: allow negative prefix lengths
Fixes: #4812
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f64b3d5094)
2021-03-01 15:19:21 +01:00
Jo-Philipp Wich
a483ae4371 luci-base: validation.js: optionally support negative prefixes
Support negative prefix length in the `cidr`, `cidr4`, `cidr6`, `ipmask`,
`ipmask4` and `ipmask6` data types when an optional truish flag is passed
to the datatype name.

Ref: #4812
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cd06e708d8)
2021-03-01 15:19:21 +01:00
Jo-Philipp Wich
ee07c30207 luci-base: network.js: sort interface statuses by metric, then name
Fixes: #4693
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ee422b4c0)
2021-03-01 10:44:06 +01:00
Sergio E. Nemirowski
89c7b8ab0b luci-proto-gre: update i18n and fix typo
Signed-off-by: Sergio E. Nemirowski <sergio@outerface.net>
Signed-off-by: Jordan Sokolic <oofnik@gmail.com>
2021-03-01 11:04:52 +02:00
Jo-Philipp Wich
0e5057cbbb luci-app-firewall: zones.js: fix HTML display in ct helper selection
Fixes: #4845
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 154117ff05)
2021-03-01 09:14:07 +01:00
Jo-Philipp Wich
8bba34de87 luci-app-firewall: fix creating multiple networks from zone network selector
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5d528da29f)
2021-03-01 08:56:25 +01:00
Jo-Philipp Wich
5e807edb23 luci-base: firewall.js: manage zomne networks as list
Fixes: #4827
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 49ecaf6090)
2021-03-01 08:56:25 +01:00
Niels Widger
97847023fd rpcd-mod-luci: Fix parsing of DUID-LLT's in duid2ea
Fix parsing of DUID-LLT's in duid2ea.  Unlike DUID-LL's, DUID-LLT's have a 32-bit time field between the hardware type and link-layer address fields, see RFC 3315 Sections 9.2 and 9.4:

https://tools.ietf.org/html/rfc3315#section-9.2
https://tools.ietf.org/html/rfc3315#section-9.4

therefore, the link-layer address starts at offset 16 instead of 8.

Signed-off-by: Niels Widger <niels@qacafe.com>
(cherry picked from commit 8920a2bf71)
2021-03-01 08:56:25 +01:00
Chuanhong Guo
2201f77c27 luci-proto-gre: remove extra parenthesis
fix the following error:
SyntaxError
Unexpected token ')'
  in http://192.168.122.131/luci-static/resources/protocol/grev6.js:?
  at http://192.168.122.131/luci-static/resources/luci.js:22
  at async Promise.all (index 4)
  at async Promise.all (index 5)

Fixes: 2b7fd1292 ("luci-proto-gre: improvement of LuCI interface")
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
2021-02-27 15:29:35 +02:00
Jan Bětík
0f3987d5ad luci-proto-gre: improvement of LuCI interface
Better handling of Type of Service (IPv4), Traffic Class (IPv6) values
Optional value Local endpoint address is detected and pre-filled in the interface

Signed-off-by: Jan Bětík <jan.betik@svine.su>
2021-02-27 15:29:22 +02:00
Jan Bětík
2e1ab6abae luci-proto-gre: Protocol extension for GRE tunnels
I'm running several GRE tunnels to different locations and
the option to see and to configure GRE tunnels in LuCI was not
crucial but nice to have.

Signed-off-by: Jan Bětík <jan.betik@svine.su>
2021-02-27 15:29:04 +02:00
Hannu Nyman
aadfafadd6 treewide: i18n backport and sync translations
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-02-25 17:18:37 +02:00
Stan Grishin
3b137b5b7c
Merge pull request #4830 from stangri/19.07-luci-app-https-dns-proxy
luci-app-https-dns-proxy: add Force DNS, IDNet support, add missing class to buttons
2021-02-22 16:56:11 -08:00
Stan Grishin
a52d6f2a83 luci-app-https-dns-proxy: add Force DNS, IDNet support, add missing class to buttons
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-02-23 00:54:04 +00:00
Jo-Philipp Wich
c33df8f75c luci-base: ui.js: resolve parent ul early in UIDropdown.toggleItem()
The parent node of the current li might be null after collapsing the
dropdown, so resolve the parent ul early to avoid passing null to
subsequent calls.

Fixes clearing custom input values in DynamicList dropdowns.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8d2bcd432)
2021-02-19 11:32:25 +01:00
Jo-Philipp Wich
e67fe6d00a luci-app-firewall: properly handle custom multi IP/MAC input
Store multiple space separated custom address values as separate uci
list items in the configuration.

Fixes: #4822
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b60be8cfd8)
2021-02-19 11:31:10 +01:00