Merge pull request #38 from frankfreedom/feature-scheduling-permissio…

…n-verification 定时调度--权限校验
WeBankFinTech · Aug 30, 2020 · 0e220a1 · 0e220a1
2 parents 7e4251d + 862a1a8
commit 0e220a1
Show file tree

Hide file tree

Showing 41 changed files with 1,165 additions and 461 deletions.
diff --git a/az-core/src/main/java/azkaban/Constants.java b/az-core/src/main/java/azkaban/Constants.java
@@ -17,8 +17,6 @@
 package azkaban;
 
 import java.time.Duration;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Constants used in configuration files or shared among classes.
@@ -38,7 +36,6 @@
  */
 public class Constants {
 
-
   public static final String FLOW_PAUSED_MAX_TIME_MS = "flow.paused.max.time.ms";
 
   public static final long DEFAULT_FLOW_PAUSED_MAX_TIME = 1 * 60 * 60 * 1000;
@@ -163,6 +160,9 @@ public static class ConfigurationKeys {
 
     public static final String IS_METRICS_ENABLED = "azkaban.is.metrics.enabled";
 
+    public static final String IP_WHITELIST_ENABLED = "azkaban.ip.whiteList.enabled";
+    public static final String IP_WHITELIST = "azkaban.ip.whiteList";
+
     // User facing web server configurations used to construct the user facing server URLs. They are useful when there is a reverse proxy between Azkaban web servers and users.
     // enduser -> myazkabanhost:443 -> proxy -> localhost:8081
     // when this parameters set then these parameters are used to generate email links.

diff --git a/az-webank-alerter/pom.xml b/az-webank-alerter/pom.xml
@@ -18,31 +18,11 @@
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-common</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-web-server</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>

diff --git a/az-webank-homepage/pom.xml b/az-webank-homepage/pom.xml
@@ -23,31 +23,11 @@
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-common</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-web-server</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>

diff --git a/az-webank-system-manager/conf/plugin.properties b/az-webank-system-manager/conf/plugin.properties
@@ -7,5 +7,8 @@ viewer.servlet.class=com.webank.wedatasphere.schedulis.system.servlet.SystemServ
 wtss.db.jdbc.url=[#SYSTEM_DB_URL]
 wtss.db.username=[#SYSTEM_DB_USERNAME]
 wtss.db.password=[#SYSTEM_DB_PASSWORD]
+esb.app.domain=[#ESB_APP_URL]
+esb.app.id=[#ESB_APP_ID]
+esb.app.token=[#ESB_APP_TOKEN]
 
 
diff --git a/az-webank-system-manager/pom.xml b/az-webank-system-manager/pom.xml
@@ -18,27 +18,11 @@
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-common</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-web-server</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>
@@ -99,15 +83,14 @@
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>easyexcel</artifactId>
-      <version>1.1.1</version>
+      <version>2.2.3</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>${guava.version}</version>
     </dependency>
 
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

diff --git a/...rc/main/java/com/webank/wedatasphere/schedulis/system/service/impl/SystemUserManager.java b/...rc/main/java/com/webank/wedatasphere/schedulis/system/service/impl/SystemUserManager.java
@@ -97,7 +97,7 @@ public User getUser(String username, String password) throws UserManagerExceptio
         initUserAuthority(wtssUser, user);
 
       } catch (Exception e) {
-        logger.error("登录失败！异常信息：" + e);
+        logger.error("登录失败！异常信息：", e);
         throw new UserManagerException("Error User Name Or Password.");
       }
     }

diff --git a/az-webank-user-params/pom.xml b/az-webank-user-params/pom.xml
@@ -18,31 +18,11 @@
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-common</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>
       <artifactId>azkaban-web-server</artifactId>
       <version>${schedulis.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>fastjson</artifactId>
-          <groupId>com.alibaba</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.webank.wedatasphere.schedulis</groupId>

diff --git a/...src/main/java/com/webank/wedatasphere/schedulis/userparams/service/UserParamsService.java b/...src/main/java/com/webank/wedatasphere/schedulis/userparams/service/UserParamsService.java
@@ -122,7 +122,7 @@ public boolean checkWtssUserIsExist(String name){
         try {
             cout = jdbcExecutorLoader.findWtssUserByName(name);
         }catch (ExecutorManagerException e){
-            logger.error("can not found wtssuser by" + name + ", " + e);
+            logger.error("can not found wtssuser by" + name + ", ", e);
         }
         if(cout == 0){
             return false;

diff --git a/az-webank-user-params/src/web/js/userparams-manager.js b/az-webank-user-params/src/web/js/userparams-manager.js
@@ -657,6 +657,9 @@ azkaban.UpdateDepartmentGroupView = Backbone.View.extend({
         };
         var model = this.model;
         var successHandler = function (data) {
+            if (data.status && data.status == 'error') {
+                return false
+            }
             if (data.error) {
                 $("#update-department-group-modal-error-msg").show();
                 $("#update-department-group-modal-error-msg").text(data.error);

diff --git a/azkaban-common/pom.xml b/azkaban-common/pom.xml
@@ -20,10 +20,18 @@
       <version>${hadoop.version}</version>
       <exclusions>
         <exclusion>
-          <artifactId>netty</artifactId>
-          <groupId>io.netty</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jackson-annotations</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
         </exclusion>
-	<exclusion>
+        <exclusion>
           <artifactId>slf4j-log4j12</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
@@ -99,22 +107,21 @@
           <artifactId>netty</artifactId>
           <groupId>io.netty</groupId>
         </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop.version}</version>
       <exclusions>
-
+        <exclusion>
+          <artifactId>jackson-databind</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jackson-annotations</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>log4j</artifactId>
           <groupId>log4j</groupId>
@@ -123,6 +130,10 @@
           <artifactId>slf4j-log4j12</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>commons-beanutils</artifactId>
+          <groupId>commons-beanutils</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -131,10 +142,10 @@
       <version>${hadoop.version}</version>
       <exclusions>
         <exclusion>
-          <artifactId>netty</artifactId>
-          <groupId>io.netty</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
         </exclusion>
-	<exclusion>
+        <exclusion>
           <artifactId>log4j</artifactId>
           <groupId>log4j</groupId>
         </exclusion>
@@ -182,6 +193,12 @@
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
       <version>${quartz.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>c3p0</artifactId>
+          <groupId>c3p0</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -217,20 +234,6 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>${velocity.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.struts</groupId>
-          <artifactId>struts-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.struts</groupId>
-          <artifactId>struts-taglib</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.struts</groupId>
-          <artifactId>struts-tiles</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
@@ -268,7 +271,17 @@
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>easyexcel</artifactId>
-      <version>1.1.1</version>
+      <version>2.2.3</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>poi</artifactId>
+          <groupId>org.apache.poi</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>poi-ooxml-schemas</artifactId>
+          <groupId>org.apache.poi</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/azkaban-common/src/main/java/azkaban/executor/ConnectorParams.java b/azkaban-common/src/main/java/azkaban/executor/ConnectorParams.java
@@ -23,6 +23,7 @@ public interface ConnectorParams {
   public static final String EXECID_PARAM = "execid";
   public static final String SHAREDTOKEN_PARAM = "token";
   public static final String USER_PARAM = "user";
+  public static final String TOKEN_PARAM = "token";
 
   public static final String UPDATE_ACTION = "update";
   public static final String STATUS_ACTION = "status";