elharo commented on code in PR #2170:
URL: https://github.com/apache/maven/pull/2170#discussion_r2008763401
##########
impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java:
##########
@@ -48,8 +48,37 @@
@Singleton
public class DefaultModelXmlFactory implements ModelXmlFactory {
@Override
+ @Nonnull
public Model read(@Nonnull XmlReaderRequest request) throws
XmlReaderException {
nonNull(request, "request");
+ Model model = doRead(request);
+ if (isModelVersionGreaterThan400(model)
+ &&
!model.getNamespaceUri().startsWith("http://maven.apache.org/POM/";)) {
Review Comment:
Here you can just check the namespace for full equality rather than using
startsWith to check only the prefix.
##########
impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java:
##########
@@ -48,8 +48,37 @@
@Singleton
public class DefaultModelXmlFactory implements ModelXmlFactory {
@Override
+ @Nonnull
public Model read(@Nonnull XmlReaderRequest request) throws
XmlReaderException {
nonNull(request, "request");
+ Model model = doRead(request);
+ if (isModelVersionGreaterThan400(model)
+ &&
!model.getNamespaceUri().startsWith("http://maven.apache.org/POM/";)) {
+ throw new XmlReaderException(
+ "Invalid namespace '" + model.getNamespaceUri() + "' for
model version " + model.getModelVersion(),
+ null,
+ null);
+ }
+ return model;
+ }
+
+ private boolean isModelVersionGreaterThan400(Model model) {
+ String version = model.getModelVersion();
+ if (version == null) {
+ return false;
+ }
+ try {
Review Comment:
My mistake. I was confusing model version with the namespace URI
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
