Skip to content

OF-3187: Make AuthCheckFilter's destroy a no-op #3154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akrherz merged 1 commit into from
Mar 12, 2026
+12 −5
Merged

OF-3187: Make AuthCheckFilter's destroy a no-op #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2008 Jive Software, 2016-2025 Ignite Realtime Foundation. All rights reserved.
* Copyright (C) 2004-2008 Jive Software, 2016-2026 Ignite Realtime Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -316,8 +316,11 @@ private boolean authUserFromRequest(final HttpServletRequest request) {

@Override
public void destroy() {
// reset excludes to an empty set to prevent state carry over
excludes = Collections.newSetFromMap(new ConcurrentHashMap<>());
// Intentionally left empty. The static 'excludes' set is shared across filter instances
// so that plugin-registered excludes survive admin-console restarts. Plugins are
// responsible for calling removeExclude() in their destroyPlugin() lifecycle.
// Web.xml excludes are re-added by init() on each restart (Set semantics prevent duplicates).
// Setup-mode excludes are cleaned up explicitly in AdminConsolePlugin.startup().
}

private String getRedirectURL(HttpServletRequest request, String loginPage,
Expand Down
8 changes: 6 additions & 2 deletions xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2008 Jive Software, 2016-2025 Ignite Realtime Foundation. All rights reserved.
* Copyright (C) 2004-2008 Jive Software, 2016-2026 Ignite Realtime Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -283,8 +283,12 @@ protected void startup() {
try {
adminServer.start(); // excludes initialised

if(XMPPServer.getInstance().isSetupMode()) {
if (XMPPServer.getInstance().isSetupMode()) {
AuthCheckFilter.loadSetupExcludes();
} else {
// Explicitly remove setup-only excludes. If the admin console is restarting
// after setup completion, destroy() no longer clears them automatically.
Arrays.stream(JiveGlobals.setupExcludePaths).forEach(AuthCheckFilter::removeExclude);
}

// Log the ports that the admin server is listening on.
Expand Down
Loading