@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.security.ControllerPreAuthenticatedGatewaySecurityTok
|
|||||||
import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter;
|
import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter;
|
||||||
import org.eclipse.hawkbit.security.DdiSecurityProperties;
|
import org.eclipse.hawkbit.security.DdiSecurityProperties;
|
||||||
import org.eclipse.hawkbit.security.PreAuthTokenSourceTrustAuthenticationProvider;
|
import org.eclipse.hawkbit.security.PreAuthTokenSourceTrustAuthenticationProvider;
|
||||||
import org.eclipse.hawkbit.security.PreAuthenficationFilter;
|
import org.eclipse.hawkbit.security.PreAuthentificationFilter;
|
||||||
import org.eclipse.hawkbit.security.SystemSecurityContext;
|
import org.eclipse.hawkbit.security.SystemSecurityContext;
|
||||||
import org.eclipse.hawkbit.tenancy.TenantAware;
|
import org.eclipse.hawkbit.tenancy.TenantAware;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@@ -45,7 +45,7 @@ public class AmqpControllerAuthentfication {
|
|||||||
|
|
||||||
private final PreAuthTokenSourceTrustAuthenticationProvider preAuthenticatedAuthenticationProvider;
|
private final PreAuthTokenSourceTrustAuthenticationProvider preAuthenticatedAuthenticationProvider;
|
||||||
|
|
||||||
private final List<PreAuthenficationFilter> filterChain = new ArrayList<>();
|
private final List<PreAuthentificationFilter> filterChain = new ArrayList<>();
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ControllerManagement controllerManagement;
|
private ControllerManagement controllerManagement;
|
||||||
@@ -107,7 +107,7 @@ public class AmqpControllerAuthentfication {
|
|||||||
*/
|
*/
|
||||||
public Authentication doAuthenticate(final TenantSecurityToken secruityToken) {
|
public Authentication doAuthenticate(final TenantSecurityToken secruityToken) {
|
||||||
PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null);
|
PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null);
|
||||||
for (final PreAuthenficationFilter filter : filterChain) {
|
for (final PreAuthentificationFilter filter : filterChain) {
|
||||||
final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken);
|
final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken);
|
||||||
if (authenticationRest != null) {
|
if (authenticationRest != null) {
|
||||||
authentication = authenticationRest;
|
authentication = authenticationRest;
|
||||||
@@ -119,7 +119,7 @@ public class AmqpControllerAuthentfication {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthenficationFilter filter,
|
private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthentificationFilter filter,
|
||||||
final TenantSecurityToken secruityToken) {
|
final TenantSecurityToken secruityToken) {
|
||||||
|
|
||||||
if (!filter.isEnable(secruityToken)) {
|
if (!filter.isEnable(secruityToken)) {
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
|
|||||||
|
|
||||||
private final AntPathMatcher pathExtractor;
|
private final AntPathMatcher pathExtractor;
|
||||||
|
|
||||||
private PreAuthenficationFilter abstractControllerAuthenticationFilter;
|
private PreAuthentificationFilter abstractControllerAuthenticationFilter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor for sub-classes.
|
* Constructor for sub-classes.
|
||||||
@@ -111,7 +111,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract PreAuthenficationFilter createControllerAuthenticationFilter();
|
protected abstract PreAuthentificationFilter createControllerAuthenticationFilter();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response,
|
protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response,
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class HttpControllerPreAuthenticateAnonymousDownloadFilter extends Abstra
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
|
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
|
||||||
return new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagement, tenantAware,
|
return new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagement, tenantAware,
|
||||||
systemSecurityContext);
|
systemSecurityContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class HttpControllerPreAuthenticateSecurityTokenFilter extends AbstractHt
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
|
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
|
||||||
return new ControllerPreAuthenticateSecurityTokenFilter(tenantConfigurationManagement, controllerManagement,
|
return new ControllerPreAuthenticateSecurityTokenFilter(tenantConfigurationManagement, controllerManagement,
|
||||||
tenantAware, systemSecurityContext);
|
tenantAware, systemSecurityContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class HttpControllerPreAuthenticatedGatewaySecurityTokenFilter
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
|
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
|
||||||
return new ControllerPreAuthenticatedGatewaySecurityTokenFilter(tenantConfigurationManagement, tenantAware,
|
return new ControllerPreAuthenticatedGatewaySecurityTokenFilter(tenantConfigurationManagement, tenantAware,
|
||||||
systemSecurityContext);
|
systemSecurityContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class HttpControllerPreAuthenticatedSecurityHeaderFilter extends Abstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
|
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
|
||||||
return new ControllerPreAuthenticatedSecurityHeaderFilter(caCommonNameHeader, caAuthorityNameHeader,
|
return new ControllerPreAuthenticatedSecurityHeaderFilter(caCommonNameHeader, caAuthorityNameHeader,
|
||||||
tenantConfigurationManagement, tenantAware, systemSecurityContext);
|
tenantConfigurationManagement, tenantAware, systemSecurityContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractControllerAuthenticationFilter implements PreAuthenficationFilter {
|
public abstract class AbstractControllerAuthenticationFilter implements PreAuthentificationFilter {
|
||||||
|
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractControllerAuthenticationFilter.class);
|
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractControllerAuthenticationFilter.class);
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
|
|||||||
*
|
*
|
||||||
* @see DdiSecurityProperties
|
* @see DdiSecurityProperties
|
||||||
*/
|
*/
|
||||||
public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthenficationFilter {
|
public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthentificationFilter {
|
||||||
|
|
||||||
private final DdiSecurityProperties ddiSecurityConfiguration;
|
private final DdiSecurityProperties ddiSecurityConfiguration;
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,9 @@ import org.springframework.security.core.Authentication;
|
|||||||
import org.springframework.security.core.GrantedAuthority;
|
import org.springframework.security.core.GrantedAuthority;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface for Pre Authenfication.
|
* Interface for Pre Authentification.
|
||||||
*
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public interface PreAuthenficationFilter {
|
public interface PreAuthentificationFilter {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the filter is enabled.
|
* Check if the filter is enabled.
|
||||||
@@ -60,6 +57,6 @@ public interface PreAuthenficationFilter {
|
|||||||
*/
|
*/
|
||||||
default Collection<GrantedAuthority> getSuccessfulAuthenticationAuthorities() {
|
default Collection<GrantedAuthority> getSuccessfulAuthenticationAuthorities() {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
};
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user