Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15246 commits 13 branches 13 tags 306 MiB
Commit graph

206 commits

Author SHA1 Message Date
Jo-Philipp Wich
44445a8097 luci-proto-wireguard: fix potential shell injection vulnerabilities 
The `luci.wireguard.generateQrCode` UBUS method allows injecting
arbitrary shell code by not sanitizing the `privkey` and `allowed_ips`
arguments before concatenating them into shell command expressions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-10-08 20:27:13 +02:00
Jo-Philipp Wich
01ecb1ac8a luci-proto-wireguard: fix markup not valid for XHTML 
Fixes: #5407
Fixes: 03d615f62c ("luci-proto-wireguard: add more options to qr code")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-10-07 16:19:30 +02:00
Florian Eckert
fc8a0b4d51
Merge pull request #5403 from lvoegl/luci-app-wireguard-fix-parsing 
luci-app-wireguard: fix allowed_ip parsing
 2021-10-01 17:06:33 +02:00
lvoegl
193abe7221 luci-app-wireguard: fix allowed_ip parsing 
Signed-off-by: lvoegl <lvoegl@tdt.de>
 2021-10-01 15:31:38 +02:00
Florian Eckert
88d7cc1261 luci-proto-wireguard: fix luci.wireguard rpcd dependency 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2021-09-30 12:46:15 +02:00
Florian Eckert
9d560c46cc luci-app-wireguard: fix dependency 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2021-09-26 13:50:46 +02:00
lvoegl
03d615f62c luci-proto-wireguard: add more options to qr code 
Signed-off-by: lvoegl <lvoegl@tdt.de>
 2021-09-17 14:22:54 +02:00
lvoegl
8530232f51 luci-proto-wireguard: client qr code generation 
Signed-off-by: lvoegl <lvoegl@tdt.de>
 2021-09-17 14:15:56 +02:00
lvoegl
d98935c45b luci-app-wireguard: merge app and proto rpcd 
Signed-off-by: lvoegl <lvoegl@tdt.de>
 2021-09-17 14:15:56 +02:00
Keith Irwin
092109c905
#5307 Made AllowedIPs optional 
Signed-off-by: Keith Irwin <git@ki9.us>
 2021-08-28 23:34:31 -06:00
Jo-Philipp Wich
5ff3ef7cbb protocols: make APN option optional again 
Fixes: #5284
Fixes: 1661ac6bf8 ("luci-proto-ncm: add APN and PIN validation")
Fixes: 114dc38dc2 ("luci-proto-qmi: add APN and PIN validation")
Fixes: 6a8ad40b05 ("luci-proto-3g: add APN and PIN validation")
Fixes: ebb676ef7b ("luci-proto-modemmanager: add APN and PIN validation")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-08-19 08:59:17 +02:00
Jo-Philipp Wich
3d2a2ec1fa
Merge pull request #5190 from TDT-AG/pr/20210715-proto-bonding 
luci-proto-bonding: fix member because of API change
 2021-08-09 19:47:23 +02:00
Helge Mader
adaf3feb65 luci-proto-bonding: bugfix xmit_hash_policy dependencies 
Signed-off-by: Helge Mader <ma@dev.tdt.de>
 2021-07-19 12:37:35 +02:00
Helge Mader
64a066c339 luci-proto-bonding: fix member because of API change 
Signed-off-by: Helge Mader <ma@dev.tdt.de>
 2021-07-15 11:01:01 +02:00
Nicholas Smith
1661ac6bf8 luci-proto-ncm: add APN and PIN validation 
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
[squash commits, fix whitespace]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-07-13 20:10:04 +02:00
Nicholas Smith
114dc38dc2 luci-proto-qmi: add APN and PIN validation 
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
[squash commits, fix whitespace]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-07-13 20:10:04 +02:00
Nicholas Smith
6a8ad40b05 luci-proto-3g: add APN and PIN validation 
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
[squash commits, fix whitespace]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-07-13 20:10:04 +02:00
Nicholas Smith
ebb676ef7b luci-proto-modemmanager: add APN and PIN validation 
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
[squash commits, fix white space]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-07-13 20:10:04 +02:00
Jo-Philipp Wich
b4c394f2d2 protocols: unify TOS and TTL description strings 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-06-07 13:59:03 +02:00
Jo-Philipp Wich
88b9d84388 treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings 
- Turn IPv4-Address into IPv4 address
 - Turn IPv4-Gateway into IPv4 gateway
 - Turn IPv6-Address into IPv6 address
 - Turn IPv6-Gateway into IPv6 gateway
 - Turn MAC-Address into MAC address

Also remove related duplicate translation entries.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-06-07 12:48:08 +02:00
Jo-Philipp Wich
bc1015f7db luci-proto-wireguard: fix fwmark validation to allow 32 bit values 
The iptables mark field is 32 bits wide, which is 4 bytes and so 8 hex
characters. Fix the fwmark validation to allow 8 characters in the hex
string.

Fixes: #5098
Suggested-by: Robert <32970961+differentblue@users.noreply.github.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-06-03 09:51:58 +02:00
Jo-Philipp Wich
96ee6dc8d6 protocols: rename "device" option to "_modem_device" 
This is required to resolve clashes with the generic "option device"
referring to netdev names in current netifd versions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-06-01 15:34:11 +02:00
Rafał Miłecki
79947af064 treewide: drop MAC and MTU from interfaces (protocols) 
Those are L2 options that are not part of interfaces (L3), should not be
set there and don't work. Setting MAC and MTU should be done at device
layer (config device) and is supported for basic types already.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 2021-05-28 15:34:41 +02:00
Jo-Philipp Wich
7d49508480 protocols: fix interface.ipv6 vs. device.ipv6 option conflict 
Ref: https://forum.openwrt.org/t/pppoe-disable-ipv6/92548
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-03-29 22:35:46 +02:00
Jo-Philipp Wich
171ef77e89 treewide: remove rendundant proto handler options 
The introduction of network device configuration support also implemented
all common, protocol-independent interface options directly in the
interface config view, so drop the redundant option definitions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2021-03-15 11:41:44 +01:00
Ilya Lipnitskiy
98c3d36d45 luci-{app,proto}-wireguard: remove kmod-wireguard 
Prepares for 5.10 migration. wireguard-tools will bring in the correct
wireguard kernel module dependency - either kmod-wireguard or
kmod-wireguard-oot.

Depends on https://github.com/openwrt/openwrt/pull/3885

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
 2021-02-27 07:11:37 +02:00
Nicholas Smith
ab7e45cadb luci-proto-modemmanager: add support for specifying signal refresh rate 
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
 2021-01-07 22:07:24 +10:00
Florian Eckert
7e2e3ee499
Merge pull request #4542 from mayli/oc-protocol 
luci-proto-openconnect: add vpn_procotol support
 2020-11-25 10:27:44 +01:00
Sergio E. Nemirowski
0f3f464adc optinal -> optional typo fix 
Signed-off-by: Sergio E. Nemirowski <sergio@outerface.net>
 2020-11-22 17:35:11 +02:00
Florian Eckert
fa702c0387 luci-proto-qmi: add missing proto default options 
This change add the following missing default options.
- defaulroute
- peerdns
- metric

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2020-11-06 11:51:15 +01:00
Chuanhong Guo
37f97b7859 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>
 2020-11-05 21:22:18 +08:00
Mengyang Li
eeada1a077 luci-proto-openconnect: add vpn_procotol support 
see https://github.com/openwrt/packages/pull/13763

Signed-off-by: Mengyang Li <mayli.he@gmail.com>
 2020-10-30 13:33:57 -07:00
Jan Bětík
2b7fd1292f
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>
 2020-10-19 13:31:28 +02:00
Florian Eckert
f94958e791
Merge pull request #4374 from RemiNV/map_type_rename 
protocols: rename type to maptype for map
 2020-09-03 21:42:10 +02:00
Florian Eckert
82d4384898
Merge pull request #4355 from RemiNV/legacymap 
protocols: add legacymap option for map
 2020-09-02 15:33:59 +02:00
Florian Eckert
a093971b94
Merge pull request #4175 from aaronjg/openfortivpn 
luci-proto-openfortivpn: add luci interface for openfortivpn
 2020-08-31 15:29:32 +02:00
Aaron Goodman
642f738ead luci-proto-openfortivpn: update config option names 
update config option names for openfortivpn version 1.14-1-8

Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
 2020-08-26 21:54:06 -04:00
Wojciech Jowsa
60ce87a197 luci-proto-wireguard: Add generate key button 
Signed-off-by: Wojciech Jowsa <wojciech.jowsa@gmail.com>
[minor indentation fix, use bound section_id value, remove empty translation]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-08-21 11:03:53 +02:00
Remi NGUYEN VAN
1997bcc11b protocols: add legacymap option for map 
legacymap causes map to use the legacy IPv6 Interface Identifier format
that was described in draft-ietf-softwire-map-00, but was eventually
changed in RFC7597. It is however still used by some major ISPs,
including in Japan.

Signed-off-by: Remi NGUYEN VAN <remi.nguyenvan+openwrt@gmail.com>
 2020-08-16 10:47:11 +09:00
Remi NGUYEN VAN
9282df6894 protocols: rename type to maptype for map 
"type" is already used as a common option for all protocols. This makes
the configuration ambiguous, and Luci sees JS errors when trying to save
a MAP configuration.

Switch to "maptype" instead to avoid the conflict. MAP currently uses
"maptype" and falls back to "type" when not specified.

Signed-off-by: Remi NGUYEN VAN <remi.nguyenvan+openwrt@gmail.com>
 2020-08-15 23:22:56 +09:00
Aaron Goodman
3e480874ff luci-proto-openfortivpn: add default route, remove disabled, update text 
Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
 2020-08-06 16:02:39 -04:00
Aaron Goodman
e7c870ea38 luci-proto-openfortivpn: add luci interface for openfortivpn 
Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
 2020-07-16 22:40:09 -04:00
Nicholas Smith
29edc02f1c luci-proto-modemmanager: add modem specific error messages. 
Signed-off-by: Nicholas Smith <nicholas.smith@telcoantennas.com.au>
 2020-07-10 20:39:07 +10:00
Robert Koszewski
9a291f9b5e luci-proto-sstp: proto add 
Signed-off-by: Robert Koszewski <rkkoszewski@gmail.com>
 2020-07-01 17:15:08 +02:00
Jan Bětík
2ced86048c 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>
 2020-06-16 17:11:10 +02:00
Wojciech Jowsa
6dd22ec98d luci-proto-vxlan: add destination port option 
Signed-off-by: Wojciech Jowsa <wojciech.jowsa@gmail.com>
 2020-06-01 16:36:23 +02:00
Jo-Philipp Wich
0de42b056b luci-proto-vxlan: fix uci option names 
Fixes: d79bbdd5b ("luci-proto-vxlan: add vxlan protol handler")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2020-05-27 18:54:38 +02:00
Wojciech Jowsa
d79bbdd5b0 luci-proto-vxlan: add vxlan protol handler 
Allow users to add vxlan inteface in luci.

Signed-off-by: Wojciech Jowsa <wojciech.jowsa@gmail.com>
 2020-05-27 18:46:18 +02:00
Florian Eckert
dae15b8cf4 luci-proto-wireguard: verify last base64 string symbol is an = sign 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2020-05-14 09:44:50 +02:00
Florian Eckert
59bc317326 luci-proto-wireguard: add warning that allowed_ips must not be empty 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
 2020-05-13 15:34:27 +02:00