From f3869ff95cef0f6adc0650a878b72338a01b560b Mon Sep 17 00:00:00 2001
From: Dan Caseley <dan@caseley.me.uk>
Date: Mon, 18 Apr 2022 21:32:12 +0100
Subject: [PATCH] fixes #96: Don't require auth for readiness/liveness
 endpoints

---
 changelog.html                                       |  5 +++++
 .../openfire/plugin/rest/AuthFilter.java             | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/changelog.html b/changelog.html
index 643009f62..b11c19465 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,6 +44,11 @@ <h1>
 REST API Plugin Changelog
 </h1>
 
+<p><b>1.8.1</b> ???</p>
+<ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/96'>#96</a>] - Don't require auth for readiness/liveness endpoints</li>
+</ul>
+
 <p><b>1.8.0</b> April 6, 2022</p>
 <ul>
     <li>[<a href='https://github.com/igniterealtime/openfire-restAPI-plugin/issues/76'>#76</a>] - Add a clustering status endpoint</li>
diff --git a/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java b/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
index 60b66ea8e..ce447d5c4 100644
--- a/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
+++ b/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java
@@ -62,6 +62,11 @@ public void filter(ContainerRequestContext containerRequest) throws IOException
             return;
         }
 
+        if (isStatusEndpoint(containerRequest.getUriInfo().getRequestUri().getPath())) {
+            LOG.debug("Authentication was bypassed for a status endpoint");
+            return;
+        }
+
         if (!plugin.isEnabled()) {
             LOG.debug("REST API Plugin is not enabled");
             throw new WebApplicationException(Status.FORBIDDEN);
@@ -140,4 +145,11 @@ public void filter(ContainerRequestContext containerRequest) throws IOException
             }
         }
     }
+
+    private boolean isStatusEndpoint(String path){
+        return path.equals("/plugins/restapi/v1/system/liveness") ||
+            path.startsWith("/plugins/restapi/v1/system/liveness/") ||
+            path.equals("/plugins/restapi/v1/system/readiness") ||
+            path.startsWith("/plugins/restapi/v1/system/readiness/");
+    }
 }