From ebb64fad891ab4bf69d533f4ac3ce20b59eb2c47 Mon Sep 17 00:00:00 2001 From: Erik Conijn Date: Tue, 30 Jun 2026 16:53:21 +0200 Subject: [PATCH] luci-proto-openvpn: fix auth_user_pass option, clarify label Maintainer: @systemcrash CC: @feckert Version: Main Compile tested: X86-64 Run tested: X86-64 Description: The push_opt tab incorrectly registered a server-side auth_user_pass Value option. So move it to the client-side FileUpload option on the general tab. auth_user_pass is a client-only option; the corresponding server-side directive is auth-user-pass-verify, which is already correctly defined under the scripts tab as auth_user_pass_verify. Also update the general-tab auth_user_pass label to a clearer description of the expected file format (username and password on separate lines). Signed-off-by: Erik Conijn --- .../luci-static/resources/protocol/openvpn.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/protocols/luci-proto-openvpn/htdocs/luci-static/resources/protocol/openvpn.js b/protocols/luci-proto-openvpn/htdocs/luci-static/resources/protocol/openvpn.js index cd7f0a1f1a..d1293200b6 100644 --- a/protocols/luci-proto-openvpn/htdocs/luci-static/resources/protocol/openvpn.js +++ b/protocols/luci-proto-openvpn/htdocs/luci-static/resources/protocol/openvpn.js @@ -71,6 +71,14 @@ const openvpnOptions = [ label: _('Local private key'), placeholder: '/etc/easy-rsa/keys/some-client.key' }, + { + tab: 'general', + type: form.FileUpload, + root_directory: '/etc/openvpn', + name: 'auth_user_pass', + label: _('Username and password file (one per line)'), + placeholder: '/etc/openvpn/some-client-auth-user-pass' + }, { tab: 'general', type: form.Value, @@ -1472,13 +1480,6 @@ const openvpnOptions = [ label: _('Accept options pushed from server'), default: 0 }, - { - tab: 'push_opt', - depends: { server: "", "!reverse": true }, - type: form.Value, - name: 'auth_user_pass', - label: _('Authenticate using username/password') - }, { tab: 'push_opt', depends: { server: "", "!reverse": true },