Merge pull request #1572 from dmach/conf-duplicate-sections

Fix config parser to throw an exception on duplicate sections or options
openSUSE · Jun 3, 2024 · 84524b5 · 84524b5
2 parents d92f267 + 360a94c
commit 84524b5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/osc/OscConfigParser.py b/osc/OscConfigParser.py
@@ -263,7 +263,9 @@ def _read(self, fp, fpname):
                 mo = self.SECTCRE.match(line)
                 if mo:
                     sectname = mo.group('header')
-                    if sectname in self._sections:
+                    if self._strict and sectname in self._sections:
+                        raise configparser.DuplicateSectionError(sectname, fpname, lineno)
+                    elif sectname in self._sections:
                         cursect = self._sections[sectname]
                     elif sectname == configparser.DEFAULTSECT:
                         cursect = self._defaults
@@ -294,7 +296,9 @@ def _read(self, fp, fpname):
                         if optval == '""':
                             optval = ''
                         optname = self.optionxform(optname.rstrip())
-                        if cursect == configparser.DEFAULTSECT:
+                        if self._strict and optname in self._sections[cursect]:
+                            raise configparser.DuplicateOptionError(sectname, optname, fpname, lineno)
+                        elif cursect == configparser.DEFAULTSECT:
                             self._defaults[optname] = optval
                         else:
                             self._sections[cursect]._add_option(optname, line=line)

diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py
@@ -1,3 +1,4 @@
+import configparser
 import unittest
 
 from osc.OscConfigParser import OscConfigParser
@@ -21,6 +22,28 @@ def test_disabled_interpolation(self):
         # ValueError: invalid interpolation syntax in '%' at position 0
         self.parser.set("http://localhost", "pass", "%")
 
+    def test_duplicate_section(self):
+        conf = """
+[general]
+
+[http://localhost]
+
+[http://localhost]
+"""
+        parser = OscConfigParser()
+        self.assertRaises(configparser.DuplicateSectionError, parser.read_string, conf)
+
+    def test_duplicate_option(self):
+        conf = """
+[general]
+
+[http://localhost]
+user=
+user=
+"""
+        parser = OscConfigParser()
+        self.assertRaises(configparser.DuplicateOptionError, parser.read_string, conf)
+
 
 if __name__ == "__main__":
     unittest.main()