Merge pull request wildfly-extras#215 from jfdenise/issue_213

Fix for Issue wildfly-extras#213, NPE when feature pack <location> element content is not well formed
jfdenise · Mar 17, 2021 · 808141c · 808141c
2 parents fb32b13 + 46e83e8
commit 808141c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...c/main/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractBuildBootableJarMojo.java b/...c/main/java/org/wildfly/plugins/bootablejar/maven/goals/AbstractBuildBootableJarMojo.java
@@ -1127,6 +1127,9 @@ private GalleonConfig buildGalleonConfig(ProvisioningManager pm) throws Provisio
                 if (fp.getLocation() != null) {
                     fp.setLocation(MavenUpgrade.locationWithVersion(fp.getLocation(), artifactVersions));
                 } else {
+                    if (fp.getGroupId() == null || fp.getArtifactId() == null) {
+                        throw new MojoExecutionException("Invalid Maven coordinates for galleon feature-pack ");
+                    }
                     if (fp.getVersion() == null) {
                         Artifact fpArtifact = artifactVersions.getFeaturePackArtifact(fp.getGroupId(), fp.getArtifactId(), fp.getClassifier());
                         if (fpArtifact == null) {

diff --git a/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/MavenUpgrade.java b/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/goals/MavenUpgrade.java
@@ -320,6 +320,7 @@ static String locationWithVersion(String featurePackLocation, MavenProjectArtifa
 
     private FeaturePack toFeaturePack(FeaturePackConfig cfg, ProvisioningManager pm) throws MojoExecutionException {
         FeaturePack fp;
+        validateFPL(cfg.getLocation());
         if (cfg.getLocation().isMavenCoordinates()) {
             fp = getFeaturePack(cfg.getLocation().toString());
         } else {
@@ -328,6 +329,12 @@ private FeaturePack toFeaturePack(FeaturePackConfig cfg, ProvisioningManager pm)
         return fp;
     }
 
+    private static void validateFPL(FeaturePackLocation fpl) throws MojoExecutionException {
+        if (fpl.getUniverse() == null || fpl.getProducer() == null) {
+            throw new MojoExecutionException("Invalid feature-pack location format: " + fpl);
+        }
+    }
+
     String getMavenFeaturePack(FeaturePackLocation.FPID location) {
         String gac = producerToGAC.get(location.getProducer());
         if (gac == null) {