From 5fcfb6c66184b45cd655d01d263c513afd9390c0 Mon Sep 17 00:00:00 2001
From: Tboy <technoboy@yeah.net>
Date: Thu, 24 Oct 2019 13:54:07 +0800
Subject: [PATCH] update the dataSource perm (#1089)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message

* delete before check to avoid KeeperException$NoNodeException

* fix the message

* check processInstance state before delete tenant

* check processInstance state before delete worker group

* refactor

* merge api constants into common constatns

* update the resource perm

* update the dataSource perm
---
 .../api/service/DataSourceService.java        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
index 290b9bb6cc..f99bef8078 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
@@ -65,7 +65,7 @@ public class DataSourceService extends BaseService{
     public static final String PRINCIPAL = "principal";
     public static final String DATABASE = "database";
     public static final String USER_NAME = "userName";
-    public static final String PASSWORD = org.apache.dolphinscheduler.common.Constants.PASSWORD;
+    public static final String PASSWORD = Constants.PASSWORD;
     public static final String OTHER = "other";
 
 
@@ -90,7 +90,8 @@ public class DataSourceService extends BaseService{
 
         Map<String, Object> result = new HashMap<>(5);
         // check name can use or not
-        if (checkName(name, result)) {
+        if (checkName(name)) {
+            putMsg(result, Status.DATASOURCE_EXIST);
             return result;
         }
         Boolean isConnection = checkConnection(type, parameter);
@@ -146,8 +147,14 @@ public class DataSourceService extends BaseService{
             return result;
         }
 
+        if(loginUser.getId() != dataSource.getUserId() || loginUser.getUserType() != UserType.ADMIN_USER){
+            putMsg(result, Status.USER_NO_OPERATION_PERM);
+            return result;
+        }
+
         //check name can use or not
-        if(!name.trim().equals(dataSource.getName()) && checkName(name, result)){
+        if(!name.trim().equals(dataSource.getName()) && checkName(name)){
+            putMsg(result, Status.DATASOURCE_EXIST);
             return result;
         }
 
@@ -170,10 +177,9 @@ public class DataSourceService extends BaseService{
         return result;
     }
 
-    private boolean checkName(String name, Map<String, Object> result) {
+    private boolean checkName(String name) {
         List<DataSource> queryDataSource = dataSourceMapper.queryDataSourceByName(name.trim());
         if (queryDataSource != null && queryDataSource.size() > 0) {
-            putMsg(result, Status.DATASOURCE_EXIST);
             return true;
         }
         return false;
@@ -321,7 +327,7 @@ public class DataSourceService extends BaseService{
 
             String connectionParams  = dataSource.getConnectionParams();
             JSONObject  object = JSONObject.parseObject(connectionParams);
-            object.put(org.apache.dolphinscheduler.common.Constants.PASSWORD, org.apache.dolphinscheduler.common.Constants.XXXXXX);
+            object.put(Constants.PASSWORD, Constants.XXXXXX);
             dataSource.setConnectionParams(JSONUtils.toJson(object));
 
         }
@@ -587,7 +593,7 @@ public class DataSourceService extends BaseService{
                 putMsg(result, Status.RESOURCE_NOT_EXIST);
                 return result;
             }
-            if(loginUser.getId() != dataSource.getUserId() && loginUser.getUserType() != UserType.ADMIN_USER){
+            if(loginUser.getId() != dataSource.getUserId() || loginUser.getUserType() != UserType.ADMIN_USER){
                 putMsg(result, Status.USER_NO_OPERATION_PERM);
                 return result;
             }