Commit graph

8476 commits

Author SHA1 Message Date
Hannu Nyman
f02794f28c luci-mod-admin-full: prevent accidental deletion of 802.11r nasid
The same wifi option 'nasid' is used for two purposes,
RADIUS NAS ID and 802.11r NAS ID / R0KH-ID.

In LuCI the 'nasid' option has depended on WPA-EAP/WPA2-EAP, which
can lead to accidental deletion of the option, if the user modifies
any wifi settings while he has WPA(2)-PSK & 802.11r mode.

802.11r can also be with WPA(2)-PSK, so add them to the dependency
list of allowed encryptions.

(Note: after this fix the 'nasid' field is shown unnecessarily
to "normal" WPA(2)-PSK users. It might later be set to depend on
802.11r being used, after 802.11r has been added to LuCI.)

Reference to bugs:
https://github.com/openwrt/luci/issues/844
https://dev.openwrt.org/ticket/20764
https://bugs.lede-project.org/index.php?do=details&task_id=274

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-09 10:23:53 +02:00
Daniel Dickinson
fecf6e1d11 Merge pull request #965 from cshore-firmware/pull-request-odhcpd-mac
base: status: For odhpcd leases display MAC formatted with colons
2017-02-07 16:00:09 -05:00
Daniel Dickinson
5180a5bb8b Merge pull request #798 from thoto/feature_lstat
luci-lib-nixio: nixio_lstat calls stat instead of lstat
2017-02-07 15:56:02 -05:00
Hannu Nyman
5ecd5f5bb0 luci-app-wshaper: remove package
wshaper was removed from the Packages repo
so remove also the corresponding LuCI app.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-07 11:52:01 +02:00
Hannu Nyman
2292327415 Merge pull request #992 from dibdot/master
luci-app-adblock: put backup options to global section
2017-02-05 10:33:28 +02:00
Dirk Brenken
d3a74836b7 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>
2017-02-05 08:02:39 +01:00
Hannu Nyman
f1820dee25 Merge pull request #988 from danrl/proto-wireguard
luci-proto-wireguard: fix wrong maximum MTU
2017-02-03 22:16:03 +02:00
danrl
a9463d3d1a luci-proto-wireguard: fix wrong maximum MTU
Signed-off-by: Dan Luedtke <mail@danrl.com>
2017-02-03 21:05:01 +01:00
Hannu Nyman
b6341bd197 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:
3c4858eeb2
82132540a3
9097dc5ad8

Openwrt:
6ec32832d2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-31 16:47:12 +02:00
Jo-Philipp Wich
d85f7a8a00 luci-base: fix logic errors in ipmask4 and ipmask6 datatype validators
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-30 19:14:08 +01:00
Jo-Philipp Wich
926935f831 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>
2017-01-30 15:50:45 +01:00
Hannu Nyman
7c744309c5 Merge pull request #984 from musashino205/base-upd-ja
luci-base: Update Japanese translation
2017-01-30 11:29:11 +02:00
INAGAKI Hiroshi
63a6671b97 luci-base: Update Japanese translation
Added and modified some Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-30 02:41:25 +09:00
INAGAKI Hiroshi
81be1471c6 luci-base: Sync translations
Synchronized translations with Lua sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-30 01:11:15 +09:00
Hannu Nyman
4b3b9be098 Merge pull request #983 from stangri/luci-app-vpnbypass_makefileFix
luci-app-vpnbypass: luci tree Makefile + i18n support.
2017-01-28 18:50:36 +02:00
Stan Grishin
d2fcd543a4 luci-app-vpnbypass: switch to luci-tree Makefile, i18n support
Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-app-vpnbypass: fixed makefile, fixed pot-file

Signed-off-by: Stan Grishin <stangri@melmac.net>
2017-01-28 08:42:29 -08:00
Jo-Philipp Wich
e6f158b2ee Merge pull request #981 from NvrBst/pull-request-ipv6_prefix_status_display
mod-admin-full: Add IPv6 Prefix Delegation information to Status Pages
2017-01-28 13:45:44 +01:00
Cody R. Brown
5377d22b4a 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>
2017-01-28 01:38:06 -08:00
Hannu Nyman
f5461669af Merge pull request #979 from musashino205/wol-upd-ja
luci-app-wol: Update Japanese translation
2017-01-27 15:32:25 +02:00
Hannu Nyman
4e6010cd73 Merge pull request #977 from stangri/luci-app-vpnbypass
luci-app-vpnbypass: initial commit of companion app to vpnbypass package
2017-01-27 15:31:48 +02:00
INAGAKI Hiroshi
38fa3899b5 luci-app-wol: Update Japanese translation
Added one Japanese translation of recently added string.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-27 21:03:42 +09:00
INAGAKI Hiroshi
d4f4885739 luci-app-wol: Sync translations
Synchronized translations with Lua sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-27 19:17:20 +09:00
Hannu Nyman
16bbe45e95 luci-app-wol: add ability to send packet to broadcast address
Add the ability to send the WOL packet to the broadcast address,
if etherwake is used as the wol tool.

Modified from the original idea in #975

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-27 10:37:54 +02:00
Hannu Nyman
c5b84f2fba luci-app-wol: move to services menu
Move the wake-on-lan app from the network menu to services menu,
where other similar apps are located.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-27 10:34:46 +02:00
Stan Grishin
c9c76a136a luci-app-vpnbypass: initial commit of companion app to vpnbypass package
Signed-off-by: Stan Grishin <stangri@melmac.net>
2017-01-26 14:54:48 -08:00
Hannu Nyman
afb5c8682d Merge pull request #974 from musashino205/base-upd-ja
luci-base: Update Japanese translation
2017-01-26 12:03:08 +02:00
INAGAKI Hiroshi
6a15c10835 luci-base: Update Japanese translation
Added and modified some translations for Japanese.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-26 18:50:51 +09:00
Hannu Nyman
135ffeac83 Merge pull request #973 from musashino205/sync-trans
i18n: Sync translations
2017-01-26 09:43:50 +02:00
INAGAKI Hiroshi
fbc06f2ab2 i18n: Sync translations
Synchronized translations with Lua sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-26 12:38:28 +09:00
Jo-Philipp Wich
ca75550267 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>
2017-01-26 00:21:19 +01:00
Jo-Philipp Wich
1640d14191 luci-mod-admin-full: support configuring usbport LED triggers
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:08:43 +01:00
Jo-Philipp Wich
ae7c6f48df luci-base: mvalue: fix column wrapping
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:07:26 +01:00
Jo-Philipp Wich
b5db545077 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>
2017-01-25 23:37:40 +01:00
Rafał Miłecki
dbbb3c7497 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>
2017-01-25 23:21:30 +01:00
Jo-Philipp Wich
ec9942925c 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>
2017-01-24 13:51:27 +01:00
Hannu Nyman
b6c1ac3bb0 Merge pull request #972 from musashino205/stat-upd-ja
luci-app-statistics: Update Japanese translation
2017-01-24 08:19:56 +02:00
INAGAKI Hiroshi
8f4339d09e luci-app-statistics: Update Japanese translation
Added some Japanese translations and fixed some mistranslations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-24 15:08:48 +09:00
INAGAKI Hiroshi
66e3d0c9e7 luci-app-statistics: Sync translations
Synchronized translation of each language po file and po templates
with Lua source.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-24 14:46:30 +09:00
Hannu Nyman
e7aa7b7d69 Merge pull request #959 from EricLuehrsen/unbound_odhcpd
unbound: update UCI for odhcpd and hostname
2017-01-24 07:35:48 +02:00
Eric Luehrsen
54aa4b5799 unbound: update UCI for odhcpd and hostname
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-24 00:06:49 -05:00
Hannu Nyman
eaafb4508c luci-app-statistics: add advice about data directory permissions
Add advice about the permissions needed for the data directory:

  Pages are rendered as user 'nobody', so the *.rrd files,
  data directory and all its parent directories need to be
  world readable.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-23 19:31:40 +02:00
Jo-Philipp Wich
c7939d3feb luci-app-firewall: use new ipmask validation types when applicable
This allows for address specifications like "fdca🔢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>
2017-01-23 16:18:20 +01:00
Jo-Philipp Wich
e4b1bb3156 luci-base: 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>
2017-01-23 16:15:22 +01:00
Jo-Philipp Wich
937f4fbbdf luci-base: datatypes.lua: cleanup white space
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:10:07 +01:00
Cody R. Brown
0f35de886c 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>
2017-01-23 09:37:10 +02:00
Hannu Nyman
3b46d84fa8 Merge pull request #967 from musashino205/cmd-upd-ja
luci-app-commands: Update Japanese translation
2017-01-22 07:49:19 +02:00
INAGAKI Hiroshi
668e691d5c luci-app-commands: Update Japanese translation
Added some Japanese translations of recently added strings.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-21 18:24:22 +09:00
INAGAKI Hiroshi
2c502a8fe3 luci-app-commands: Sync translations
Synchronized translation of each languate and po templates with Lua
sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-21 18:21:55 +09:00
Daniel Dickinson
e1edb1025c Merge pull request #768 from t123yh/app_commands_nodownload
luci-app-commands: allow executing without downloading on public links
2017-01-20 18:00:42 -05:00
Daniel Dickinson
4fd2b74e4a 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>
2017-01-20 02:09:34 -05:00