chore: Move to Postgres

.github/workflows/build-docker-image.yml

@@ -81,6 +81,10 @@ jobs:
         run: |
           scripts/prepare_server_artifacts.sh
 
+      - name: Place server artifacts-es
+        run: |
+          scripts/prepare_server_artifacts.sh
+
       - name: Set base image tag
         id: set_base_tag
         run: |

.github/workflows/pr-automation.yml

@@ -132,4 +132,4 @@ jobs:
       tags: ${{ needs.parse-tags.outputs.tags}}
       spec: ${{ needs.parse-tags.outputs.spec}}
       matrix: ${{ needs.parse-tags.outputs.matrix}}
-      is-pg-build: ${{ github.event.pull_request.base.ref == 'pg' }}
+      is-pg-build: ${{ github.event.pull_request.base.ref == 'pg' || github.event.pull_request.head.ref == 'pg' }}

.github/workflows/test-build-docker-image.yml

@@ -311,7 +311,8 @@ jobs:
       id-token: write
 
     # Run this job as soon as the docker image is ready, if this is the release branch
-    if: ( always() && github.ref == 'refs/heads/release' )
+    if: |
+      always() && (github.ref_name == 'release' || github.ref_name == 'pg')
 
     steps:
       - name: Checkout the head commit of the branch
@@ -373,7 +374,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Build and push release image to Docker Hub
+      - name: Build and push image to Docker Hub
         if: success()
         uses: depot/build-push-action@v1
         with:
@@ -383,7 +384,7 @@ jobs:
           build-args: |
             APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }}
             APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
-            BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:release
+            BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:${{ github.ref_name }}
           tags: |
             ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ github.ref_name }}
 

app/server/.gitignore

@@ -15,3 +15,5 @@ container-volumes
 *.env
 dependency-reduced-pom.xml
 appsmith-server/failedServerTests.txt
+*Cake.java
+!Base*Cake.java

app/server/.run/ServerApplication.run.xml

@@ -21,4 +21,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

app/server/appsmith-interfaces/pom.xml

@@ -18,6 +18,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <!-- Overriding version to get fix for CVE-2024-1597. Remove once spring-boot is at least at 3.1.9 or 3.2.3 -->
+            <version>42.6.1</version>
+        </dependency>
+
         <dependency>
             <groupId>com.hierynomus</groupId>
             <artifactId>sshj</artifactId>
@@ -30,6 +37,21 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.2.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-63</artifactId>
+            <version>3.8.3</version>
+        </dependency>
+
         <!-- Actual Junit5 implementation. Will transitively include junit-jupiter-api -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -62,17 +84,6 @@
             <version>${org.pf4j.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-mongodb</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -90,6 +101,12 @@
             <artifactId>spring-security-crypto</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.0.1-jre</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionEntityListener.java

@@ -0,0 +1,30 @@
+package com.appsmith.external.annotations.encryption;
+
+import com.appsmith.external.helpers.EncryptionHelper;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.PrePersist;
+import org.springframework.stereotype.Component;
+
+/**
+ * This isn't used today. Encryption/decryption with Postgres, only happens for nested fields in JSONB columns, and
+ * is handled in the {@link com.fasterxml.jackson.databind.ObjectMapper} directly, as part of
+ * {@link com.appsmith.external.helpers.CustomJsonType}.
+ * Yet the code is kept for now, as we potentially may have to revisit, when we need to have encryption/decryption for
+ * top-level fields in entity classes, since Jackson can't help there.
+ */
+@Component
+@SuppressWarnings(
+        // Can't fix this since it's the only way to autowire beans for entity listeners.
+        "SpringJavaAutowiredFieldsWarningInspection")
+public class EncryptionEntityListener {
+
+    @PrePersist
+    public void prePersist(Object entity) {
+        new EncryptionHandler().convertEncryption(entity, EncryptionHelper::encrypt);
+    }
+
+    @PostLoad
+    public void postLoad(Object entity) {
+        new EncryptionHandler().convertEncryption(entity, EncryptionHelper::decrypt);
+    }
+}

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/annotations/encryption/EncryptionHandler.java

@@ -233,7 +233,7 @@ List<CandidateField> findCandidateFieldsForType(@NonNull Object source) {
         return finalCandidateFields;
     }
 
-    synchronized boolean convertEncryption(Object source, UnaryOperator<String> transformer) {
+    public synchronized boolean convertEncryption(Object source, UnaryOperator<String> transformer) {
         if (source == null) {
             return false;
         }

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/converters/HttpMethodConverter.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.gson.JsonDeserializationContext;
@@ -50,7 +51,15 @@ public static class HttpMethodDeserializer extends com.fasterxml.jackson.databin
         @Override
         public HttpMethod deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException {
-            return HttpMethod.valueOf(deserializationContext.readValue(jsonParser, String.class));
+            JsonNode value = deserializationContext.readValue(jsonParser, JsonNode.class);
+            // Custom handling is required because while migrating data from MongoDB this field is stored as:
+            // => "httpMethod": {"name": "GET"}
+            // But when stored via pg server we are storing the enum string:
+            // => "httpMethod": "GET"
+            if (value.has("name")) {
+                return HttpMethod.valueOf(value.get("name").asText());
+            }
+            return HttpMethod.valueOf(value.asText());
         }
     }
 }