Fix lgtm issues

52North · May 27, 2019 · 6c420dc · 6c420dc
1 parent ae3fe7e
commit 6c420dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/engine/src/main/java/org/n52/javaps/engine/impl/FileBasedResultPersistence.java b/engine/src/main/java/org/n52/javaps/engine/impl/FileBasedResultPersistence.java
@@ -300,8 +300,10 @@ private void persist(Path directory,
 
                         Encoder base64encoder = Base64.getEncoder();
 
-                        OutputStream outputStream = base64encoder.wrap(new FileOutputStream(outputFile.toFile()));
-                        IOUtils.copy(in, outputStream);
+                        try (OutputStream outputStream = base64encoder.wrap(new FileOutputStream(outputFile
+                                .toFile()))) {
+                            IOUtils.copy(in, outputStream);
+                        }
                     }
 
                 } else {

diff --git a/engine/src/main/java/org/n52/javaps/utils/IOUtils.java b/engine/src/main/java/org/n52/javaps/utils/IOUtils.java
@@ -179,6 +179,9 @@ public static List<File> unzipAll(File file) throws IOException {
         try (ZipInputStream zipInputStream = new ZipInputStream(new BufferedInputStream(new FileInputStream(file)))) {
             while ((entry = zipInputStream.getNextEntry()) != null) {
                 entryFile = new File(tempDir, entry.getName());
+                if (!file.toPath().normalize().startsWith(tempDir.toPath())) {
+                    throw new IOException("Bad zip entry: " + entry.getName());
+                }
                 boolean created = entryFile.createNewFile();
                 if (!created) {
                     LOGGER.info("File already exists: " + entryFile.getAbsolutePath());

diff --git a/webapp/src/main/webapp/static/index.html b/webapp/src/main/webapp/static/index.html
@@ -40,11 +40,10 @@ <h2>Test requests</h2>
         </main>
 
         <footer>
-            <p>Powered by <a href="https://github.com/52North/iceland" title="iceland website">iceland</a> from <a href="http://52north.org" title="52°North website">52&deg;North</a>.</p>
+            <p>Powered by <a href="https://github.com/52North/arctic-sea" title="arctic-sea website">arctic-sea</a> from <a href="http://52north.org" title="52°North website">52&deg;North</a>.</p>
         </footer>
 
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.11.3.min.js"><\/script>')</script>
         <script src="js/plugins.js"></script>
         <script src="js/main.js"></script>
     </body>