oweals/luci.git
7 years agoluci_base: Update zh_TW base.po, translate fix 1411/head
Cye3s [Mon, 23 Oct 2017 09:26:20 +0000 (17:26 +0800)]
luci_base: Update zh_TW base.po, translate fix

7 years agoluci_base: Update zh_CN base.po, translate fix
Cye3s [Mon, 23 Oct 2017 09:21:33 +0000 (17:21 +0800)]
luci_base: Update zh_CN base.po, translate fix

Same as https://github.com/openwrt/luci/pull/1221
But commit to lede-17.01 branch

7 years agoMerge pull request #1403 from StevenHessing/lede-17.01-noddos
Hannu Nyman [Sat, 21 Oct 2017 06:14:24 +0000 (09:14 +0300)]
Merge pull request #1403 from StevenHessing/lede-17.01-noddos

luci-app-noddos: backport from master

7 years agoluci-app-noddos: backport from master 1403/head
Hannu Nyman [Wed, 11 Oct 2017 13:35:56 +0000 (16:35 +0300)]
luci-app-noddos: backport from master

Signed-off-by: Steven Hessing <steven.hessing@gmail.com>
7 years agoluci-mod-admin-full: move KRACK countermeasures out of IEEE802.11w condition
Jo-Philipp Wich [Wed, 18 Oct 2017 13:51:51 +0000 (15:51 +0200)]
luci-mod-admin-full: move KRACK countermeasures out of IEEE802.11w condition

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: tone down KRACK countermeasure description
Jo-Philipp Wich [Tue, 17 Oct 2017 22:04:58 +0000 (00:04 +0200)]
luci-mod-admin-full: tone down KRACK countermeasure description

Backport of b7be0b9d16c8bd28cefc2566ae542aedea1639e9.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoi18n: update translations
Jo-Philipp Wich [Tue, 17 Oct 2017 20:57:57 +0000 (22:57 +0200)]
i18n: update translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: wifi: expose wpa_disable_eapol_key_retries option
Jo-Philipp Wich [Tue, 17 Oct 2017 20:54:18 +0000 (22:54 +0200)]
luci-mod-admin-full: wifi: expose wpa_disable_eapol_key_retries option

Bacport of 48ed00e5b.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoi18n: sync translations
Hannu Nyman [Mon, 16 Oct 2017 13:31:50 +0000 (16:31 +0300)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci-app-uhttpd: Bump default key size to 2048 bits for certificates
Alexander Schlarb [Sat, 19 Aug 2017 16:58:49 +0000 (18:58 +0200)]
luci-app-uhttpd: Bump default key size to 2048 bits for certificates

More about the currently recommended key sizes: https://www.keylength.com/en/compare/

Signed-off-by: Alexander Schlarb <alexander@ninetailed.ninja>
Modified to maintain the old minimum of 1024 bits for low-end devices.

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

7 years agoluci-app-uhttpd: Fix certificate parameter section
Alexander Schlarb [Sat, 19 Aug 2017 16:53:49 +0000 (18:53 +0200)]
luci-app-uhttpd: Fix certificate parameter section

Signed-off-by: Alexander Schlarb <alexander@ninetailed.ninja>
(cherry picked from commit ab6485693834f7f66ff280d08abeec6e68265783)

7 years agoluci-app-nlbw: make display template XHTML compliant
Jo-Philipp Wich [Mon, 7 Aug 2017 07:56:30 +0000 (09:56 +0200)]
luci-app-nlbw: make display template XHTML compliant

This allows proper rendering in OpenWrt theme. Fixes #1284.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-nlbwmon: always fetch latest data
Jo-Philipp Wich [Tue, 1 Aug 2017 11:51:45 +0000 (13:51 +0200)]
luci-app-nlbwmon: always fetch latest data

When displaying the most current accounting period, pass an empty timestamp
to the backend in order to query the current in-memory data instead of the
latest committed values.

This ensures that the dashboard always renders the most current data in its
default view.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-nlbwmon: Update Japanese translation
INAGAKI Hiroshi [Tue, 1 Aug 2017 10:41:57 +0000 (19:41 +0900)]
luci-app-nlbwmon: Update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-nlbwmon: remove version marker from javascripts
Jo-Philipp Wich [Mon, 31 Jul 2017 17:32:02 +0000 (19:32 +0200)]
luci-app-nlbwmon: remove version marker from javascripts

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-nlbwmon: improve initial view
Jo-Philipp Wich [Mon, 31 Jul 2017 17:11:51 +0000 (19:11 +0200)]
luci-app-nlbwmon: improve initial view

Make sure that placeholder pie charts are rendered, display a hint about
yet missing data in the tables and offer a link to force-commit ("Reload")
the data.

Also fix some mixed white space, an imbalanced dom operation and sync
translation template.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-nlbwmon: add missing charting library
Jo-Philipp Wich [Mon, 31 Jul 2017 09:11:21 +0000 (11:11 +0200)]
luci-app-nlbwmon: add missing charting library

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-nlbwmon: Add Japanese translation
INAGAKI Hiroshi [Sun, 30 Jul 2017 10:08:36 +0000 (19:08 +0900)]
luci-app-nlbwmon: Add Japanese translation

Added po templates and Japanese translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoluci-app-nlbwmon: new package
Jo-Philipp Wich [Fri, 28 Jul 2017 13:57:44 +0000 (15:57 +0200)]
luci-app-nlbwmon: new package

This commit introduces luci-app-nlbwmon, a frontend for nlbwmon, the
lightweight NetLink BandWidth Montor.

The nlbwmon daemon gathers per-host traffic statistics by querying netlink
accounting data. Due to this approach, the executable is very small and does
not rely on libpcap and CPU intensive raw sockets to monitor traffic.

Depends on PR https://github.com/openwrt/packages/pull/4646

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-advanced-reboot: initial commit
Stan Grishin [Thu, 13 Jul 2017 05:51:41 +0000 (22:51 -0700)]
luci-app-advanced-reboot: initial commit

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

7 years agoluci-app-upnp: fix setting ucitrack init option
Yousong Zhou [Wed, 5 Jul 2017 20:16:46 +0000 (23:16 +0300)]
luci-app-upnp: fix setting ucitrack init option

Fixes FS#693

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit ed11130b84ed6ff95f09c8a482f52fa253555881)

7 years agoluci-minuupnpd: use enable flag
Kevin Darbyshire-Bryant [Sat, 11 Feb 2017 20:31:58 +0000 (20:31 +0000)]
luci-minuupnpd: use enable flag

Add a 'master' miniupnpd service enable flag rather than just relying on
rcS.d script existence.  This allows the service to be disabled
across sysupgrade, similar to minidlna.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit 1093327a4ddaf377fde40fdfb8ed168abac4b5eb)

7 years agoluci-app-miniupnpd: restore missing luci install file
Kevin Darbyshire-Bryant [Sat, 11 Feb 2017 19:41:31 +0000 (19:41 +0000)]
luci-app-miniupnpd: restore missing luci install file

Restore luci indexcache handling incorrect removed in
https://github.com/openwrt/luci/commit/387a06bb73462312c075e53ce9e6002d4af09e92

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit 5ef9a3a0097530001db4d3ee317dcd80bdd7f7ca)

7 years agoluci-proto-openconnect: remove "interface" field
Yousong Zhou [Mon, 19 Jun 2017 03:22:28 +0000 (11:22 +0800)]
luci-proto-openconnect: remove "interface" field

It's not needed anymore and removed in the openconnect package

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit dfd082c53bfb607b0c78973095ab49f831b7e1ac)

7 years agoluci-proto-openconnect: allow setting mtu, password2
Yousong Zhou [Sun, 30 Apr 2017 08:47:47 +0000 (16:47 +0800)]
luci-proto-openconnect: allow setting mtu, password2

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit cf8146ff6779b5b97933d48a6eda8292b792b36b)

7 years agoluci-app-ddns: fix to correct system status
Christian Schoenebeck [Wed, 26 Apr 2017 19:54:57 +0000 (21:54 +0200)]
luci-app-ddns: fix to correct system status

preset network "wan", if not configured in ddns config to correct
display system status #1117

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
[Jo-Philipp Wich: cherry-pick of 3e0492f, fixes #1193]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-statistics: support specifying line width in graph definitions
Jo-Philipp Wich [Sat, 10 Jun 2017 18:37:29 +0000 (20:37 +0200)]
luci-app-statistics: support specifying line width in graph definitions

This allows a graph definition to explicitely request LINE1, LINE2 or
LINE3 for a data source.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-statistics: support graph menu entries without corresponding labels
Jo-Philipp Wich [Sat, 10 Jun 2017 18:26:10 +0000 (20:26 +0200)]
luci-app-statistics: support graph menu entries without corresponding labels

Properly render menu items for plugin instances that do not have a
corresponding label defined.

This allows for registering new graph pages solely by dropping files
into /usr/lib/lua/luci/statistics/rrdtool/definitions/

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: automatically set dns=1 for static leases with hostname
Jo-Philipp Wich [Thu, 1 Jun 2017 23:00:12 +0000 (01:00 +0200)]
luci-mod-admin-full: automatically set dns=1 for static leases with hostname

Most users likely want the hostname of a static DHCP lease to be resolveable,
even if the corresponding host is currently offline.

Adjust the form logic to automatically set 'option dns 1' whenever a name is
specified in the static lease entry.

FIxes LEDE FS#815.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoi18n: sync with master
Jo-Philipp Wich [Wed, 31 May 2017 22:47:04 +0000 (00:47 +0200)]
i18n: sync with master

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-commands: Allow executing without downloading on public links
t123yh [Wed, 3 Aug 2016 10:19:04 +0000 (18:19 +0800)]
luci-app-commands: Allow executing without downloading on public links

Signed-off-by: t123yh <t123yh@outlook.com>
7 years agoluci-theme-openwrt: fix JavaScript nameing
Florian Eckert [Wed, 22 Feb 2017 09:09:04 +0000 (10:09 +0100)]
luci-theme-openwrt: fix JavaScript nameing

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
7 years agoluci-app-hd-idle: removed dashes in menu items and text labels
fantom-x [Sun, 30 Apr 2017 19:42:55 +0000 (15:42 -0400)]
luci-app-hd-idle: removed dashes in menu items and text labels

"hd-idle" replaced with "HDD Idle" in the menu and on the page. All translation files updated accordingly.

Signed-off-by: Marc Benoit marcb6218@gmail.com
7 years agoluci-theme-freifunk: fix a few broken translation directives
Jo-Philipp Wich [Tue, 30 May 2017 21:07:51 +0000 (23:07 +0200)]
luci-theme-freifunk: fix a few broken translation directives

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-wireguard: use "Optional" instead of "Optional." as translation
Jo-Philipp Wich [Tue, 30 May 2017 19:45:54 +0000 (21:45 +0200)]
luci-proto-wireguard: use "Optional" instead of "Optional." as translation

This allows sharing the translation string with other components.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: use "Lease time" instead of "Leasetime" as translation label
Jo-Philipp Wich [Tue, 30 May 2017 19:24:41 +0000 (21:24 +0200)]
luci-mod-admin-full: use "Lease time" instead of "Leasetime" as translation label

This allows sharing a common translation string between DHCP and interface pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-ipv6: use "Automatic" instead as "automatic" as translation label
Jo-Philipp Wich [Tue, 30 May 2017 18:20:34 +0000 (20:20 +0200)]
luci-proto-ipv6: use "Automatic" instead as "automatic" as translation label

This allows sharing a common translation string with all other protocols.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-proto-openconnect: fix authgroup translation
Jo-Philipp Wich [Tue, 30 May 2017 18:16:29 +0000 (20:16 +0200)]
luci-proto-openconnect: fix authgroup translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: auto-migrate ifnames when changing VLAN configuration
Jo-Philipp Wich [Mon, 29 May 2017 06:45:38 +0000 (08:45 +0200)]
luci-mod-admin-full: auto-migrate ifnames when changing VLAN configuration

This change extends the switch VLAN configuration page to automatically
adjust interface ifname options when altering VLAN settings.

For example "eth0" is changed to "eth0.1" when a previously untagged LAN
VLAN is switched to tagged on the CPU port and vice versa.

Notifications are displayed in the page header if an auto migration was
performed.

This change should make the switch configuration more user friendly and
less prone to soft bricking.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-base: luci.tools.status: properly parse infinite dnsmasq leases
Cody R. Brown [Mon, 23 Jan 2017 06:25:44 +0000 (22:25 -0800)]
luci-base: luci.tools.status: properly parse infinite dnsmasq leases

The expiry time in a dnsmasq lease file line may be 0 (i.e.
expiry date = 01/01/1970 00:00:00 GMT) to denote an infinite
lease time, so adjust the code to properly support that.

The expiry attribute of the lease object will be set to "false"
in case of an infinite lease. This is to mimic the odhcp code below.
If the expiry date is not equal to 0, then just do exactly what was
done before (return the os.diff of current time and ts).

Signed-off-by: Cody R. Brown <dev@codybrown.ca>
7 years agobase: status: For odhpcd leases display MAC formatted with colons
Daniel Dickinson [Fri, 9 Dec 2016 16:58:21 +0000 (11:58 -0500)]
base: status: For odhpcd leases display MAC formatted with colons

This should result in the MAC address display being the same
using odhcpd for v4 DHCP as when using DNSMasq for v4 DHCP.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
7 years agochanged stat to lstat in nixio_lstat function
Thorsten M [Fri, 16 Sep 2016 09:06:12 +0000 (11:06 +0200)]
changed stat to lstat in nixio_lstat function

Signed-off-by: Thorsten M. <thoto@devtal.de>
7 years agoi18n: sync translations
Hannu Nyman [Wed, 24 May 2017 20:47:12 +0000 (23:47 +0300)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci.mk: Update language name for Chinese
amitabha [Wed, 24 May 2017 20:44:55 +0000 (23:44 +0300)]
luci.mk: Update language name for Chinese

Rectification of non-standard name for language Chinese.
Signed-off-by: Angus Ding angus.ding@gmail.com
(cherry picked from commit d3861e7f8deb581cb34c6f789457153b43457ff4)

7 years agoluci-base: support ip6ifaceid option for proto_static
Hannu Nyman [Wed, 24 May 2017 20:42:17 +0000 (23:42 +0300)]
luci-base: support ip6ifaceid option for proto_static

Add support for 'ip6ifaceid' option for proto_static in LuCI.

Information about the option:
 The option is optional and defaults to '::1'.
 Allowed values: 'eui64', 'random', fixed value like '::1' or '::1:2'

 When IPv6 prefix (like 'a:b:c:d::') is received from a delegating
 server, the ip6ifaceid suffix (like '::1') is used to form
 the IPv6 address ('a:b:c:d::1') for the interface.

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

7 years agoluci-app-statistics: check that uci config sections exist
Hannu Nyman [Thu, 18 May 2017 09:10:14 +0000 (12:10 +0300)]
luci-app-statistics: check that uci config sections exist

A missing or faulty luci_statistics config file may prevent
LuCI access completely already at the login phase as
the statistics config is parsed already then.

The error is like:
  .../statistics/datatree.lua:16: attempt to index upvalue 'sections' (a nil value)

User may be completely locked out of LuCI until he figures out
the need to have a proper luci_statistics config file.

Prevent the error by checking for the existence of
the uci config sections before trying to use values from them.

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

7 years agoluci-base: add Etc/GMT timezones
Hannu Nyman [Mon, 8 May 2017 16:31:36 +0000 (19:31 +0300)]
luci-base: add Etc/GMT timezones

Add Etc/GMT timezones like GMT+5

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

7 years agobuild/zoneinfo2lua.pl: logic for Etc/GMT timezones
Hannu Nyman [Mon, 8 May 2017 16:29:43 +0000 (19:29 +0300)]
build/zoneinfo2lua.pl: logic for Etc/GMT timezones

Add logic to add Etc/GMT timezones (like GMT+5)
although the zones are not included in zone.tab

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

7 years agoi18n: sync translations
Hannu Nyman [Tue, 9 May 2017 08:07:51 +0000 (11:07 +0300)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci-app-statistics: processes: fix graph visibility
Hannu Nyman [Tue, 9 May 2017 06:42:42 +0000 (09:42 +0300)]
luci-app-statistics: processes: fix graph visibility

Fix graph visibility on processes page based on plugin
instance. The overview instance is empty, while monitored
processes have their own instances.

Original version of the patch created by @koblack and
discussed in #1021

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

7 years agoluci-mod-admin-full: add advice to restart cron
Hannu Nyman [Mon, 8 May 2017 12:20:13 +0000 (15:20 +0300)]
luci-mod-admin-full: add advice to restart cron

Cron init script starts the service only if a crontab file
exists. If there is no crontab file at boot and the user
later creates one, he needs to manually restart the service.

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

7 years agoluci-base: luci.dispatcher: allow overriding sysauth template
Jo-Philipp Wich [Sat, 6 May 2017 13:06:07 +0000 (15:06 +0200)]
luci-base: luci.dispatcher: allow overriding sysauth template

In some cases it is useful to be able to override the template used for the
sysauth login dialog.

Add a new property "sysauth_template" which allows overriding the template
name from controller files.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-statistics: fix whitespace
Hannu Nyman [Tue, 2 May 2017 07:07:30 +0000 (10:07 +0300)]
luci-app-statistics: fix whitespace

* fix whitespace in config file
* place the contextswitch item corerrctly
  in the sorted options list

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

7 years agoluci-app-statistics: processes plugin: add labels, correct data
Hannu Nyman [Sun, 30 Apr 2017 16:00:39 +0000 (19:00 +0300)]
luci-app-statistics: processes plugin: add labels, correct data

Enhance processes statistics page:
* add proper labels to graphs
* correct RSS memory stats title, add VSZ stats

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

7 years agoluci.mk: fix length of abbreviated hash in version
Hannu Nyman [Sun, 30 Apr 2017 08:48:05 +0000 (11:48 +0300)]
luci.mk: fix length of abbreviated hash in version

Fix the length of the abbreviated commit hash used in
the LuCI version string used in the package names.
Use the old standard of seven characters in hash.

New git versions vary the length of the abbreviated
commit hash based on the number of objects in repo. That
may lead into different hash lengths with e.g. having
full/shallow git history, having all/single branch or
having different git versions in different build hosts.

Different hash lengths in package name may lead to
sneaky opkg install errors, as opkg apparently preserves
info for removed packages and may prefer that.

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

7 years agoluci-app-statistics: remove non-functional links from graphs
Hannu Nyman [Sun, 30 Apr 2017 08:11:18 +0000 (11:11 +0300)]
luci-app-statistics: remove non-functional links from graphs

The statistics graphs on the pages with multiple data sources
have contained links to the data sources, but those links
have not worked. Remove the links as they are unnecessary.

This commit fixes #1006

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

7 years agoluci-app-adblock: backport updates to match 2.6.2
Hannu Nyman [Sat, 29 Apr 2017 21:02:31 +0000 (00:02 +0300)]
luci-app-adblock: backport updates to match 2.6.2

Backport updates to luci-app-adblock that correspond to
the adblock 2.6.2 version.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoSupport for collectd-mod-contextswitch
fantom-x [Sat, 29 Apr 2017 15:26:16 +0000 (11:26 -0400)]
Support for collectd-mod-contextswitch

Signed-off-by: Marc Benoit marcb6218@gmail.com
(cherry picked from commit 5bf636732efab13fdd92dabfd746cafb156dd4f6)

7 years agoluci-mod-admin-full: use `nf_conntrack_count` for counting connections (#1114)
Jo-Philipp Wich [Thu, 20 Apr 2017 14:55:29 +0000 (16:55 +0200)]
luci-mod-admin-full: use `nf_conntrack_count` for counting connections (#1114)

As suggested by PR #1114, use `/proc/sys/net/netfilter/nf_conntrack_count`
instead of counting the lines in `/proc/net/nf_conntrack` but use a slightly
more efficient approach which avoids spawning an extra `cat` command.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agotimezone data: update to 2017b
Hannu Nyman [Mon, 10 Apr 2017 11:45:20 +0000 (14:45 +0300)]
timezone data: update to 2017b

Update timezone data to 2017b.

http://mm.icann.org/pipermail/tz-announce/2017-February/000045.html
http://mm.icann.org/pipermail/tz-announce/2017-March/000046.html

Key changes in 2017a-2017b:

* Mongolia no longer observes DST.
* Chile's Region of Magallanes moves from -04/-03 to -03 year-round.
* Switch to numeric time zone abbreviations for South America, as
  part of the ongoing project of removing invented abbreviations.
* Haiti resumed observance of DST in 2017.

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

7 years agoluci-app-firewall: adjust drop_invalid default (#1068)
Jo-Philipp Wich [Tue, 14 Mar 2017 11:52:22 +0000 (12:52 +0100)]
luci-app-firewall: adjust drop_invalid default (#1068)

Since firewall3 commit b33f78371e7c7b6a131c2b6c01673cbd4b3c13d1 the
drop_invalid option is off by default.

Adjust LuCI view to properly handle the changed semantics.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoi18n: sync translations
Hannu Nyman [Sat, 4 Mar 2017 16:24:26 +0000 (18:24 +0200)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoMerge pull request #1050 from luizluca/17.01/pt-br-translation
Hannu Nyman [Fri, 3 Mar 2017 20:05:24 +0000 (22:05 +0200)]
Merge pull request #1050 from luizluca/17.01/pt-br-translation

i18n: complete pt-br translation

7 years agoi18n: complete pt-br translation 1050/head
Luiz Angelo Daros de Luca [Fri, 3 Mar 2017 18:11:34 +0000 (15:11 -0300)]
i18n: complete pt-br translation

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(partial cherry pick from commit fe9d39c06c3535ecb8f7b4f611747d21c1050a2c)

7 years agoMerge pull request #1041 from EricLuehrsen/unbound_17_01
Hannu Nyman [Thu, 2 Mar 2017 12:37:31 +0000 (14:37 +0200)]
Merge pull request #1041 from EricLuehrsen/unbound_17_01

[lede-17.01] luci-app-unbound: service updates coordinated with application package

7 years agoluci-mod-admin-full: new hostapd functionality for 80211w/r detection
Hannu Nyman [Tue, 28 Feb 2017 12:16:19 +0000 (14:16 +0200)]
luci-mod-admin-full: new hostapd functionality for 80211w/r detection

Use the new hostapd functionality (in LEDE) to detect 802.11r and 802.11w
more properly. Leave the old logic in place for Openwrt.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(partial cherry pick from commit b0943391d84546d7161709ef521410b9cfd21df9)

7 years agoluci-mod-admin-full: adjust 80211w option default value
Hannu Nyman [Tue, 28 Feb 2017 12:16:19 +0000 (14:16 +0200)]
luci-mod-admin-full: adjust 80211w option default value

Adjust 802.11w default value from "0" to "" in order to avoid unnecessary
"option ieee80211w 0" lines in /etc/config/wireless

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(partial cherry pick from commit b0943391d84546d7161709ef521410b9cfd21df9)

7 years agoluci-base: backport cbi datatype changes
Hannu Nyman [Tue, 28 Feb 2017 14:22:52 +0000 (16:22 +0200)]
luci-base: backport cbi datatype changes

Backport the new cbi datatypes and whitespace fixes from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agounbound: add uci-default script 1041/head
Eric Luehrsen [Sat, 11 Feb 2017 21:57:15 +0000 (16:57 -0500)]
unbound: add uci-default script

Also if unbound-control is installed, then configure so
luci-app-commands can quickly show the "local zones" and
"local data" (aka hosts). This helps diagnose DHCP-DNS
zone data and adblock zone data.

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
7 years agounbound: update UCI for odhcpd and hostname
Eric Luehrsen [Thu, 19 Jan 2017 06:33:44 +0000 (01:33 -0500)]
unbound: update UCI for odhcpd and hostname

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
7 years agomod-admin-full: Add IPv6 Prefix Delegation information to Status Pages
Cody R. Brown [Sat, 28 Jan 2017 09:38:06 +0000 (01:38 -0800)]
mod-admin-full: Add IPv6 Prefix Delegation information to Status Pages

The Overview page and Network>Interfaces page currently do not give much
information about IPv6, particularly with Prefix Delegated setups. In these
setups, ISP will delegate a prefix to the router. Currently LuCI doesn't display
this Prefix Delegation from the ISP anywhere. A number of changes was added
to this commit:

1) self:_ubus("ipv6-prefix") was extracted and put into protocol.ip6prefix.
2) Network>Interfaces page, if a .ip6prefix is present, show it under Status.
   (IPv6-PD).
3) On the Overview page, "Type" and "Prefix Delegated" has been added to
  the IPv6 Network Overview Status:
  - Type will display the .proto, similar to the IPv4 case.
    If a .ip6prefix is present, it'll display a "-pd" at the end of
    the Type: i.e. dhcpv6-pd vs. dhcpv6.
  - If no .ip6prefix is present, it'll do what it does currently, and
    just show Address, or :: if no address is present.
  - If .ip6prefix is present, it'll show the "Prefix Delegated", it'll also
    hide "Address" if no address is present, else it'll show ifc6.ip6addr as well.

Signed-off-by: Cody R. Brown <dev@codybrown.ca>
(cherry picked from commit 5377d22b4a8d8f2234ddb5e65783343a6f2f6897)
(commit message reformatted)

7 years agoluci: ignore '::1' in realtime connections
Eric Luehrsen [Sat, 11 Feb 2017 02:38:00 +0000 (21:38 -0500)]
luci: ignore '::1' in realtime connections

luci ignores only 127.0.0.1 in real time connections.
The dnsmasq.init script sets up resolv.conf(s) as such.
With alternate DNS servers configured 'localhost' will
resolve to '127.0.0.1' or '::1'. The connections graph
will spam itself. openwrt/luci#996

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
(cherry picked from commit 52771816a03b9250a22a76af77c27704067d07c5)

7 years agoluci.mk: only use remote branch detection
Jo-Philipp Wich [Mon, 20 Feb 2017 13:34:16 +0000 (14:34 +0100)]
luci.mk: only use remote branch detection

LEDE's scripts/feeds script creates local branches named after the checked
out commit hash, confusing local branch detection.

Solely use remote branch detection to avoid misidentifying such cases.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci.mk: fix branch detection in detached HEAD state
Jo-Philipp Wich [Mon, 20 Feb 2017 13:14:49 +0000 (14:14 +0100)]
luci.mk: fix branch detection in detached HEAD state

When LuCI is checked out via pinned feeds configuration, its source tree will
end up in detached head state, requiring some more magic to figure out the
proper branch.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoi18n: sync translations
Hannu Nyman [Thu, 16 Feb 2017 12:49:25 +0000 (14:49 +0200)]
i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
7 years agoluci-mod-admin-full: change html for compatibility with openwrt theme
Hannu Nyman [Wed, 15 Feb 2017 06:48:22 +0000 (08:48 +0200)]
luci-mod-admin-full: change html for compatibility with openwrt theme

Openwrt theme apparently accepts slightly different html than
Bootstrap or Material. Change code to <br /> to make it compatible.

This fixes #1011

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

7 years agoluci-mod-admin-full: place 80211w options behind a check for wpad-full
Hannu Nyman [Tue, 14 Feb 2017 21:30:51 +0000 (23:30 +0200)]
luci-mod-admin-full: place 80211w options behind a check for wpad-full

The default hostapd/wpad mini version does not support ieee80211w
and the option's visibility in LuCI may lead it to be placed in user's
/etc/config/wireless preventing wifi from starting.

Check for hostapd/wpad full before exposing the option.

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

7 years agoMerge pull request #998 from hnyman/backport-80211r-80211w
Hannu Nyman [Tue, 14 Feb 2017 12:23:40 +0000 (14:23 +0200)]
Merge pull request #998 from hnyman/backport-80211r-80211w

Backport 802.11r and 802.11w LuCI support to lede-17.01

7 years agoBackport: support for 802.11w Management Frame Protection 998/head
Hannu Nyman [Fri, 10 Feb 2017 15:21:46 +0000 (17:21 +0200)]
Backport: support for 802.11w Management Frame Protection

Add support for IEEE802.11w Management Frame Protection options
into the wireless config.

Mention in the help text that the full version of wpad/hostapd is
needed.

Currently supported in LEDE by ath9k and ath10k, mwlwifi and mt76.

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

7 years agoBackport: support for 802.11r fast transition in wireless config
Hannu Nyman [Thu, 9 Feb 2017 08:02:49 +0000 (10:02 +0200)]
Backport: support for 802.11r fast transition in wireless config

Backports from master the commits that add support for
IEEE802.11r Fast Transition to luci.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f02794f28c343070487bbc794b425f91b675fdb9)
(cherry picked from commit 171c06146ad2a45b1026e3a9779766855964fc2d)
(cherry picked from commit 02bed261881dd60f212f81e7ed3e3afeb4bd890d)
(cherry picked from commit c491c181ea69dc544b49dff66d999f62ebf48619)

7 years agoluci-base: add hexstring datatype
Hannu Nyman [Thu, 9 Feb 2017 14:58:07 +0000 (16:58 +0200)]
luci-base: add hexstring datatype

Add datatype 'hexstring' for input validaiton datatypes.

It will accept any hexadecimal string.

(no length validation, as rangelength can be used for that.)

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

7 years agoMerge pull request #957 from musashino205/17-dynpnt-add-ja
Daniel Dickinson [Tue, 7 Feb 2017 21:04:20 +0000 (16:04 -0500)]
Merge pull request #957 from musashino205/17-dynpnt-add-ja

luci-app-dynapoint: Add Japanese translation

7 years agoluci-app-adblock: put backup options to global section
Dirk Brenken [Sun, 5 Feb 2017 07:02:39 +0000 (08:02 +0100)]
luci-app-adblock: put backup options to global section

this PR reflect the changes made in adblock 2.3.0

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

7 years agoluci-ssl-openssl: use OpenSSL for key generation, drop px5g
Hannu Nyman [Tue, 31 Jan 2017 14:47:12 +0000 (16:47 +0200)]
luci-ssl-openssl: use OpenSSL for key generation, drop px5g

Replace a dependency for px5g with openssl-util. Both LEDE and
Openwrt have now uhttpd versions that can generate keys with
OpenSSL cmd tools if px5g is not found. This change enables an
"OpenSSL-only" version of LuCI without mbedTLS/PolarSSL.

(Note: if px5g is found, uhttpd will prefer that.)

Relevant commits in uhttpd:

LEDE:
https://github.com/lede-project/source/commit/3c4858eeb2bbb3107f87bb3be07d5c172c8e0ef9
https://github.com/lede-project/source/commit/82132540a3efbc98f8f4379b26d4b4541013e69d
https://github.com/lede-project/source/commit/9097dc5ad844c336020be11085e1c8c80390ac9c

Openwrt:
https://github.com/openwrt/openwrt/commit/6ec32832d25335355d205c4601d4a8ca5dfd6808

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

7 years agoluci-mod-admin-full: fixes for usbport LED triggers
Jo-Philipp Wich [Mon, 30 Jan 2017 14:50:08 +0000 (15:50 +0100)]
luci-mod-admin-full: fixes for usbport LED triggers

The previous commit erroneously used "ports" instead of "port" as name for the
option widget, causing wrong uci values to be written.

Also work around some cbi idiosyncrasies regarding MultiValue widgets which
prevented rendering the correct initial selection state.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-base: fix logic errors in ipmask4 and ipmask6 datatype validators 986/head
Jo-Philipp Wich [Mon, 30 Jan 2017 18:14:08 +0000 (19:14 +0100)]
luci-base: fix logic errors in ipmask4 and ipmask6 datatype validators

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: admin: change password in Map.parse()
Jo-Philipp Wich [Wed, 25 Jan 2017 23:21:17 +0000 (00:21 +0100)]
luci-mod-admin-full: admin: change password in Map.parse()

Move the password setting into the .parse() callback to ensure that it is
updated regardless of whether "Save" or "Save & Apply" has been pressed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: support configuring usbport LED triggers
Jo-Philipp Wich [Wed, 25 Jan 2017 23:08:43 +0000 (00:08 +0100)]
luci-mod-admin-full: support configuring usbport LED triggers

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-base: mvalue: fix column wrapping
Jo-Philipp Wich [Wed, 25 Jan 2017 23:07:26 +0000 (00:07 +0100)]
luci-base: mvalue: fix column wrapping

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: reload wifi settings page after changing countey code
Jo-Philipp Wich [Wed, 25 Jan 2017 22:37:40 +0000 (23:37 +0100)]
luci-mod-admin-full: reload wifi settings page after changing countey code

Reloading the page ensures that the allowed tx power values and channel select
lists are properly populated with the new effective values.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-mod-admin-full: allow unset txpower value
Rafał Miłecki [Tue, 3 Jan 2017 14:54:57 +0000 (15:54 +0100)]
luci-mod-admin-full: allow unset txpower value

Sometimes txpower is not set so we should have an option with empty
value to let it stay unset.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
7 years agoluci-base: datatypes.lua: add missing parentheses in conditional
Jo-Philipp Wich [Tue, 24 Jan 2017 12:51:23 +0000 (13:51 +0100)]
luci-base: datatypes.lua: add missing parentheses in conditional

The missing parens lead to a wrong expression precedence, causing a runtime
error when attempting to compare nil with a number.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-firewall: use new ipmask validation types when applicable
Jo-Philipp Wich [Mon, 23 Jan 2017 15:18:20 +0000 (16:18 +0100)]
luci-app-firewall: use new ipmask validation types when applicable

This allows for address specifications like "fdca:1234:0123::abcd/::ffff:ffff:ffff:ffff"
which only match the last 64 bits of an address. This syntax is legal and already supported
by iptables and firewall3.

Fixes https://bugs.lede-project.org/index.php?do=details&task_id=417

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-base: add ipmask, ipmask4 and ipmask6 validators
Jo-Philipp Wich [Mon, 23 Jan 2017 15:10:36 +0000 (16:10 +0100)]
luci-base: add ipmask, ipmask4 and ipmask6 validators

These validators accept IP address specifications in the form

 - address
 - address/bits
 - address/netmask

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-base: datatypes.lua: cleanup white space
Jo-Philipp Wich [Mon, 23 Jan 2017 15:10:07 +0000 (16:10 +0100)]
luci-base: datatypes.lua: cleanup white space

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7 years agoluci-app-dynapoint: Add Japanese translation 957/head
INAGAKI Hiroshi [Tue, 17 Jan 2017 15:54:19 +0000 (00:54 +0900)]
luci-app-dynapoint: Add Japanese translation

Added Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
7 years agoMerge pull request #953 from musashino205/mount-fix-disp
Daniel Dickinson [Mon, 16 Jan 2017 15:45:20 +0000 (10:45 -0500)]
Merge pull request #953 from musashino205/mount-fix-disp

luci-mod-admin-full: Fix display problems of mount

7 years agoMerge pull request #947 from danrl/proto-wireguard
Daniel Dickinson [Mon, 16 Jan 2017 14:39:55 +0000 (09:39 -0500)]
Merge pull request #947 from danrl/proto-wireguard

luci-proto-wireguard: enable addressing for tunnel interfaces

7 years agoMerge pull request #817 from ascob/luci-app-dynapoint
Daniel Dickinson [Mon, 16 Jan 2017 14:28:26 +0000 (09:28 -0500)]
Merge pull request #817 from ascob/luci-app-dynapoint

luci-app-dynapoint: new package

7 years agoMerge pull request #917 from aa65535/master
Daniel Dickinson [Mon, 16 Jan 2017 14:26:42 +0000 (09:26 -0500)]
Merge pull request #917 from aa65535/master

luci-base:adjust the code order