backward compatible encryption option

Author: Thomasr

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionServiceImpl.java

@@ -20,15 +20,13 @@ public class EncryptionServiceImpl implements EncryptionService {
 
     @Autowired
     public EncryptionServiceImpl(
-        CommonConfig commonConfig,
-        @Value("${lowcoder.node-server.password}") String password,
-        @Value("${lowcoder.node-server.salt}") String salt
+        CommonConfig commonConfig
     ) {
         Encrypt encrypt = commonConfig.getEncrypt();
         String saltInHex = Hex.encodeHexString(encrypt.getSalt().getBytes());
         this.textEncryptor = Encryptors.text(encrypt.getPassword(), saltInHex);
-        String saltInHexForNodeServer = Hex.encodeHexString(salt.getBytes());
-        this.textEncryptorForNodeServer = Encryptors.text(password, saltInHexForNodeServer);
+        String saltInHexForNodeServer = Hex.encodeHexString(commonConfig.getJsExecutor().getSalt().getBytes());
+        this.textEncryptorForNodeServer = Encryptors.text(commonConfig.getJsExecutor().getPassword(), saltInHexForNodeServer);
     }
 
     @Override

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java

@@ -10,6 +10,7 @@
 import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO;
 import org.lowcoder.infra.js.NodeServerClient;
 import org.lowcoder.infra.js.NodeServerHelper;
+import org.lowcoder.sdk.config.CommonConfig;
 import org.lowcoder.sdk.config.CommonConfigHelper;
 import org.lowcoder.sdk.exception.ServerException;
 import org.lowcoder.sdk.models.DatasourceTestResult;
@@ -48,6 +49,7 @@ public class DatasourcePluginClient implements NodeServerClient {
             .build();
 
     private final CommonConfigHelper commonConfigHelper;
+    private final CommonConfig commonConfig;
     private final NodeServerHelper nodeServerHelper;
     private final EncryptionService encryptionService;
 
@@ -134,13 +136,23 @@ public Mono<QueryExecutionResult> executeQuery(String pluginName, Object queryDs
                                 "dataSourceConfig", datasourceConfig
                         );
                         String json = OBJECT_MAPPER.writeValueAsString(body);
-                        String encrypted = encryptionService.encryptStringForNodeServer(json);
-                        return WEB_CLIENT
+
+                        boolean encryptionEnabled = commonConfig.getJsExecutor().isEncrypted();
+                        String payload;
+                        WebClient.RequestBodySpec requestSpec = WEB_CLIENT
                                 .post()
                                 .uri(nodeServerHelper.createUri(RUN_PLUGIN_QUERY))
-                                .header(HttpHeaders.ACCEPT_LANGUAGE, language)
-                                .header("X-Encrypted", "true") // Optional: custom header to indicate encryption
-                                .bodyValue(encrypted)
+                                .header(HttpHeaders.ACCEPT_LANGUAGE, language);
+
+                        if (encryptionEnabled) {
+                            payload = encryptionService.encryptStringForNodeServer(json);
+                            requestSpec = requestSpec.header("X-Encrypted", "true");
+                        } else {
+                            payload = json;
+                        }
+
+                        return requestSpec
+                                .bodyValue(payload)
                                 .exchangeToMono(response -> {
                                     if (response.statusCode().is2xxSuccessful()) {
                                         return response.bodyToMono(Map.class)

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java

@@ -147,6 +147,9 @@ public long getMaxAgeInSeconds() {
     @Data
     public static class JsExecutor {
         private String host;
+        private String password;
+        private String salt;
+        private boolean isEncrypted;
     }
 
     @Data

server/api-service/lowcoder-server/src/main/resources/application-debug.yaml

@@ -37,6 +37,9 @@ common:
   cookie-name: LOWCODER_DEBUG_TOKEN
   js-executor:
     host: "http://127.0.0.1:6060"
+    password: ${LOWCODER_NODE_SERVICE_SECRET:lowcoderpwd}
+    salt: ${LOWCODER_NODE_SERVICE_SECRET_SALT:lowcodersalt}
+    is-encrypted: ${LOWCODER_NODE_SERVICE_ENCRYPTED:false}
   workspace:
     mode: ${LOWCODER_WORKSPACE_MODE:SAAS}
   plugin-dirs:
@@ -61,9 +64,4 @@ logging:
     org.lowcoder: debug
 
 default:
-  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT:10s}
-
-lowcoder:
-  node-server:
-    password: ${LOWCODER_NODE_SERVICE_SECRET:lowcoderpwd}
-    salt: ${LOWCODER_NODE_SERVICE_SECRET_SALT:lowcodersalt}
+  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT:10s}

server/api-service/lowcoder-server/src/main/resources/application.yaml

@@ -74,6 +74,9 @@ common:
     corsAllowedDomainString: ${LOWCODER_CORS_DOMAINS:*}
   js-executor:
     host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060}
+    password: ${LOWCODER_NODE_SERVICE_SECRET:lowcoderpwd}
+    salt: ${LOWCODER_NODE_SERVICE_SECRET_SALT:lowcodersalt}
+    is-encrypted: ${LOWCODER_NODE_SERVICE_ENCRYPTED:false}
   max-query-request-size: ${LOWCODER_MAX_REQUEST_SIZE:20m}
   max-query-response-size: ${LOWCODER_MAX_REQUEST_SIZE:20m}
   max-upload-size: ${LOWCODER_MAX_REQUEST_SIZE:20m}
@@ -129,9 +132,4 @@ management:
     redis:
       enabled: true
     diskspace:
-      enabled: false
-      
-lowcoder:
-  node-server:
-    password: ${LOWCODER_NODE_SERVICE_SECRET:lowcoderpwd}
-    salt: ${LOWCODER_NODE_SERVICE_SECRET_SALT:lowcodersalt}
+      enabled: false