Skip to content

Fixed NPE when check 'behind-proxy' is enabled or not on an ssh node. #26167

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

Open
JackienStephan wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −1
Open

Fixed NPE when check 'behind-proxy' is enabled or not on an ssh node. #26167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e137ecf
Fixed NPE when check 'behind-proxy' is enabled or not on an ssh node.
JackienStephan Aug 6, 2026
99bc8f3
Simplify comment about the code
OndroMih Aug 27, 2026
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
10 changes: 9 additions & 1 deletion ...eus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.SecureAdmin;
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.config.serverbeans.Server;
import com.sun.enterprise.security.SecurityContext;
import com.sun.enterprise.security.auth.realm.Realm;
import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException;
Expand Down Expand Up @@ -322,7 +323,14 @@ public String getRemoteHost() {
* When enabled, the server trusts X-Real-IP and X-Forwarded-For headers.
*/
private boolean isBehindProxyEnabled() {
Config config = domain.getServerNamed("server").getConfig();
// find the <server> element of the current instance. Needed if executed on non-DAS instances,
// e.g. when calling admin commands against a remote instance
Server server = domain.getServerNamed(serverEnv.getInstanceName());
Config config;
if (server == null || (config = server.getConfig()) == null) {
// seems not possible.
throw new IllegalStateException("Can't find the config of the server.");
}
Protocol protocol = config.getAdminListener().findHttpProtocol();
Http http = protocol != null ? protocol.getHttp() : null;
return http != null && http.isBehindProxy();
Expand Down
Loading