[MINOR] Fix some potential security leak issue

Fix two potential security leak issue based on the security code scan: 1. Add file name checking code in `RSCDriverBootstrapper`'s main method argument to avoid malicious file. 2. Avoid dumping exception stack to output. CC yanboliang zjffdu please help to review. Author: jerryshao <[email protected]> Closes apache#22 from jerryshao/security-issue.
huadis · Jul 27, 2017 · dcd29a0 · dcd29a0
1 parent 087adb6
commit dcd29a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/rsc/src/main/java/org/apache/livy/rsc/RSCClient.java b/rsc/src/main/java/org/apache/livy/rsc/RSCClient.java
@@ -331,7 +331,7 @@ public void onSuccess(Void unused) throws Exception {
 
         @Override
         public void onFailure(Throwable error) throws Exception {
-          error.printStackTrace();
+          LOG.error("RPC error.", error);
           promise.tryFailure(error);
         }
       });

diff --git a/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriverBootstrapper.java b/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriverBootstrapper.java
@@ -17,6 +17,7 @@
 
 package org.apache.livy.rsc.driver;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -47,7 +48,13 @@ public static void main(String[] args) throws Exception {
 
     case 1:
       props = new Properties();
-      Reader r = new InputStreamReader(new FileInputStream(args[0]), UTF_8);
+      File propertyFile = new File(args[0]);
+      String fileName = propertyFile.getName();
+      if (!fileName.startsWith("livyConf") && fileName.endsWith("properties")) {
+        throw new IllegalArgumentException("File name " + fileName + "is not a legal file name.");
+      }
+
+      Reader r = new InputStreamReader(new FileInputStream(propertyFile), UTF_8);
       try {
         props.load(r);
       } finally {

diff --git a/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala b/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala
@@ -157,7 +157,6 @@ class InteractiveSessionServlet(
       Created(new JobStatus(jobId, JobHandle.State.SENT, null, null))
       } catch {
         case e: Throwable =>
-          e.printStackTrace()
         throw e
       }
     }