From 9395a96ce86a53ee75ce8b8ed7feea20ee603764 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 May 2022 18:31:48 +0200
Subject: ocserv: T4231: XML OTP support must not be added globally - only for
 openconnect

---
 .../include/auth-local-users.xml.i                 | 68 -------------------
 interface-definitions/vpn_openconnect.xml.in       | 76 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 68 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/auth-local-users.xml.i b/interface-definitions/include/auth-local-users.xml.i
index cb456eecf..9fb507474 100644
--- a/interface-definitions/include/auth-local-users.xml.i
+++ b/interface-definitions/include/auth-local-users.xml.i
@@ -19,74 +19,6 @@
             <help>Password used for authentication</help>
           </properties>
         </leafNode>
-        <node name="otp">
-          <properties>
-            <help>2FA OTP authentication parameters</help>
-          </properties>
-          <children>
-            <leafNode name="key">
-              <properties>
-                <help>Token Key Secret key for the token algorithm (see RFC 4226)</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>OTP key in hex-encoded format</description>
-                </valueHelp>
-                <constraint>
-                  <regex>[a-fA-F0-9]{20,10000}</regex>
-                </constraint>
-                <constraintErrorMessage>Key name must only include hex characters and be at least 20 characters long</constraintErrorMessage>
-              </properties>
-            </leafNode>
-            <leafNode name="otp-length">
-              <properties>
-                <help>Number of digits in OTP code</help>
-                <valueHelp>
-                  <format>u32:6-8</format>
-                  <description>Number of digits in OTP code</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 6-8"/>
-                </constraint>
-                <constraintErrorMessage>Number of digits in OTP code must be between 6 and 8</constraintErrorMessage>
-              </properties>
-              <defaultValue>6</defaultValue>
-            </leafNode>
-            <leafNode name="interval">
-              <properties>
-                <help>Time tokens interval in seconds</help>
-                <valueHelp>
-                  <format>u32:5-86400</format>
-                  <description>Time tokens interval in seconds.</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 5-86400"/>
-                </constraint>
-                <constraintErrorMessage>Time token interval must be between 5 and 86400 seconds</constraintErrorMessage>
-              </properties>
-              <defaultValue>30</defaultValue>
-            </leafNode>
-            <leafNode name="token-type">
-              <properties>
-                <help>Token type</help>
-                <valueHelp>
-                  <format>hotp-time</format>
-                  <description>Time-based OTP algorithm</description>
-                </valueHelp>
-                <valueHelp>
-                  <format>hotp-event</format>
-                  <description>Event-based OTP algorithm</description>
-                </valueHelp>
-                <constraint>
-                  <regex>(hotp-time|hotp-event)</regex>
-                </constraint>
-                <completionHelp>
-                  <list>hotp-time hotp-event</list>
-                </completionHelp>
-              </properties>
-              <defaultValue>hotp-time</defaultValue>
-            </leafNode>
-          </children>
-        </node>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index 7981c3fa2..21b47125d 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -51,6 +51,82 @@
                 </children>
               </node>
               #include <include/auth-local-users.xml.i>
+              <node name="local-users">
+                <children>
+                  <tagNode name="username">
+                    <children>
+                        <node name="otp">
+                          <properties>
+                            <help>2FA OTP authentication parameters</help>
+                          </properties>
+                          <children>
+                            <leafNode name="key">
+                              <properties>
+                                <help>Token Key Secret key for the token algorithm (see RFC 4226)</help>
+                                <valueHelp>
+                                  <format>txt</format>
+                                  <description>OTP key in hex-encoded format</description>
+                                </valueHelp>
+                                <constraint>
+                                  <regex>[a-fA-F0-9]{20,10000}</regex>
+                                </constraint>
+                                <constraintErrorMessage>Key name must only include hex characters and be at least 20 characters long</constraintErrorMessage>
+                              </properties>
+                            </leafNode>
+                            <leafNode name="otp-length">
+                              <properties>
+                                <help>Number of digits in OTP code</help>
+                                <valueHelp>
+                                  <format>u32:6-8</format>
+                                  <description>Number of digits in OTP code</description>
+                                </valueHelp>
+                                <constraint>
+                                  <validator name="numeric" argument="--range 6-8"/>
+                                </constraint>
+                                <constraintErrorMessage>Number of digits in OTP code must be between 6 and 8</constraintErrorMessage>
+                              </properties>
+                              <defaultValue>6</defaultValue>
+                            </leafNode>
+                            <leafNode name="interval">
+                              <properties>
+                                <help>Time tokens interval in seconds</help>
+                                <valueHelp>
+                                  <format>u32:5-86400</format>
+                                  <description>Time tokens interval in seconds.</description>
+                                </valueHelp>
+                                <constraint>
+                                  <validator name="numeric" argument="--range 5-86400"/>
+                                </constraint>
+                                <constraintErrorMessage>Time token interval must be between 5 and 86400 seconds</constraintErrorMessage>
+                              </properties>
+                              <defaultValue>30</defaultValue>
+                            </leafNode>
+                            <leafNode name="token-type">
+                              <properties>
+                                <help>Token type</help>
+                                <valueHelp>
+                                  <format>hotp-time</format>
+                                  <description>Time-based OTP algorithm</description>
+                                </valueHelp>
+                                <valueHelp>
+                                  <format>hotp-event</format>
+                                  <description>Event-based OTP algorithm</description>
+                                </valueHelp>
+                                <constraint>
+                                  <regex>(hotp-time|hotp-event)</regex>
+                                </constraint>
+                                <completionHelp>
+                                  <list>hotp-time hotp-event</list>
+                                </completionHelp>
+                              </properties>
+                              <defaultValue>hotp-time</defaultValue>
+                            </leafNode>
+                          </children>
+                        </node>
+                    </children>
+                  </tagNode>
+                </children>
+              </node>
               #include <include/radius-server-ipv4.xml.i>
               <node name="radius">
                 <children>
-- 
cgit v1.2.3