Commit graph

9891 commits

Author SHA1 Message Date
Jo-Philipp Wich
7e5331f154 treewide: rework rollback/apply workflow
Rework the apply confirmation mechanism to be session agnostic in order to
circumvent cross domain restrictions which prevent the JS code from issuing
apply confirm requests in some cases, e.g. when changing the LAN IP.

Confirmation calls may now be done from unauthenticated pages, as long as a
matching confirmation token is sent along with the request.

The reasoning behind this is that there is little security impact in
confirming pending apply sessions, especially since those sessions can only
be initiated while being authenticated.

After this change, LuCI will now launch a confirmation process on every
rendered page when a rollback is pending. The confirmation will happen
regardless of whether the user is logged in or not, or if the current page
is a CBI form or static template.

A confirmation request now also requires a random one-time token which is
rendered along with the confirmation JavaScript code in order to succeed.

This token is not meant to provide security but to ensure that the confirm
was triggered from an interactive browser session and not some background
HTTP requests that happened to end up in the admin ui.

As a consequence, the different apply/confirm/rollback code paths in CBI
maps and the UCI change/revert pages have been consolidated into one common
implementation residing in the common global theme agnostic footer template.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e5a1ac0228)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
64e3fe9f6b luci-base: xhr.js: decode JSON for POST requests as well
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 98217f8f8d)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
186228e365 luci-base: utils: support multiple return values in util.ubus()
This is needed to deal with ubus methods that return multiple results,
e.g. session/list

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9ead1e29a6)
2018-07-28 17:14:22 +02:00
Jo-Philipp Wich
58bd130a80 luci-mod-admin-full: abbreviate "MAC-Address" as "MAC" to align with rest
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8a1bc1814f)
2018-07-26 20:31:35 +02:00
Jo-Philipp Wich
198474f690 luci-mod-admin-full: fix wifi overview display when no networks are defined
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 80706cbafb)
2018-07-26 20:31:33 +02:00
pmelange
667f73a428 ff_olsrd_watchdog: delete existing tunnels
When OLSRd crashes, the old tunnels still exist.  This can lead to unexpected behaviour.
The tunnels to be removed start with "tnl_"

See freifunk-berlin/firmware#522

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
(cherry picked from commit 5d0b720f8b)
2018-07-26 20:31:27 +02:00
Jo-Philipp Wich
df614ffd43 luci-base: strip superfluous space in additional field markup
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c27a77756c)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
867fcff8bb luci-theme-openwrt: fix button placement quirk
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit efc1a5261a)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
97b3e5773d luci-base: cbi.js: fade to-be-deleted section when hovering delete button
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 590d1cc74f)
2018-07-26 20:31:05 +02:00
Jo-Philipp Wich
6cf7d11e15 luci-base: cbi.js: use adjacent button dynlist add/remove buttons
Change the cbi.js code to create  a div based button element instead of an
image button.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 875b561875)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
d7d15f6c5c luci-base: rework reveal/hide CBI password template button
Also add a hidden type password field to prevent browser autocompleters
from entering the login passwords into fields liek the wireless WPA key
field.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b6dd0ecd6c)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
97e647bb25 luci-theme-bootstrap: add styling for input-adjacent buttons
Also add styling for CBI column title references.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7ba4eb1a42)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
b8a0b617ad luci-theme-openwrt: add styling for input-adjacent buttons
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2287e79a5c)
2018-07-26 20:30:44 +02:00
Jo-Philipp Wich
516ce4af78 luci-mod-admin-full: unify "Alias interface" and "Alias Interface" strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 4105c78ff9)
2018-07-26 20:29:51 +02:00
Jo-Philipp Wich
bcb8d8969c luci: do not depend on uhttpd-mod-ubus
We do not need this module at all, yet.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1602313f5c)
2018-07-26 20:28:43 +02:00
Jo-Philipp Wich
024fa3cf30 luci-theme-openwrt: support rendering tblsection cell descriptions
Add support for rendering the "data-description" attribute when rendering
decomposed tables for small screen resolutions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e3f76c255a)
2018-07-26 20:28:36 +02:00
Jo-Philipp Wich
81682971dc luci-base: add description annotations to tblsection cells
Add a "data-description" attribute to CBI fields which have a description
set, this allows responsive design themes to render a field description
when decomposing the table grid.

Also reuse the precalculated "typename" property if it exists, instead of
deriving it from the template name yet again.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8e0ee137a6)
2018-07-26 20:28:30 +02:00
Krystian Kozak
03b6d77ee3 luci-base: update Polish translation
Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(cherry picked from commit a900d61d91)
2018-07-26 20:26:58 +02:00
Dmitry Tunin
ffed0206b9 luci-proto-ncm: remove unrelated options
This removes all options 100% unrelated to NCM protocol.
Some options like 'dns' are not currently used by connection scripts,
but may be used in the future.

Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit 6d03051e95)
2018-07-26 20:26:54 +02:00
Dmitry Tunin
a6b2b29dc6 luci-proto-ncm: add pdptype option
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit 58fd0749de)
2018-07-26 20:26:50 +02:00
Jo-Philipp Wich
cd72e1d973
Merge pull request #1992 from sotux/openwrt-18.06_zh_CN
luci-base: zh_CN: Update Simplified Chinese translation
2018-07-26 20:23:30 +02:00
Dirk Brenken
7501bf6f5b
Merge pull request #1996 from EricLuehrsen/unbound_1806_doc
[openwrt-18.06] luci-app-unbound: point documentation to 18.06 branch
2018-07-25 06:30:00 +02:00
Zheng Qian
d6f8ac1a76 luci-base: zh_CN: Update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-07-25 11:25:45 +08:00
Eric Luehrsen
ad0d3f5031 luci-app-unbound: point documentation to 18.06 branch
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-07-24 23:21:00 -04:00
Jo-Philipp Wich
14c73faf31 collections: drop nginx support for 18.06
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-21 14:25:00 +02:00
Jo-Philipp Wich
1d32ea9b03 luci-mod-admin-full: fix check for traceroute6
Since busybox has moved traceroute6 from /usr/bin/ to /bin/, we need to
check both locations.

Fixes #1973.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e4a86478e6)
2018-07-21 14:20:05 +02:00
Anton Kikin
9724d76619 luci-base: fix Russian translation
More correct translation of the 'instance'.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit bf6275c85e)
2018-07-21 14:02:12 +02:00
Olimjon
4c87b8345c luci-app-upnp: update Russian translation
Signed-off-by: Kudratov O <olimko98@gmail.com>
(cherry picked from commit c03bc0f533)
2018-07-21 14:02:08 +02:00
Olimjon
ed4f4644ee Update Russian translation
[backported from 6a151eb70e]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-21 14:01:27 +02:00
Stan Grishin
4b267cecfd luci-app-simple-adblock: remove extra controller file
Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit aaddcac5b0)
2018-07-21 13:59:03 +02:00
Yurii
968f9dc0aa luci-base: update Ukrainian translation
Updated with the latest resync translation, corrections and additions.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 4fa9115de6)
2018-07-21 13:58:29 +02:00
Yurii
11e9a5503e luci-app-upnp: update Ukrainian translation
Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 9a6026b3d5)
2018-07-21 13:58:24 +02:00
Yurii
18c8e1fe58 luci-app-wol: update Ukrainian translation
Corrections and additions.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 2d946363b3)
2018-07-21 13:58:20 +02:00
Jo-Philipp Wich
c81359898e luci-base: fix bad CSS class names in table section template
The previous refactoring of the template caused the row stripying CSS
classes to be interpolated in such a way, that a separating space to
previous CSS classes was missing, leading to not rendered row names
and other side effects.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-20 11:38:35 +02:00
Jo-Philipp Wich
39401a7615 luci-app-ocserv: remove unneeded br element from template
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 985a7db408)
2018-07-20 09:11:01 +02:00
Jo-Philipp Wich
5b34fbaab7 luci-app-ocserv: update user status template
- Use cbi_update_table() helper to refresh user list
- Cleanup markup and remove uneeded CSS classes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f4ba55532f)
2018-07-20 09:08:38 +02:00
INAGAKI Hiroshi
5bbf669c85 luci-base: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(cherry picked from commit 72517887cb)
2018-07-20 08:56:08 +02:00
INAGAKI Hiroshi
da600939fc i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
(backported from commit 86660f92d1)
2018-07-20 08:55:45 +02:00
Dmitry Tunin
beb9ab2daa luci-proto-ncm: add modem default mode
Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
(cherry picked from commit 57439d8daa)
2018-07-20 08:48:39 +02:00
Ansuel Smith
16837a5d0c luci-admin-full: add further wifi options
This commit adds option to disable scan for 40mhz channel, permit to tweak
beacon interval and other advanced settings.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[fix whitespace, add range constraint to dtim_period, add dtim_period
 to local vars, reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 39cabc0361)
2018-07-20 08:48:39 +02:00
Ansuel Smith
758c66b9da luci-admin-full: add dnsmasq allservers option
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 7ff8d15e24)
2018-07-20 08:48:39 +02:00
Stan Grishin
69a4c258f4 luci-app-simple-adblock: change style of button to important
Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit 3471e37b3b)
2018-07-20 08:01:23 +02:00
Stan Grishin
b9166ca964 luci-app-advanced-reboot: change style of buttons to important
Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit 4f921594bb)
2018-07-20 08:01:19 +02:00
Anton Kikin
5fc6bc7d90 luci-app-ddns: update and improve Russian translation
Update existing not quite correct translations.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 628745044b)
2018-07-20 08:01:16 +02:00
Anton Kikin
d3bfc5d03e luci-base: fix a typo in Russian translation
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 4aad4a75ba)
2018-07-20 08:01:12 +02:00
Jo-Philipp Wich
91238dccc7 luci-theme-bootstrap: allow pointer events on readonly textareas and dropdowns
This is required to scroll and select text.

Fixes #1965
Fixes 887d0a685 ("luci-theme-bootstrap: cleanup CSS")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit a68006245d)
2018-07-20 08:01:04 +02:00
Jo-Philipp Wich
5d4c365f13 luci-theme-openwrt: fix another instance of misplaced page action button
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 369553cd14)
2018-07-20 08:00:49 +02:00
Jo-Philipp Wich
8d88802b83 luci-mod-admin-full: use incremental background scanning for wireless join
The previous approach of synchroneously scanning while building the result
page was suboptimal since it frequently led to connection resets when
accessing LuCI via wireless.

It also exhibited problems when accessed via SSL on recent Firefox versions
where the page were only loaded partially.

Rework the wireless scanning to gather scan results in a background process
and put them into the ubus session data area where they can be readily
accessed without causing network interruptions.

Subsequently rebuild the wireless join page to use XHR polling to
incrementally fetch updated scan results.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9b4efaefa1)
2018-07-20 08:00:45 +02:00
Jo-Philipp Wich
5ea795a4b8 luci-theme-openwrt: fixes for page action button placement
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 68dae07225)
2018-07-20 07:56:53 +02:00
Jo-Philipp Wich
fbc02d33a3 luci-theme-bootstrap: various fixes
- Styling fixes for table hover rows, striping and title row coloring
- Fixes for page action button placement

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 29f542fa62)
2018-07-20 07:56:50 +02:00