Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8.x'

This commit is contained in:
Josh Cummings 2022-10-10 12:37:15 -06:00
parent f9f41047cf 8d096554f8
commit a453a71bed
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
3 changed files with 98 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/org/springframework/security/authorization/event/AuthorizationDeniedEvent.java
View File

@ -29,24 +29,21 @@ import org.springframework.security.core.Authentication;
* @author Josh Cummings
* @since 5.7
*/
public class AuthorizationDeniedEvent<T> extends ApplicationEvent {
private final Supplier<Authentication> authentication;
private final AuthorizationDecision decision;
public class AuthorizationDeniedEvent<T> extends AuthorizationEvent {
public AuthorizationDeniedEvent(Supplier<Authentication> authentication, T object, AuthorizationDecision decision) {
super(object);
this.authentication = authentication;
this.decision = decision;
super(authentication, object, decision);
}
public Supplier<Authentication> getAuthentication() {
return this.authentication;
}
public AuthorizationDecision getAuthorizationDecision() {
return this.decision;
/**
* Get the object to which access was requested
* @return the object to which access was requested
* @since 5.8
*/
@Override
@SuppressWarnings("unchecked")
public T getObject() {
return (T) getSource();
}
}

76
core/src/main/java/org/springframework/security/authorization/event/AuthorizationEvent.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.authorization.event;
import java.util.function.Supplier;
import org.springframework.context.ApplicationEvent;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
/**
* A parent class for {@link AuthorizationGrantedEvent} and
* {@link AuthorizationDeniedEvent}.
*
* @author Josh Cummings
* @since 5.8
*/
public class AuthorizationEvent extends ApplicationEvent {
private final Supplier<Authentication> authentication;
private final AuthorizationDecision decision;
/**
* Construct an {@link AuthorizationEvent}
* @param authentication the principal requiring access
* @param object the object to which access was requested
* @param decision whether authorization was granted or denied
*/
public AuthorizationEvent(Supplier<Authentication> authentication, Object object, AuthorizationDecision decision) {
super(object);
Assert.notNull(authentication, "authentication supplier cannot be null");
this.authentication = authentication;
this.decision = decision;
}
/**
* Get the principal requiring access
* @return the principal requiring access
*/
public Supplier<Authentication> getAuthentication() {
return this.authentication;
}
/**
* Get the object to which access was requested
* @return the object to which access was requested
*/
public Object getObject() {
return getSource();
}
/**
* Get the response to the princpal's request
* @return
*/
public AuthorizationDecision getAuthorizationDecision() {
return this.decision;
}
}

27
core/src/main/java/org/springframework/security/authorization/event/AuthorizationGrantedEvent.java
View File

@ -21,7 +21,6 @@ import java.util.function.Supplier;
import org.springframework.context.ApplicationEvent;
import org.springframework.security.authorization.AuthorizationDecision;
import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
/**
* An {@link ApplicationEvent} which indicates successful authorization.
@ -30,26 +29,22 @@ import org.springframework.util.Assert;
* @author Josh Cummings
* @since 5.7
*/
public class AuthorizationGrantedEvent<T> extends ApplicationEvent {
private final Supplier<Authentication> authentication;
private final AuthorizationDecision decision;
public class AuthorizationGrantedEvent<T> extends AuthorizationEvent {
public AuthorizationGrantedEvent(Supplier<Authentication> authentication, T object,
AuthorizationDecision decision) {
super(object);
Assert.notNull(authentication, "authentication supplier cannot be null");
this.authentication = authentication;
this.decision = decision;
super(authentication, object, decision);
}
public Supplier<Authentication> getAuthentication() {
return this.authentication;
}
public AuthorizationDecision getAuthorizationDecision() {
return this.decision;
/**
* Get the object to which access was requested
* @return the object to which access was requested
* @since 5.8
*/
@Override
@SuppressWarnings("unchecked")
public T getObject() {
return (T) getSource();
}
}