Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ interface EvaluationContextPostProcessor<I> {
* that was passed in.
* @param context the original {@link EvaluationContext}
* @param invocation the security invocation object (i.e. Message)
* @return the upated context.
* @return the updated context.
*/
EvaluationContext postProcess(EvaluationContext context, I invocation);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

/**
* Strategy used by {@link AclImpl} to determine whether a principal is permitted to call
* adminstrative methods on the <code>AclImpl</code>.
* administrative methods on the <code>AclImpl</code>.
*
* @author Ben Alex
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public GrantedAuthoritySid(String grantedAuthority) {
public GrantedAuthoritySid(GrantedAuthority grantedAuthority) {
Assert.notNull(grantedAuthority, "GrantedAuthority required");
Assert.notNull(grantedAuthority.getAuthority(),
"This Sid is only compatible with GrantedAuthoritys that provide a non-null getAuthority()");
"This Sid is only compatible with GrantedAuthority that provide a non-null getAuthority()");
this.grantedAuthority = grantedAuthority.getAuthority();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void setAclClassIdSupported(boolean aclClassIdSupported) {
this.findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL_WITH_CLASS_ID_TYPE;
}
else {
log.debug("Find children statement has already been overridden, so not overridding the default");
log.debug("Find children statement has already been overridden, so not overriding the default");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* The default settings are for HSQLDB. If you are using a different database you will
* probably need to set the {@link #setSidIdentityQuery(String) sidIdentityQuery} and
* {@link #setClassIdentityQuery(String) classIdentityQuery} properties appropriately. The
* other queries, SQL inserts and updates can also be customized to accomodate schema
* other queries, SQL inserts and updates can also be customized to accommodate schema
* variations, but must produce results consistent with those expected by the defaults.
* <p>
* See the appendix of the Spring Security reference manual for more information on the
Expand Down Expand Up @@ -471,7 +471,7 @@ public void setAclClassIdSupported(boolean aclClassIdSupported) {
this.insertClass = DEFAULT_INSERT_INTO_ACL_CLASS_WITH_ID;
}
else {
log.debug("Insert class statement has already been overridden, so not overridding the default");
log.debug("Insert class statement has already been overridden, so not overriding the default");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public final void setAuthenticationFailureHandler(AuthenticationFailureHandler f
/**
* Use this {@code RequestMatcher} to match proxy receptor requests. Without setting
* this matcher, {@link CasAuthenticationFilter} will not capture any proxy receptor
* requets.
* requests.
* @param proxyReceptorMatcher the {@link RequestMatcher} to use
* @since 6.5
*/
Expand Down Expand Up @@ -383,8 +383,8 @@ public final void setRequestCache(RequestCache requestCache) {
}

/**
* Indicates if the request is elgible to process a service ticket. This method exists
* for readability.
* Indicates if the request is eligible to process a service ticket. This method
* exists for readability.
* @param request
* @param response
* @return
Expand All @@ -396,7 +396,7 @@ private boolean serviceTicketRequest(HttpServletRequest request, HttpServletResp
}

/**
* Indicates if the request is elgible to process a proxy ticket.
* Indicates if the request is eligible to process a proxy ticket.
* @param request
* @return
*/
Expand All @@ -419,7 +419,7 @@ private boolean authenticated() {
}

/**
* Indicates if the request is elgible to be processed as the proxy receptor.
* Indicates if the request is eligible to be processed as the proxy receptor.
* @param request
* @return
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public <C> void setSharedObject(Class<C> sharedType, C object) {
}

/**
* Gets a shared Object. Note that object heirarchies are not considered.
* Gets a shared Object. Note that object hierarchies are not considered.
* @param sharedType the type of the shared Object
* @return the shared Object or null if it is not found
*/
Expand Down Expand Up @@ -360,7 +360,7 @@ protected void beforeConfigure() {

/**
* Subclasses must implement this method to build the object that is being returned.
* @return the Object to be buit or null if the implementation allows it
* @return the Object to be built or null if the implementation allows it
*/
protected abstract O performBuild();

Expand Down Expand Up @@ -414,13 +414,13 @@ private boolean isUnbuilt() {
private enum BuildState {

/**
* This is the state before the {@link Builder#build()} is invoked
* This is the state before the {@link SecurityBuilder#build()} is invoked
*/
UNBUILT(0),

/**
* The state from when {@link Builder#build()} is first invoked until all the
* {@link SecurityConfigurer#init(SecurityBuilder)} methods have been invoked.
* The state from when {@link SecurityBuilder#build()} is first invoked until all
* the {@link SecurityConfigurer#init(SecurityBuilder)} methods have been invoked.
*/
INITIALIZING(1),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>>
<C> void setSharedObject(Class<C> sharedType, C object);

/**
* Gets a shared Object. Note that object heirarchies are not considered.
* Gets a shared Object. Note that object hierarchies are not considered.
* @param sharedType the type of the shared Object
* @return the shared Object or null if it is not found
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ final class FilterOrderRegistration {
/**
* Register a {@link Filter} with its specific position. If the {@link Filter} was
* already registered before, the position previously defined is not going to be
* overriden
* overridden
* @param filter the {@link Filter} to register
* @param position the position to associate with the {@link Filter}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ boolean isCustomLogoutSuccess() {
}

/**
* Gets the logoutSuccesUrl or null if a
* Gets the logoutSuccessUrl or null if a
* {@link #logoutSuccessHandler(LogoutSuccessHandler)} was configured.
* @return the logoutSuccessUrl
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>

/**
* This should not use RequestAttributeSecurityContextRepository since that is
* stateless and sesison management is about state management.
* stateless and session management is about state management.
*/
private SecurityContextRepository sessionManagementSecurityContextRepository = new HttpSessionSecurityContextRepository();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public Saml2MetadataConfigurer(ApplicationContext context) {
* If there is no {@code registrationId} and your
* {@link RelyingPartyRegistrationRepository} is {code Iterable}, the metadata
* endpoint will try and show all relying parties' metadata in a single
* {@code <md:EntitiesDecriptor} element.
* {@code <md:EntitiesDescriptor} element.
*
* <p>
* If you need a more sophisticated lookup strategy than these, use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ ServerHttpSecurity httpSecurity(ApplicationContext context) {
}

/**
* Applies all {@code Custmizer<ServerHttpSecurity>} Beans to
* Applies all {@code Customizer<ServerHttpSecurity>} Beans to
* {@link ServerHttpSecurity}.
* @param context the {@link ApplicationContext}
* @param http the {@link ServerHttpSecurity}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ void createX509Filter(BeanReference authManager,
}
injectAuthenticationDetailsSource(x509Elt, filterBuilder);
filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
createPrauthEntryPoint(x509Elt);
createPreauthEntryPoint(x509Elt);
createX509Provider();
}
this.x509Filter = filter;
Expand All @@ -562,7 +562,7 @@ private void createX509Provider() {
this.x509ProviderRef = new RuntimeBeanReference(this.pc.getReaderContext().registerWithGeneratedName(provider));
}

private void createPrauthEntryPoint(Element source) {
private void createPreauthEntryPoint(Element source) {
if (this.preAuthEntryPoint == null) {
this.preAuthEntryPoint = new RootBeanDefinition(Http403ForbiddenEntryPoint.class);
this.preAuthEntryPoint.setSource(this.pc.extractSource(source));
Expand Down Expand Up @@ -595,7 +595,7 @@ void createJeeFilter(BeanReference authManager,
adsBldr.addPropertyValue("mappableRolesRetriever", mappableRolesRetriever);
filterBuilder.addPropertyValue("authenticationDetailsSource", adsBldr.getBeanDefinition());
filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
createPrauthEntryPoint(jeeElt);
createPreauthEntryPoint(jeeElt);
createJeeProvider();
}
this.jeeFilter = filter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,20 +165,20 @@ private RootBeanDefinition createEmbeddedServer(Element element, ParserContext p
}

private RootBeanDefinition getRootBeanDefinition(String mode) {
if (isUnboundidEnabled(mode)) {
if (isUnboundIdEnabled(mode)) {
return new RootBeanDefinition(UNBOUNDID_CONTAINER_CLASSNAME, null, null);
}
throw new IllegalStateException("Embedded LDAP server is not provided");
}

private String resolveBeanId(String mode) {
if (isUnboundidEnabled(mode)) {
if (isUnboundIdEnabled(mode)) {
return BeanIds.EMBEDDED_UNBOUNDID;
}
return null;
}

private boolean isUnboundidEnabled(String mode) {
private boolean isUnboundIdEnabled(String mode) {
return "unboundid".equals(mode) || unboundIdPresent;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
static class ServletPathConfig {

@Bean
PathPatternRequestMatcherBuilderFactoryBean requesMatcherBuilder() {
PathPatternRequestMatcherBuilderFactoryBean requestMatcherBuilder() {
PathPatternRequestMatcherBuilderFactoryBean bean = new PathPatternRequestMatcherBuilderFactoryBean();
bean.setBasePath("/spring");
return bean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public interface SecurityExpressionOperations {
boolean isAnonymous();

/**
* Determines ifthe {@link #getAuthentication()} is authenticated
* Determines if the {@link #getAuthentication()} is authenticated
* @return true if the {@link #getAuthentication()} is authenticated, else false
*/
boolean isAuthenticated();
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/servlet/appendix/faq.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ If you build your project with Maven, adding the appropriate Spring Security mod
Any that are marked as "`optional`" in the Spring Security `pom.xml` files have to be added to your own `pom.xml` file if you need them.

[[appendix-faq-unboundid-deps]]
=== What dependences are needed to run an embedded UnboundID LDAP server?
=== What dependencies are needed to run an embedded UnboundID LDAP server?

You need to add the following dependency to your project:

Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/servlet/configuration/kotlin.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Second, each xref:#httpsecuritydsl-bean[HttpSecurityDsl.() -> Unit Beans] is app
This means that if there are multiple `HttpSecurity.() -> Unit` Beans, the https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[@Order] annotation can be added to the Bean definitions to control the ordering.

Next, every xref:#top-level-dsl-bean[Top Level Security Dsl Beans] type is looked up and each is is applied using `ObjectProvider#orderedStream()`.
If there is are differt types of top level security Beans (.e.g. `HeadersDsl.() -> Unit` and `HttpsRedirectDsl.() -> Unit`), then the order that each Dsl type is invoked is undefined.
If there is are different types of top level security Beans (.e.g. `HeadersDsl.() -> Unit` and `HttpsRedirectDsl.() -> Unit`), then the order that each Dsl type is invoked is undefined.
However, the order that each instance of of the same top level security Bean type is defined by `ObjectProvider#orderedStream()` and can be controlled using `@Order` on the Bean the definitions.

Finally, the `HttpSecurityDsl` Bean is injected as a Bean.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* It needs a <code>KerberosTicketValidator</code>, which contains the code to validate
* the ticket, as this code is different between SUN and IBM JRE.<br>
* It also needs an <code>UserDetailsService</code> to load the user properties and the
* <code>GrantedAuthorities</code>, as we only get back the username from Kerbeos
* <code>GrantedAuthorities</code>, as we only get back the username from Kerberos
* </p>
*
* You can see an example configuration in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public interface KerberosTicketValidator {

/**
* Validates a Kerberos/SPNEGO ticket.
* @param token Kerbeos/SPNEGO ticket
* @param token Kerberos/SPNEGO ticket
* @return authenticated kerberos principal
* @throws BadCredentialsException if the ticket is not valid
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
* &lt;/sec:authentication-manager&gt;
*
* &lt;bean id=&quot;kerberosServiceAuthenticationProvider&quot;
* class=&quot;org.springframework.security.kerberos.authenitcation.KerberosServiceAuthenticationProvider&quot;&gt;
* class=&quot;org.springframework.security.kerberos.authentication.KerberosServiceAuthenticationProvider&quot;&gt;
* &lt;property name=&quot;ticketValidator&quot;&gt;
* &lt;bean class=&quot;org.springframework.security.kerberos.authentication.sun.SunJaasKerberosTicketValidator&quot;&gt;
* &lt;property name=&quot;servicePrincipal&quot; value=&quot;HTTP/web.springsource.com&quot; /&gt;
Expand All @@ -103,7 +103,7 @@
* <a href="https://bugs.sun.com/view_bug.do?bug_id=6851973">bug</a>.
* </p>
* <p>
* A workaround unti this is fixed in the JVM is to change
* A workaround until this is fixed in the JVM is to change
* </p>
* HKEY_LOCAL_MACHINE\System \CurrentControlSet\Control\LSA\SuppressExtendedProtection to
* 0x02
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ public static class Builder {
* The following are valid patterns and their meaning
* <ul>
* <li>{@code /path} - match exactly and only `/path`</li>
* <li>{@code /path/**} - match `/path` and any of its descendents</li>
* <li>{@code /path/**} - match `/path` and any of its descendants</li>
* <li>{@code /path/{value}/**} - match `/path/subdirectory` and any of its
* descendents, capturing the value of the subdirectory in
* descendants, capturing the value of the subdirectory in
* {@link MessageAuthorizationContext#getVariables()}</li>
* </ul>
*
Expand Down Expand Up @@ -169,9 +169,9 @@ public PathPatternMessageMatcher matcher(String pattern) {
* The following are valid patterns and their meaning
* <ul>
* <li>{@code /path} - match exactly and only `/path`</li>
* <li>{@code /path/**} - match `/path` and any of its descendents</li>
* <li>{@code /path/**} - match `/path` and any of its descendants</li>
* <li>{@code /path/{value}/**} - match `/path/subdirectory` and any of its
* descendents, capturing the value of the subdirectory in
* descendants, capturing the value of the subdirectory in
* {@link MessageAuthorizationContext#getVariables()}</li>
* </ul>
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class Saml2X509Credential implements Serializable {

/**
* Creates a {@link Saml2X509Credential} using the provided parameters
* @param certificate the credential's public certificiate
* @param certificate the credential's public certificate
* @param types the credential's intended usages, must be one of
* {@link Saml2X509CredentialType#VERIFICATION} or
* {@link Saml2X509CredentialType#ENCRYPTION} or both.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public static DigestRequestPostProcessor digest(String username) {

/**
* Populates the provided X509Certificate instances on the request.
* @param certificates the X509Certificate instances to pouplate
* @param certificates the X509Certificate instances to populate
* @return the
* {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
*/
Expand All @@ -157,7 +157,7 @@ public static RequestPostProcessor x509(X509Certificate... certificates) {
}

/**
* Finds an X509Cetificate using a resoureName and populates it on the request.
* Finds an X509Certificate using a resourceName and populates it on the request.
* @param resourceName the name of the X509Certificate resource
* @return the
* {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ interface EvaluationContextPostProcessor<I> {
* that was passed in.
* @param context the original {@link EvaluationContext}
* @param invocation the security invocation object (i.e. FilterInvocation)
* @return the upated context.
* @return the updated context.
*/
EvaluationContext postProcess(EvaluationContext context, I invocation);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ private static List<String> getWebSphereGroups(final @Nullable String securityNa
return new ArrayList<>(groups);
}
catch (Exception ex) {
logger.error("Exception occured while looking up groups for user", ex);
throw new RuntimeException("Exception occured while looking up groups for user", ex);
logger.error("Exception occurred while looking up groups for user", ex);
throw new RuntimeException("Exception occurred while looking up groups for user", ex);
}
finally {
closeContext(context);
Expand All @@ -148,7 +148,7 @@ private static void closeContext(@Nullable Context context) {
}
}
catch (NamingException ex) {
logger.debug("Exception occured while closing context", ex);
logger.debug("Exception occurred while closing context", ex);
}
}

Expand Down
Loading