Prevent artifact locations that are directories from being opened as …

…zip files
google · May 28, 2021 · e63b990 · e63b990
1 parent e40a3f6
commit e63b990
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...ses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy b/...ses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy
@@ -138,6 +138,10 @@ class LicensesTask extends DefaultTask {
     }
 
     protected void addGooglePlayServiceLicenses(File artifactFile) {
+        if (artifactFile.isDirectory()) {
+            return
+        }
+
         ZipFile licensesZip = new ZipFile(artifactFile)
         JsonSlurper jsonSlurper = new JsonSlurper()
 

diff --git a/...ses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/LicensesTaskTest.java b/...ses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/LicensesTaskTest.java
@@ -282,6 +282,15 @@ public void testAddGooglePlayServiceLicenses_withoutDuplicate() throws IOExcepti
     assertTrue(licensesTask.licensesMap.containsKey("JSR 305"));
   }
 
+  @Test
+  public void testAddGooglePlayServiceLicenses_artifactLocationIsDirectory() throws IOException {
+    try {
+      licensesTask.addGooglePlayServiceLicenses(licensesTask.getOutputDir());
+    } catch (Exception e) {
+      fail("This test should not throw an Exception.");
+    }
+  }
+
   @Test
   public void testAppendLicense() throws IOException {
     licensesTask.appendLicense("license1", "test".getBytes(UTF_8));