From ab4febc1d9b435165cfcf4c9bd195e2889d5e5bc Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 25 Sep 2018 11:40:08 -0700
Subject: [PATCH] [SHIBUI-899]

Added @Override for refresh method, commenting out code related to the
negative refresh delay problem (and logging we can live without for now).
---
 ...penSamlFileBackedHTTPMetadataResolver.java | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
index f1e551b8e..3a124671d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
@@ -8,6 +8,8 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.index.IndexWriter;
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.chrono.ISOChronology;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
 import org.opensaml.saml.metadata.resolver.impl.FileBackedHTTPMetadataResolver;
@@ -92,4 +94,67 @@ public void refilter() {
             logger.error("An error occurred while attempting to filter metadata!", e);
         }
     }
+
+    //TODO: This is a band-aid for the negative refresh issue. This override should go away once we figure out
+    // why the negative refresh is occurring.
+    @Override
+    public synchronized void refresh() throws ResolverException {
+        DateTime now = null;
+        String mdId = null;
+        // boolean trackRefreshSuccess = false;
+
+        try {
+            // In case a destroy() thread beat this thread into the monitor.
+            if (isDestroyed()) {
+                return;
+            }
+
+            // A manual refresh() must cancel the previously-scheduled future task, since will (re)schedule its own.
+            // If this execution *is* the task, it's ok to cancel ourself, we're already running.
+            /*if (refreshMetadataTask != null) {
+                refreshMetadataTask.cancel();
+            }*/
+
+            now = new DateTime(ISOChronology.getInstanceUTC());
+            mdId = getMetadataIdentifier();
+
+            // log.debug("{} Beginning refresh of metadata from '{}'", getLogPrefix(), mdId);
+
+            final byte[] mdBytes = fetchMetadata();
+            if (mdBytes == null) {
+                // log.info("{} Metadata from '{}' has not changed since last refresh", getLogPrefix(), mdId);
+                processCachedMetadata(mdId, now);
+            } else {
+                // log.debug("{} Processing new metadata from '{}'", getLogPrefix(), mdId);
+                processNewMetadata(mdId, now, mdBytes);
+            }
+        } catch (final Throwable t) {
+            // trackRefreshSuccess = false;
+            // log.error("{} Error occurred while attempting to refresh metadata from '{}'", getLogPrefix(), mdId, t);
+            // nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(minRefreshDelay);
+            if (t instanceof Exception) {
+                throw new ResolverException((Exception) t);
+            } else {
+                throw new ResolverException(String.format("Saw an error of type '%s' with message '%s'",
+                                                          t.getClass().getName(), t.getMessage()));
+            }
+        } /*finally {
+            // logCachedMetadataExpiration(now);
+
+            if (trackRefreshSuccess) {
+                wasLastRefreshSuccess = true;
+                lastSuccessfulRefresh = now;
+            } else {
+                wasLastRefreshSuccess = false;
+            }
+
+            refreshMetadataTask = new RefreshMetadataTask();
+            final long nextRefreshDelay = nextRefresh.getMillis() - System.currentTimeMillis();
+            // taskTimer.schedule(refreshMetadataTask, nextRefreshDelay);
+            log.info("{} Next refresh cycle for metadata provider '{}' will occur on '{}' ('{}' local time)",
+                     new Object[] {getLogPrefix(), mdId, nextRefresh,
+                             nextRefresh.toDateTime(DateTimeZone.getDefault()),});
+            lastRefresh = now;
+        }*/
+    }
 }