cadc-inventory-server: expose resolved artifact for preventNotFound

opencadc · Apr 10, 2024 · 23f6077 · 23f6077
1 parent 933a3e3
commit 23f6077
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/cadc-inventory-server/build.gradle b/cadc-inventory-server/build.gradle
@@ -12,7 +12,7 @@ repositories {
 
 sourceCompatibility = 1.8
 group = 'org.opencadc'
-version = '0.3.0'
+version = '0.3.1'
 
 description = 'OpenCADC Storage Inventory server utility library'
 def git_url = 'https://github.com/opencadc/storage-inventory'

diff --git a/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java b/cadc-inventory-server/src/main/java/org/opencadc/inventory/transfer/ProtocolsGenerator.java
@@ -159,6 +159,11 @@ public class ProtocolsGenerator {
 
     // for use by FilesAction subclasses to enhance logging
     boolean storageResolverAdded = false;
+
+    /**
+     * The resolved Artifact from the database or due to preventNotFound actions.
+     */
+    public Artifact resolvedArtifact;
 
     public ProtocolsGenerator(ArtifactDAO artifactDAO, Map<URI, Availability> siteAvailabilities, Map<URI, StorageSiteRule> siteRules) {
         this.artifactDAO = artifactDAO;
@@ -241,7 +246,9 @@ public Artifact getUnsyncedArtifact(URI artifactURI, Transfer transfer, Set<Stor
                                 URL pa = new URL(sb.toString() + "/" + authToken + "/" + artifactURI.toASCIIString());
                                 urls.add(pa);
                             }
-                            urls.add(new URL(sb.append(artifactURI.toASCIIString()).toString()));
+                            if (!requirePreauthAnon) {
+                                urls.add(new URL(sb.append(artifactURI.toASCIIString()).toString()));
+                            }
                         } catch (MalformedURLException ex) {
                             throw new RuntimeException("BUG: Malformed URL to the site", ex);
                         }
@@ -277,7 +284,8 @@ Artifact getRemoteArtifact(URL location, URI artifactURI) {
         try {
             HttpGet head = new HttpGet(location, true);
             head.setHeadOnly(true);
-            head.setReadTimeout(10000);
+            head.setConnectionTimeout(6000);
+            head.setReadTimeout(9000);
             head.run();
             if (head.getResponseCode() != 200) {
                 // caught at the end of the method
@@ -348,6 +356,7 @@ List<Protocol> doPullFrom(URI artifactURI, Transfer transfer, String authToken,
             }
         }
         log.debug(artifactURI + " found: " + artifact);
+        this.resolvedArtifact = artifact;
 
         List<StorageSite> storageSites = new ArrayList<>();
         if (artifact != null) {
@@ -411,7 +420,7 @@ List<Protocol> doPullFrom(URI artifactURI, Transfer transfer, String authToken,
                             log.debug("added: " + p);
 
                             // add a plain anon URL
-                            if (authToken != null && !requirePreauthAnon && Standards.SECURITY_METHOD_ANON.equals(sec)) {
+                            if (!requirePreauthAnon && Standards.SECURITY_METHOD_ANON.equals(sec)) {
                                 sb = new StringBuilder();
                                 sb.append(baseURL.toExternalForm()).append("/");
                                 sb.append(artifactURI.toASCIIString());