commit 87c0f33f579c5fca1d7f0d855150b77ec8104b0a
author David Pursehouse <dpursehouse@collab.net> Mon Sep 10 04:22:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 10 04:22:23 2018 +0000
tree 4bc65abdd6b08c1d2f774f78ac08a43180921f84
parent 0190f0ef191e065c151ae873f260eeaebe8f0477
parent 3775cbb77c41b5ebd72380556941d8abab3f8f19

Merge "Allow access using Basic Authentication prefix" into stable-2.14

src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
index 0afe8fd..488fe94 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/GerritMonitoringFilter.java
@@ -38,6 +38,7 @@
 import net.bull.javamelody.MonitoringFilter;
 import net.bull.javamelody.Parameter;
 import net.bull.javamelody.internal.common.HttpParameter;
+import net.bull.javamelody.internal.common.Parameters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -109,6 +110,7 @@
 
     private final PluginConfig cfg;
     private final Path defaultDataDir;
+    private String authenticatedMonitoringUrl;
 
     @Inject
     JavamelodyFilter(
@@ -141,6 +143,20 @@
       return getMonitoringUrl(httpRequest);
     }
 
+    @Override
+    protected String getMonitoringUrl(HttpServletRequest httpRequest) {
+      if (authenticatedMonitoringUrl == null) {
+        authenticatedMonitoringUrl =
+            httpRequest.getContextPath() + "/a" + Parameters.getMonitoringPath();
+      }
+
+      if (httpRequest.getRequestURI().equals(authenticatedMonitoringUrl)) {
+        return authenticatedMonitoringUrl;
+      }
+
+      return super.getMonitoringUrl(httpRequest);
+    }
+
     private String getTransformPattern() {
       return cfg.getString(HTTP_TRANSFORM_PATTERN, GERRIT_GROUPING);
     }