Merge pull request #3730 from natali-rs1985/T5710-current

pppoe-server: T5710: Add option permit any-login
vyos · Jun 28, 2024 · 12fcf6c · 12fcf6c
2 parents 57c24a8 + c86909d
commit 12fcf6c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2
@@ -31,10 +31,13 @@ copy=1
 level={{ log.level }}
 {% endif %}
 
-{% if authentication.mode is vyos_defined("noauth") %}
 [auth]
+{% if authentication.mode is vyos_defined("noauth") %}
 noauth=1
 {% endif %}
+{% if authentication.any_login is vyos_defined %}
+any-login=1
+{% endif %}
 
 [client-ip-range]
 0.0.0.0/0

diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
@@ -47,6 +47,12 @@
                   </leafNode>
                 </children>
               </node>
+              <leafNode name="any-login">
+                <properties>
+                  <help>Authentication with any login</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
             </children>
           </node>
           <tagNode name="interface">

diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -177,6 +177,17 @@ def test_pppoe_server_pado_delay(self):
         conf.read(self._config_file)
         self.assertEqual(conf['pppoe']['pado-delay'], '10,20:200,30:300,-1:400')
 
+    def test_pppoe_server_any_login(self):
+        # Test configuration of local authentication for PPPoE server
+        self.basic_config()
+
+        self.set(['authentication', 'any-login'])
+        self.cli_commit()
+
+        # Validate configuration values
+        config = read_file(self._config_file)
+        self.assertIn('any-login=1', config)
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)