add test cases: invalid extension and ns not match expected version

Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>

Author: samirromdhani

iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/NetworkSerDe.java

@@ -63,6 +63,7 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import static com.powsybl.commons.xml.XmlUtil.getXMLInputFactory;
 import static com.powsybl.iidm.serde.AbstractTreeDataImporter.SUFFIX_MAPPING;
 import static com.powsybl.iidm.serde.IidmSerDeConstants.IIDM_PREFIX;
 import static com.powsybl.iidm.serde.IidmSerDeConstants.INDENT;
@@ -163,6 +164,16 @@ private static void validate(InputStream is, IidmVersion version, ExtensionsSupp
         Objects.requireNonNull(is);
         Objects.requireNonNull(version);
         Objects.requireNonNull(extensionsSupplier);
+
+        // check version namespace
+        byte[] xmlBytes;
+        try {
+            xmlBytes = is.readAllBytes();
+            checkNamespace(xmlBytes, version);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        // XSD validation
         Schema schema;
         if (extensionsSupplier == DefaultExtensionsSupplier.getInstance()) {
             schema = DEFAULT_SCHEMAS_SUPPLIER.get().get(version);
@@ -173,7 +184,7 @@ private static void validate(InputStream is, IidmVersion version, ExtensionsSupp
             schema = createSchema(extensionsSupplier, version);
         }
         try {
-            schema.newValidator().validate(new StreamSource(is));
+            schema.newValidator().validate(new StreamSource(new ByteArrayInputStream(xmlBytes)));
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         } catch (SAXException e) {
@@ -254,8 +265,17 @@ private static List<Source> getExtensionSources(ExtensionsSupplier extensionsSup
         return extensions;
     }
 
+    private static void checkNamespace(byte[] xmlBytes, IidmVersion validationVersion) {
+        String actualNs = readRootNamespace(xmlBytes);
+        boolean matches = actualNs.equals(validationVersion.getNamespaceURI())
+                || validationVersion.supportEquipmentValidationLevel() && actualNs.equals(validationVersion.getNamespaceURI(false));
+        if (!matches) {
+            throw new PowsyblException("Namespace mismatch: expected validation version " + validationVersion.toString(".") + ", found namespace " + actualNs);
+        }
+    }
+
     /**
-     * Extract {@code xs:import/@schemaLocation} in an XSD document
+     * Extract {@code xs:import/@schemaLocation} from XSD document
      *
      * <p>XSD document snippet:</p>
      * <pre>{@code
@@ -271,9 +291,7 @@ private static List<Source> getExtensionSources(ExtensionsSupplier extensionsSup
      */
     private static List<String> extractSchemaLocations(byte[] xsdBytes) {
         List<String> locations = new ArrayList<>();
-        XMLInputFactory xif = XMLInputFactory.newFactory();
-        xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
-        xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+        XMLInputFactory xif = getXMLInputFactory();
         try {
             XMLStreamReader reader = xif.createXMLStreamReader(new ByteArrayInputStream(xsdBytes));
             while (reader.hasNext()) {
@@ -294,6 +312,33 @@ private static List<String> extractSchemaLocations(byte[] xsdBytes) {
         return locations;
     }
 
+    /**
+     * Read the namespace declared on {@code <network>} element
+     *
+     * @param xmlBytes XML document content as bytes
+     * @return Namespace URI
+     */
+    private static String readRootNamespace(byte[] xmlBytes) {
+        XMLInputFactory xif = getXMLInputFactory();
+        try {
+            XMLStreamReader reader = xif.createXMLStreamReader(new ByteArrayInputStream(xmlBytes));
+            while (reader.hasNext()) {
+                if (reader.next() == XMLStreamConstants.START_ELEMENT) {
+                    if (!NETWORK_ROOT_ELEMENT_NAME.equals(reader.getLocalName())) {
+                        throw new PowsyblException("Unexpected root element: " + reader.getLocalName());
+                    }
+                    String ns = reader.getNamespaceURI();
+                    reader.close();
+                    return ns;
+                }
+            }
+            reader.close();
+            throw new PowsyblException("No root element found");
+        } catch (XMLStreamException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static void throwExceptionIfOption(AbstractOptions<?> options, String message) {
         if (options.isThrowExceptionIfExtensionNotFound()) {
             throw new PowsyblException(message);

iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/NetworkSerDeTest.java

@@ -406,6 +406,16 @@ void testValidateByVersionWhenValidNetworkInRecentVersion() throws IOException {
         }
     }
 
+    @Test
+    void testValidateByVersionWhenNetworkVersionDoesNotMatchExpectedValidationVersion() throws IOException {
+        try (InputStream is = getClass().getResourceAsStream("/V1_16/shuntRoundTripRef.xml")) {
+            assertNotNull(is);
+            assertThatThrownBy(() -> NetworkSerDe.validate(is, IidmVersion.V_1_15))
+                    .isInstanceOf(PowsyblException.class)
+                    .hasMessageContaining("Namespace mismatch: expected validation version 1.15, found namespace http://www.powsybl.org/schema/iidm/1_16");
+        }
+    }
+
     @Test
     void testValidateByVersionWhenInvalidNetwork() throws IOException {
         try (InputStream is = getClass().getResourceAsStream("/V1_16/shuntOldTagName.xml")) {
@@ -430,4 +440,16 @@ void testValidateByVersionWhenNetworkContainTerminalMockExtension() throws IOExc
         }
     }
 
+    @Test
+    void testValidateByVersionWhenInValidExtension() throws IOException {
+        try (InputStream is = getClass().getResourceAsStream("/branchStatusWrongEnum.xml")) {
+            assertNotNull(is);
+            assertThatThrownBy(() -> NetworkSerDe.validate(is, IidmVersion.V_1_16))
+                    .isInstanceOf(com.powsybl.commons.exceptions.UncheckedSaxException.class)
+                    .hasMessageContaining("Value 'TEST' is not facet-valid with respect to enumeration " +
+                            "'[IN_OPERATION, PLANNED_OUTAGE, FORCED_OUTAGE]'. It must be a value from the enumeration.");
+
+        }
+    }
+
 }

iidm/iidm-serde/src/test/resources/branchStatusWrongEnum.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:bs="http://www.powsybl.org/schema/iidm/ext/branch_status/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+    <iidm:substation id="S" country="FR">
+        <iidm:voltageLevel id="VL" nominalV="400.0" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology></iidm:nodeBreakerTopology>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:substation id="S2" country="FR">
+        <iidm:voltageLevel id="VL2" nominalV="400.0" topologyKind="NODE_BREAKER">
+            <iidm:nodeBreakerTopology></iidm:nodeBreakerTopology>
+        </iidm:voltageLevel>
+    </iidm:substation>
+    <iidm:line id="L" r="1.0" x="1.0" g1="0.0" b1="0.0" g2="0.0" b2="0.0" node1="2" voltageLevelId1="VL" node2="0" voltageLevelId2="VL2"/>
+    <iidm:extension id="L">
+        <bs:branchStatus>TEST</bs:branchStatus>
+    </iidm:extension>
+</iidm:network>