Merge branch 'master' of github.com:nr23730/fhirspark

buschlab · Dec 2, 2024 · f16e939 · f16e939
2 parents 0cc7008 + 917c481
commit f16e939
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 28 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Build Dockerfile
         run: docker build .
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Login to Docker registry
         uses: docker/login-action@v3

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     services:
       hapiserver:
-        image: hapiproject/hapi:v7.4.0
+        image: hapiproject/hapi:v7.6.0
         ports:
          - 8080:8080
         env:
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.repository == 'buschlab/fhirspark'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 12

diff --git a/pom.xml b/pom.xml
@@ -8,10 +8,10 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>5.11.0</junit.version>
+        <junit.version>5.11.3</junit.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-        <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
-        <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <exec.mainClass>fhirspark.FhirSpark</exec.mainClass>
@@ -44,37 +44,37 @@
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
-            <version>7.4.0</version>
+            <version>7.6.0</version>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-client</artifactId>
-            <version>7.4.0</version>
+            <version>7.6.0</version>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-structures-r4</artifactId>
-            <version>7.4.0</version>
+            <version>7.6.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.7</version>
+            <version>1.5.12</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.1</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -117,12 +117,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <dependencies>
                   <dependency>
                     <groupId>com.puppycrawl.tools</groupId>
                     <artifactId>checkstyle</artifactId>
-                    <version>10.18.1</version>
+                    <version>10.20.1</version>
                   </dependency>
                   <dependency>
                     <groupId>com.github.ngeor</groupId>

diff --git a/src/main/java/fhirspark/FhirSpark.java b/src/main/java/fhirspark/FhirSpark.java
@@ -93,14 +93,23 @@ public static void main(final String[] args) throws Exception {
         */
 
         get("/mtb/:patientId/permission", (req, res) -> {
-            if (settings.getLoginRequired()
-                && (!validateRequest(req) || validateManipulation(req) > 0)) {
-                res.status(HttpStatus.FORBIDDEN_403);
-                return "Access denied.";
+            if (settings.getLoginRequired()) {
+                int perms = validateManipulation(req);
+                if (!validateRequest(req) || perms > 0) {
+                    res.status(HttpStatus.FORBIDDEN_403);
+                    return "DENIED";
+                }
+                res.status(HttpStatus.ACCEPTED_202);
+                return switch(perms) {
+                    case 1 -> "WRITE";
+                    case 2 -> "ADMIN";
+                    default -> "DENIED";
+                };
+            } else {
+                res.status(HttpStatus.ACCEPTED_202);
+                res.header("Cache-Control", "no-cache, no-store, max-age=0");
+                return "WRITE";
             }
-            res.status(HttpStatus.ACCEPTED_202);
-            res.header("Cache-Control", "no-cache, no-store, max-age=0");
-            return "WRITE";
         });
 
         get("/mtb/:patientId", (req, res) -> {
@@ -116,7 +125,7 @@ public static void main(final String[] args) throws Exception {
 
         put("/mtb/:patientId", (req, res) -> {
             if (settings.getLoginRequired()
-                && (!validateRequest(req) || validateManipulation(req) > 0)) {
+                && (!validateRequest(req) || validateManipulation(req) == 0)) {
                 res.status(HttpStatus.FORBIDDEN_403);
                 return res;
             }
@@ -131,7 +140,7 @@ public static void main(final String[] args) throws Exception {
 
         delete("/mtb/:patientId", (req, res) -> {
             if (settings.getLoginRequired()
-                && (!validateRequest(req) || validateManipulation(req) > 0)) {
+                && (!validateRequest(req) || validateManipulation(req) == 0)) {
                 res.status(HttpStatus.FORBIDDEN_403);
                 return res;
             }
@@ -216,7 +225,7 @@ public static void main(final String[] args) throws Exception {
 
         put("/followup/:patientId", (req, res) -> {
             if (settings.getLoginRequired()
-                && (!validateRequest(req) || validateManipulation(req) > 0)) {
+                && (!validateRequest(req) || validateManipulation(req) == 0)) {
                 res.status(HttpStatus.FORBIDDEN_403);
                 return res;
             }
@@ -230,7 +239,7 @@ public static void main(final String[] args) throws Exception {
 
         delete("/followup/:patientId", (req, res) -> {
             if (settings.getLoginRequired()
-                && (!validateRequest(req) || validateManipulation(req) > 0)) {
+                && (!validateRequest(req) || validateManipulation(req) == 0)) {
                 res.status(HttpStatus.FORBIDDEN_403);
                 return res;
             }