Reworked postMultipart auth check implementation

AtlasOfLivingAustralia · Jul 31, 2024 · 0a8b4ac · 0a8b4ac
1 parent ec704d2
commit 0a8b4ac
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/grails-app/services/au/org/ala/biocollect/merit/WebService.groovy b/grails-app/services/au/org/ala/biocollect/merit/WebService.groovy
@@ -78,14 +78,21 @@ class WebService {
         grailsApplication.config.webservice.readTimeout as int
     }
 
-    private void addAuthForAllowedDomains(URLConnection conn) {
-        def host = conn.getURL().getHost()
+    private boolean isDomainWhitelisted(URL url) {
+        def host = url.getHost()
         for (int domIndex = 0; domIndex < WHITE_LISTED_DOMAINS.size(); domIndex++) {
             if (host.endsWith(WHITE_LISTED_DOMAINS[domIndex])) {
-                conn.setRequestProperty("Authorization", getAuthHeader())
-                break
+                return true
             }
         }
+
+        return false
+    }
+
+    private void addAuthForAllowedDomains(URLConnection conn) {
+        if (isDomainWhitelisted(conn.getURL())) {
+            conn.setRequestProperty("Authorization", getAuthHeader())
+        }
     }
 
     private URLConnection configureConnection(String url, boolean includeUserId, Integer timeout = null) {
@@ -475,6 +482,7 @@ class WebService {
         def user = userService.getUser()
 
         HTTPBuilder builder = new HTTPBuilder(url)
+
         builder.request(Method.POST) { request ->
             requestContentType : 'multipart/form-data'
             MultipartEntity content = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE)
@@ -485,8 +493,12 @@ class WebService {
                 }
             }
 
+            if (isDomainWhitelisted(new URL(url))) {
+                headers."Authorization" = getAuthHeader()
+            }
+
             addHubUrlPath(headers)
-            addAuthForAllowedDomains(conn)
+
 
             if (user) {
                 headers[grailsApplication.config.app.http.header.userId] = user.userId