fix(TBD-12715):Knox check HDFS service (#4408 )

* fix(TBD-12715):Knox check HDFS service * fix(TBD-12715):Knox check HDFS service * fix(TBD-12715):Knox check HDFS service
fix(TUP-32130)CVE: json-smart-2.4.2.jar (#4437 )
2021-07-16 11:20:47 +02:00 · 2021-07-16 10:28:51 +08:00
3 changed files with 25 additions and 4 deletions
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
@@ -334,5 +334,19 @@ public class ConnParameterKeys {
    public static final String CONN_PARA_KEY_SET_HADOOP_CONF = "CONN_PARA_KEY_SET_HADOOP_CONF";

    public static final String CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR = "CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR";
+    
+    /**Knox*/
+    public static final String CONN_PARA_KEY_SPARK_MODE="CONN_PARA_KEY_SPARK_MODE";
+    
+    public static final String CONN_PARA_KEY_USE_KNOX="CONN_PARA_KEY_USE_KNOX";
+    
+    public static final String CONN_PARA_KEY_KNOX_URL="CONN_PARA_KEY_KNOX_URL";
+
+    public static final String CONN_PARA_KEY_KNOX_USER = "CONN_PARA_KEY_KNOX_USER";
+
+    public static final String CONN_PARA_KEY_KNOX_PASSWORD="CONN_PARA_KEY_KNOX_PASSWORD";
+    
+    public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
+

 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -87,8 +87,8 @@ public enum EDatabaseVersion4Drivers {
            "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
-                    "json-smart-2.4.2.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
-                    "accessors-smart-1.1.jar", "asm-5.0.3.jar" })),
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
+                    "accessors-smart-2.4.7.jar", "asm-9.1.jar" })),

    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
--- a/main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ExtendedNodeConnectionContextUtils.java
+++ b/main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ExtendedNodeConnectionContextUtils.java
@@ -138,8 +138,15 @@ public class ExtendedNodeConnectionContextUtils {
        DataBricksCloudProvider,
        DataBricksClusterId,
        DataBricksToken,
-        DataBricksDBFSDepFolder
-
+        DataBricksDBFSDepFolder,
+        
+        //Knox
+        SparkMode,
+        UseKnox,
+        KnoxUrl,
+        KnoxUsername,
+        KnoxPassword,
+        KnoxDirectory
    }

    static List<IContextParameter> getContextVariables(final String prefixName, Connection conn, Set<IConnParamName> paramSet) {
Author	SHA1	Message	Date
cbadillo1603	4c979e4e65	fix(TBD-12715):Knox check HDFS service (#4408 ) * fix(TBD-12715):Knox check HDFS service * fix(TBD-12715):Knox check HDFS service * fix(TBD-12715):Knox check HDFS service	2021-07-16 11:20:47 +02:00
jiezhang-tlnd	9705fd726a	fix(TUP-32130)CVE: json-smart-2.4.2.jar (#4437 )	2021-07-16 10:28:51 +08:00