Commit graph

1574 commits

Author SHA1 Message Date
Jo-Philipp Wich
4c9ae3f615 luci-base: cbi.js: fix handling of inverse-depends, combobox validation
- Properly handle logic for evaluating inverted dependencies means
   when depending on another field *not* having a given value

 - Perform datatype validation *after* populating combobox choices to
   avoid triggering a false-positive when validating an .rmempty = false
   combobox during form instantiation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-28 16:14:53 +02:00
Jo-Philipp Wich
4201282559 luci-base: let luci.sys.net.devices() return all netdevs
The previous implementation of the function only returned ethernet
interfaces because it relied on the AF_PACKET family entries returned
by getifaddrs().

Change the function to simply collect all interface names it sees in
order to avoid missing tunnel interfaces.

Fixes FS#917.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-28 15:44:10 +02:00
INAGAKI Hiroshi
984b092726 luci-base: Update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-07-28 12:18:22 +09:00
Hannu Nyman
3603e27e30 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-07-27 19:40:47 +03:00
Hannu Nyman
f7cf1dae69 Merge pull request #1239 from kuoruan/zh-cn-tr
Add some translate strings & Update Simplified Chinese translation
2017-07-24 14:51:12 +03:00
Hannu Nyman
8f62b28948 Merge pull request #1242 from yousong/shadowsocks-libev
luci-app-shadowsocks-libev: rewrite for shadowsocks-libev 3.0.6-2
2017-07-23 19:37:10 +03:00
Hannu Nyman
6d9fd0aeb7 Merge pull request #1221 from Cye3s/master
luci_base: Update zh_CN base.po, translate fix
2017-07-23 19:33:32 +03:00
kuoruan
cca9fe92fd luci-base: Update Simplified Chinese translation
Signed-off-by: Hsing-wang Liao <kuoruan@gmail.com>
2017-07-23 14:37:33 +08:00
Yousong Zhou
c759500d49 luci-base: fix loading fold.gif for filebrowser
cbi_init() needs to be called at the end of the page to initialize
cbi_strings with "[data-strings]" while cbi_browser_init() happened
before that.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2017-07-21 20:34:46 +08:00
Jo-Philipp Wich
00ae50134b luci-mod-admin-full: use rpcd-mod-rrdns for reverse DNS lookups
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:18:40 +02:00
Jo-Philipp Wich
4e1b884157 luci-base: properly handle authentication without authenticator
Some controller actions like the ones in "servicectl" require authentication
but are not meant to provide an authenticator because they're only invoked
by scripts.

Rework the dispatcher logic to handle this situation and only bail out if
an authenticator name other than "htmlauth" is set.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:12:50 +02:00
Jo-Philipp Wich
882427731a luci-base: use rpcd-mod-rrdns for reverse DNS lookups
Drop the individual calls to nixio.getnameinfo() in luci.sys.net and rely
on the "network.rrdns.lookup" ubus call instead to fetch domain information
within a guaranteed timeout.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:05:31 +02:00
Jo-Philipp Wich
366707a681 luci-base: drop unused functions in luci.sys
Drop a number of redundant functions from luci.sys to shrink the code a bit:

 * luci.sys.net.arptable()   - replaced by luci.ip.neighbors()
 * luci.sys.net.routes()     - replaced by luci.ip.routes()
 * luci.sys.net.routes6()    - replaced by luci.ip.routes6()
 * luci.sys.net.deviceinfo() - replaced by nixio.getaddrinfo()
 * luci.sys.net.pingtest()   - no known user

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:05:31 +02:00
Jo-Philipp Wich
b2154e0b63 luci-mod-admin-mini: eliminate use of luci.sys.net.deviceinfo()
The luci-mod-admin-mini network controller is the only remaining user of the
deviceinfo() call so inline the required code there so that the function can
be dropped from base LuCI in a later commit.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:05:31 +02:00
Jo-Philipp Wich
198e4ab17b luci-mod-freifunk: eliminate use of luci.sys.net.deviceinfo()
The result of the luci.sys.net.deviceinfo() call was never actually used
anywhere in the following code, so simply drop the invocation.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:05:31 +02:00
Jo-Philipp Wich
d6360bf81e luci-base: use rpcd session logins
Drop the custom credentials checking in favor to perform proper session
logins via rpcd. This is needed to properly setup ACLs when spawning
rpcd sessions in order to support direct client side ubus access in the
future.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-09 21:35:26 +02:00
Cye3s
6047dacb62 Update zh_CN base.po
Line 3021:
msgid "Switch protocol"
sould be:
msgstr "切换协议"

This "Switch protocol" means "Change one protocol to another protocol", Not "protocol of switch deivce"
2017-06-26 13:13:56 +08:00
Jo-Philipp Wich
de2e92a1f4 Merge pull request #1182 from kishangondaliya/feature_x
luci-mod-admin-full: Enable adhoc mode encryption options
2017-06-23 13:23:53 +02:00
Hannu Nyman
cb557f61c3 Merge pull request #1194 from TDT-GmbH/add-license-tags
Add license tags
2017-06-20 16:40:48 +03:00
Florian Eckert
0d518f5e8d luci-base: add license tag
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-06-13 13:40:38 +02:00
Quirin Hofstaetter
ec6a1d6d4d luci-mod-rpc: add license tag
Signed-off-by: Quirin Hofstaetter <qh@dev.tdt.de>
2017-06-13 13:40:23 +02:00
Quirin Hofstaetter
56aea9794b luci-mod-admin-full: add license tag
Signed-off-by: Quirin Hofstaetter <qh@dev.tdt.de>
2017-06-13 13:40:20 +02:00
Kishan Gondaliya
d735903e94 luci-mod-admin-full: Enable adhoc mode encryption options
Currently there are only 2 encryption options visible for adhoc
	mode. But in netifd, others are also supported and working as
	expected. So adding WPA-PSK, WPA2-PSK and WPA-PSK/WPA2-PSK Mixed
	mode as encryption options.

Signed-off-by: Kishan Gondaliya <kishanpgondaliya@gmail.com>
2017-06-05 14:30:37 +05:30
Jo-Philipp Wich
a9e8376c20 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>
2017-06-02 01:02:42 +02:00
Jo-Philipp Wich
0e9eed5df3 luci-base: resync translations, update German translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-05-30 23:11:18 +02:00
Jo-Philipp Wich
2a81ae6d15 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>
2017-05-30 21:25:28 +02:00
Jo-Philipp Wich
aa2b1cdc2c 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>
2017-05-29 08:45:38 +02:00
Hannu Nyman
5ca3864690 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🅱️c:d::') is received from a delegating
 server, the ip6ifaceid suffix (like '::1') is used to form
 the IPv6 address ('a🅱️c:d::1') for the interface.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-05-21 22:08:38 +03:00
Hannu Nyman
d40a939d65 Merge pull request #1031 from feckert/add_dhcp_to_system_ucitrack
luci-base: add dhcp to system ucitrack
2017-05-16 19:28:57 +03:00
Hannu Nyman
0145e9f307 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-05-09 11:11:36 +03:00
Hannu Nyman
f2cf516cf7 luci-base: add Etc/GMT timezones
Add Etc/GMT timezones like GMT+5

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-05-08 19:31:36 +03:00
Hannu Nyman
1970c21e3b 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>
2017-05-08 15:20:13 +03:00
Jo-Philipp Wich
57121f3743 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>
2017-05-06 15:06:07 +02:00
INAGAKI Hiroshi
86a708b06b i18n: Sync translations
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-05-02 19:12:32 +09:00
fantom-x
aee99ce927 luci-mod-admin-full: "isolate" option is missing for mac80211
Signed-off-by: Marc Benoit marcb6218@gmail.com
2017-05-01 17:16:00 -04:00
muddyfeet
4669782829 luci-mod-admin-full: correct logic for dnsmasq boguspriv keyword
Prevents deletion of the UCI dns boguspriv keyword and explicitly sets it to
either 0 or removes it as the LEDE/Openwrt dnsmasq.conf default is 1 - not 0.

This allows boguspriv to be turned off from the GUI.

Signed-off-by: Warren Linton <warren@linton.id.au>
[Jo-Philipp Wich: squashed commits, updated commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-04-25 14:40:18 +02:00
Jo-Philipp Wich
7ae244a26e 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>
2017-04-20 16:55:29 +02:00
Hannu Nyman
54c97738bc 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>
2017-04-10 14:45:20 +03:00
Hsing-Wang Liao
a41f97bca1 luci-base: Update Simplified Chinese translation
Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
2017-04-09 15:05:36 +08:00
Hannu Nyman
3fc0465cfe Merge pull request #1071 from TDT-GmbH/add-force-link-option
luci-mod-admin-full: Add force link option in interfaces advanced settings section
2017-04-06 23:01:48 +03:00
INAGAKI Hiroshi
b4f080b136 luci-base: Update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-04-03 02:32:28 +09:00
INAGAKI Hiroshi
369dbbfe71 i18n: Sync translations
Synchronized all translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-03-31 00:50:22 +09:00
Florian Eckert
7b55d1b4af luci-base: update i18n
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-15 13:11:50 +01:00
Florian Eckert
f2d5cb1060 luci-mod-admin-full: add advanced force_link option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-14 14:22:12 +01:00
Florian Eckert
4baeb1be2d luci-base: update german translation
Added some missing german translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-07 11:38:19 +01:00
Hannu Nyman
61f63fb9af i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-03-04 12:26:30 +02:00
Hannu Nyman
3c988cf16c treewide: cleanup references to madwifi from LuCI
Remove the code related to the deprecated madwifi driver.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-28 18:55:11 +02:00
Hannu Nyman
b0943391d8 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.

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>
2017-02-28 14:16:19 +02:00
Hannu Nyman
be8b920a2e Merge pull request #1039 from danrl/luci-proto-wireguard
luci-proto-wireguard: add support for fwmark option
2017-02-27 21:50:52 +02:00
danrl
cd8333cf0b luci-proto-wireguard: add support for fwmark option
Adds support for the fwmark option.

FwMark is a 32-bit fwmark for outgoing packets.
If set to 0 or "off", this option is disabled.

Signed-off-by: Dan Luedtke <mail@danrl.com>
2017-02-27 20:48:46 +01:00