Restrict file upload size in policy editor

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / PolicyManagerServlet.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
index 151d36a..2c67b45 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
@@ -227,24 +227,24 @@ public class PolicyManagerServlet extends HttpServlet {
                                if (!item.isFormField()) {
                                        // Process form file field (input type="file").
                                        files.put(item.getName(), item.getInputStream());
-                                       if(item.getName().endsWith(".xls")){
-                                               OutputStream outputStream = null;
-                                               try{
-                                                       File file = new File(item.getName());
-                                                       outputStream = new FileOutputStream(file);
+                                       if(item.getName().endsWith(".xls") && item.getSize() <= PolicyController.getFileSizeLimit()){
+                                               File file = new File(item.getName());
+                                               try (OutputStream outputStream = new FileOutputStream(file);)
+                                               {
                                                        IOUtils.copy(item.getInputStream(), outputStream);
-                                                       outputStream.close();
                                                        newFile = file.toString();
                                                        PolicyExportAndImportController importController = new PolicyExportAndImportController();
                                                        importController.importRepositoryFile(newFile, request);
                                                }catch(Exception e){
                                                        LOGGER.error("Upload error : " + e);
-                                               }finally{
-                                                       if(outputStream != null){
-                                                               outputStream.close();
-                                                       }
                                                }
                                        }
+                                       else if (!item.getName().endsWith(".xls")) {
+                                               LOGGER.error("Non .xls filetype uploaded: " + item.getName());
+                                       } 
+                                       else { //uploaded file size is greater than allowed 
+                                               LOGGER.error("Upload file size limit exceeded! File size (Bytes) is: " + item.getSize());
+                                       }
                                }
                        }