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.
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
Issue #6554 - create the DefaultIdentityService even if no realmName is provided #6569
Merged
lachlan-roberts
merged 3 commits into
jetty-10.0.x
from
jetty-10.0.x-6554-SecurityHandler
Aug 27, 2021
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
29a8d5d
Issue #6554 - create the DefaultIdentityService even if no realmName …
lachlan-roberts d35ff03
Issue #6554 - DefaultAuthenticatorFactory should not create BasicAuth…
lachlan-roberts 705fe19
Issue #6554 - add test for creation of DefaultIdentityService
lachlan-roberts File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
jetty-security/src/test/java/org/eclipse/jetty/security/DefaultIdentityServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
// | ||
// ======================================================================== | ||
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. | ||
// | ||
// This program and the accompanying materials are made available under the | ||
// terms of the Eclipse Public License v. 2.0 which is available at | ||
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
// which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
// | ||
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
// ======================================================================== | ||
// | ||
|
||
package org.eclipse.jetty.security; | ||
|
||
import javax.servlet.ServletRequest; | ||
import javax.servlet.ServletResponse; | ||
|
||
import org.eclipse.jetty.server.Authentication; | ||
import org.eclipse.jetty.server.Server; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.hamcrest.Matchers.instanceOf; | ||
|
||
public class DefaultIdentityServiceTest | ||
{ | ||
@Test | ||
public void testDefaultIdentityService() throws Exception | ||
{ | ||
Server server = new Server(); | ||
ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler(); | ||
TestAuthenticator authenticator = new TestAuthenticator(); | ||
securityHandler.setAuthenticator(authenticator); | ||
|
||
try | ||
{ | ||
server.setHandler(securityHandler); | ||
server.start(); | ||
|
||
// The DefaultIdentityService should have been created by default. | ||
assertThat(securityHandler.getIdentityService(), instanceOf(DefaultIdentityService.class)); | ||
assertThat(authenticator.getIdentityService(), instanceOf(DefaultIdentityService.class)); | ||
} | ||
finally | ||
{ | ||
server.stop(); | ||
} | ||
} | ||
|
||
public static class TestAuthenticator implements Authenticator | ||
{ | ||
private IdentityService _identityService; | ||
|
||
public IdentityService getIdentityService() | ||
{ | ||
return _identityService; | ||
} | ||
|
||
@Override | ||
public void setConfiguration(AuthConfiguration configuration) | ||
{ | ||
_identityService = configuration.getIdentityService(); | ||
} | ||
|
||
@Override | ||
public String getAuthMethod() | ||
{ | ||
return getClass().getSimpleName(); | ||
} | ||
|
||
@Override | ||
public void prepareRequest(ServletRequest request) | ||
{ | ||
} | ||
|
||
@Override | ||
public Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory) throws ServerAuthException | ||
{ | ||
return null; | ||
} | ||
|
||
@Override | ||
public boolean secureResponse(ServletRequest request, ServletResponse response, boolean mandatory, Authentication.User validatedUser) throws ServerAuthException | ||
{ | ||
return false; | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a test for this case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lachlan-roberts I agree that we need at least some simple test that checks a DIS is created if there is no realm. Ie not necessarily testing this specific line, but testing the PR in general.