Skip to content

Commit

Permalink
clean up config-server config
Browse files Browse the repository at this point in the history
  • Loading branch information
SavvasMisaghMoayyed committed Oct 17, 2018
1 parent bb23378 commit 26ba8db
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ include "support:cas-server-support-session-jdbc"
include "webapp:cas-server-webapp-init"
include "webapp:cas-server-webapp-init-bootadmin-server"
include "webapp:cas-server-webapp-init-eureka-server"
include "webapp:cas-server-webapp-init-config-server"

include "webapp:cas-server-webapp-config"
include "webapp:cas-server-webapp-config-server"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package org.apereo.cas.adaptors.radius.web.flow;

import org.apereo.cas.CentralAuthenticationService;
import org.apereo.cas.authentication.Authentication;
import org.apereo.cas.authentication.AuthenticationException;
import org.apereo.cas.authentication.AuthenticationServiceSelectionPlan;
import org.apereo.cas.authentication.AuthenticationSystemSupport;
import org.apereo.cas.authentication.MultifactorAuthenticationProvider;
import org.apereo.cas.authentication.MultifactorAuthenticationProviderSelector;
import org.apereo.cas.authentication.MultifactorAuthenticationUtils;
import org.apereo.cas.services.RegisteredService;
import org.apereo.cas.services.ServicesManager;
import org.apereo.cas.ticket.registry.TicketRegistrySupport;
import org.apereo.cas.util.CollectionUtils;
Expand Down Expand Up @@ -54,7 +52,7 @@ public RadiusAccessChallengedAuthenticationWebflowEventResolver(final Authentica

@Override
public Set<Event> resolveInternal(final RequestContext context) {
final Authentication authentication = WebUtils.getAuthentication(context);
val authentication = WebUtils.getAuthentication(context);

if (authentication == null) {
LOGGER.debug("No authentication or service is available to determine event for principal");
Expand All @@ -72,7 +70,7 @@ public Set<Event> resolveInternal(final RequestContext context) {
LOGGER.debug("Evaluating principal attributes [{}] for multifactor authentication", attributes.keySet());
if (attributes.containsKey(Attr_ReplyMessage.NAME) && attributes.containsKey(Attr_State.NAME)) {
LOGGER.debug("Authentication requires multifactor authentication via provider [{}]", this.radiusMultifactorAuthenticationProviderId);
final Optional<MultifactorAuthenticationProvider> providerFound = resolveProvider(providerMap, this.radiusMultifactorAuthenticationProviderId);
val providerFound = resolveProvider(providerMap, this.radiusMultifactorAuthenticationProviderId);
if (providerFound.isPresent()) {
val multifactorAuthenticationProvider = providerFound.get();
final Event event = validateEventIdForMatchingTransitionInContext(multifactorAuthenticationProvider.getId(), context,
Expand Down
10 changes: 2 additions & 8 deletions webapp/cas-server-webapp-config-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@ apply plugin: "war"
project.ext["mainClassName"] = "org.apereo.cas.CasConfigurationServerWebApplication"
apply from: rootProject.file("gradle/springboot.gradle")

description = "Apereo CAS Spring Cloud Configuration Server"
description = "Apereo CAS Spring Cloud Configuration Web Application Server"

dependencies {
implementation libraries.springboottomcat
implementation libraries.springsecurity
implementation libraries.springsecurityweb
implementation libraries.springsecurityconfig
implementation libraries.springcloudconfigserver

implementation project(":core:cas-server-core-util-api")
implementation project(":core:cas-server-core-logging")
implementation project(":webapp:cas-server-webapp-init-config-server")
}
11 changes: 11 additions & 0 deletions webapp/cas-server-webapp-init-config-server/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description = "Apereo CAS Spring Cloud Configuration Server API"

dependencies {
implementation libraries.springsecurity
implementation libraries.springsecurityweb
implementation libraries.springsecurityconfig
implementation libraries.springcloudconfigserver

implementation project(":core:cas-server-core-util-api")
implementation project(":core:cas-server-core-logging")
}

0 comments on commit 26ba8db

Please sign in to comment.