Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-08-24 14:26:46 +02:00
parent 7bd8b6554c
commit 4d47a86285
9 changed files with 15 additions and 18 deletions

View File

@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.security.ControllerPreAuthenticatedGatewaySecurityTok
import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter;
import org.eclipse.hawkbit.security.DdiSecurityProperties;
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.tenancy.TenantAware;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class AmqpControllerAuthentfication {
private final PreAuthTokenSourceTrustAuthenticationProvider preAuthenticatedAuthenticationProvider;
private final List<PreAuthenficationFilter> filterChain = new ArrayList<>();
private final List<PreAuthentificationFilter> filterChain = new ArrayList<>();
@Autowired
private ControllerManagement controllerManagement;
@@ -107,7 +107,7 @@ public class AmqpControllerAuthentfication {
*/
public Authentication doAuthenticate(final TenantSecurityToken secruityToken) {
PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null);
for (final PreAuthenficationFilter filter : filterChain) {
for (final PreAuthentificationFilter filter : filterChain) {
final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken);
if (authenticationRest != null) {
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) {
if (!filter.isEnable(secruityToken)) {

View File

@@ -68,7 +68,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
private final AntPathMatcher pathExtractor;
private PreAuthenficationFilter abstractControllerAuthenticationFilter;
private PreAuthentificationFilter abstractControllerAuthenticationFilter;
/**
* Constructor for sub-classes.
@@ -111,7 +111,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
}
}
protected abstract PreAuthenficationFilter createControllerAuthenticationFilter();
protected abstract PreAuthentificationFilter createControllerAuthenticationFilter();
@Override
protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response,

View File

@@ -39,7 +39,7 @@ public class HttpControllerPreAuthenticateAnonymousDownloadFilter extends Abstra
}
@Override
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
return new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagement, tenantAware,
systemSecurityContext);
}

View File

@@ -55,7 +55,7 @@ public class HttpControllerPreAuthenticateSecurityTokenFilter extends AbstractHt
}
@Override
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
return new ControllerPreAuthenticateSecurityTokenFilter(tenantConfigurationManagement, controllerManagement,
tenantAware, systemSecurityContext);
}

View File

@@ -43,7 +43,7 @@ public class HttpControllerPreAuthenticatedGatewaySecurityTokenFilter
}
@Override
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
return new ControllerPreAuthenticatedGatewaySecurityTokenFilter(tenantConfigurationManagement, tenantAware,
systemSecurityContext);
}

View File

@@ -54,7 +54,7 @@ public class HttpControllerPreAuthenticatedSecurityHeaderFilter extends Abstract
}
@Override
protected PreAuthenficationFilter createControllerAuthenticationFilter() {
protected PreAuthentificationFilter createControllerAuthenticationFilter() {
return new ControllerPreAuthenticatedSecurityHeaderFilter(caCommonNameHeader, caAuthorityNameHeader,
tenantConfigurationManagement, tenantAware, systemSecurityContext);
}

View File

@@ -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);

View File

@@ -16,7 +16,7 @@ import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
*
* @see DdiSecurityProperties
*/
public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthenficationFilter {
public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthentificationFilter {
private final DdiSecurityProperties ddiSecurityConfiguration;

View File

@@ -16,12 +16,9 @@ import org.springframework.security.core.Authentication;
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.
@@ -60,6 +57,6 @@ public interface PreAuthenficationFilter {
*/
default Collection<GrantedAuthority> getSuccessfulAuthenticationAuthorities() {
return Collections.emptyList();
};
}
}