Do not validate storage of emulated Rejection Notes against configur…

…ed Store Permission Service fix #4299
dcm4che · Nov 29, 2023 · dd53e29 · dd53e29
1 parent 8073a87
commit dd53e29
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/RejectionServiceImpl.java b/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/RejectionServiceImpl.java
@@ -130,6 +130,7 @@ public int reject(ApplicationEntity ae, String aet, String studyIUID, String ser
         String changeRequesterAET = ae.getAEExtension(ArchiveAEExtension.class).changeRequesterAET();
         StoreSession storeSession = storeService.newStoreSession(httpRequest, ae, aet,
                 changeRequesterAET != null ? changeRequesterAET : ae.getAETitle());
+        storeSession.setSkipStorePermission(true);
         String rejectionNoteObjectStorageID = rejectionNoteObjectStorageID(storeSession);
         storeSession.withObjectStorageID(rejectionNoteObjectStorageID);
         storeService.restoreInstances(storeSession, studyIUID, seriesIUID, null, null);

diff --git a/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/StoreSession.java b/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/StoreSession.java
@@ -143,4 +143,8 @@ public interface StoreSession extends Closeable {
     String getImpaxReportEndpoint();
 
     void setImpaxReportEndpoint(String impaxReportEndpoint);
+
+    boolean isSkipStorePermission();
+
+    void setSkipStorePermission(boolean skipStorePermission);
 }
diff --git a/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/impl/StoreServiceEJB.java b/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/impl/StoreServiceEJB.java
@@ -1307,6 +1307,7 @@ private String objectStorageID(StoreContext ctx) {
 
     private void checkStorePermission(StoreContext ctx, Patient pat) throws DicomServiceException {
         StoreSession session = ctx.getStoreSession();
+        if (session.isSkipStorePermission()) return;
         String serviceURL = session.getArchiveAEExtension().storePermissionServiceURL();
         if (serviceURL == null) {
             emulateStorePermissionResponse(ctx, pat);

diff --git a/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/impl/StoreSessionImpl.java b/dcm4chee-arc-store/src/main/java/org/dcm4chee/arc/store/impl/StoreSessionImpl.java
@@ -98,6 +98,7 @@ class StoreSessionImpl implements StoreSession {
     private Attributes.UpdatePolicy patientUpdatePolicy;
     private Attributes.UpdatePolicy studyUpdatePolicy;
     private String impaxReportEndpoint;
+    boolean skipStorePermission;
 
     StoreSessionImpl(StoreService storeService) {
         this.serialNo = prevSerialNo.incrementAndGet();
@@ -406,4 +407,15 @@ public String getImpaxReportEndpoint() {
     public void setImpaxReportEndpoint(String impaxReportEndpoint) {
         this.impaxReportEndpoint = impaxReportEndpoint;
     }
+
+    @Override
+    public boolean isSkipStorePermission() {
+        return skipStorePermission;
+    }
+
+    @Override
+    public void setSkipStorePermission(boolean skipStorePermission) {
+        this.skipStorePermission = skipStorePermission;
+    }
+
 }