Skip to content

Issue #10985: Maven allows random namespaces on project #11186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #10985: Maven allows random namespaces on project #11186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,19 @@ public class DefaultModelXmlFactory implements ModelXmlFactory {
public Model read(@Nonnull XmlReaderRequest request) throws XmlReaderException {
requireNonNull(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);
if (isModelVersionGreaterOrEqualsThan400(model)) {
String ns = model.getNamespaceUri();
if (ns.length() > 0 && !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) {
private boolean isModelVersionGreaterOrEqualsThan400(Model model) {
String version = model.getModelVersion();
if (version == null) {
return false;
Expand All @@ -71,7 +73,7 @@ private boolean isModelVersionGreaterThan400(Model model) {
String[] parts = version.split("\\.");
int major = Integer.parseInt(parts[0]);
int minor = parts.length > 1 ? Integer.parseInt(parts[1]) : 0;
return major > 4 || (major == 4 && minor > 0);
return major > 4 || (major == 4 && minor >= 0);
} catch (NumberFormatException | IndexOutOfBoundsException e) {
return false;
}
Expand Down