Skip to content

Commit

Permalink
Rename IdentityProviderDefinition to SamlIdentityProviderDefinition t…
Browse files Browse the repository at this point in the history 
…o clarify the name and its purpose
  • Loading branch information
@fhanik
fhanik committed Sep 8, 2015
1 parent c41b046 commit a175847
Show file tree
Hide file tree
Showing 21 changed files with 270 additions and 286 deletions.
14 changes: 7 additions & 7 deletions ...n/src/main/java/org/cloudfoundry/identity/uaa/authentication/login/LoginInfoEndpoint.java
View file
Expand Up @@ -23,8 +23,8 @@
import org.cloudfoundry.identity.uaa.login.AutologinRequest;
import org.cloudfoundry.identity.uaa.login.AutologinResponse;
import org.cloudfoundry.identity.uaa.login.PasscodeInformation;
import org.cloudfoundry.identity.uaa.login.saml.IdentityProviderConfigurator;
import org.cloudfoundry.identity.uaa.login.saml.IdentityProviderDefinition;
import org.cloudfoundry.identity.uaa.login.saml.SamlIdentityProviderConfigurator;
import org.cloudfoundry.identity.uaa.login.saml.SamlIdentityProviderDefinition;
import org.cloudfoundry.identity.uaa.login.saml.LoginSamlAuthenticationToken;
import org.cloudfoundry.identity.uaa.user.UaaAuthority;
import org.cloudfoundry.identity.uaa.util.JsonUtils;
Expand Down Expand Up @@ -98,7 +98,7 @@ public class LoginInfoEndpoint {

protected Environment environment;

private IdentityProviderConfigurator idpDefinitions;
private SamlIdentityProviderConfigurator idpDefinitions;

private long codeExpirationMillis = 5 * 60 * 1000;

Expand All @@ -119,7 +119,7 @@ public void setCodeExpirationMillis(long codeExpirationMillis) {
this.codeExpirationMillis = codeExpirationMillis;
}

public void setIdpDefinitions(IdentityProviderConfigurator idpDefinitions) {
public void setIdpDefinitions(SamlIdentityProviderConfigurator idpDefinitions) {
this.idpDefinitions = idpDefinitions;
}

Expand Down Expand Up @@ -209,7 +209,7 @@ private String login(Model model, Principal principal, List<String> excludedProm
HttpSession session = request != null ? request.getSession(false) : null;
List<String> allowedIdps = getAllowedIdps(session);

List<IdentityProviderDefinition> idps = getIdentityProviderDefinitions(allowedIdps);
List<SamlIdentityProviderDefinition> idps = getSamlIdentityProviderDefinitions(allowedIdps);

boolean fieldUsernameShow = true;

Expand Down Expand Up @@ -242,7 +242,7 @@ private String login(Model model, Principal principal, List<String> excludedProm
// Entity ID to start the discovery
model.addAttribute("entityID", getZonifiedEntityId());
model.addAttribute("idpDefinitions", idps);
for (IdentityProviderDefinition idp : idps) {
for (SamlIdentityProviderDefinition idp : idps) {
if(idp.isShowSamlLink()) {
model.addAttribute("showSamlLoginLinks", true);
noSamlIdpsPresent = false;
Expand Down Expand Up @@ -283,7 +283,7 @@ private String login(Model model, Principal principal, List<String> excludedProm
return "home";
}

protected List<IdentityProviderDefinition> getIdentityProviderDefinitions(List<String> allowedIdps) {
protected List<SamlIdentityProviderDefinition> getSamlIdentityProviderDefinitions(List<String> allowedIdps) {
return idpDefinitions.getIdentityProviderDefinitions(allowedIdps, IdentityZoneHolder.get());
}

Expand Down
11 changes: 5 additions & 6 deletions common/src/main/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrap.java
View file
Expand Up @@ -20,9 +20,8 @@
import java.util.List;

import org.cloudfoundry.identity.uaa.authentication.Origin;
import org.cloudfoundry.identity.uaa.authentication.manager.PeriodLockoutPolicy;
import org.cloudfoundry.identity.uaa.login.saml.IdentityProviderConfigurator;
import org.cloudfoundry.identity.uaa.login.saml.IdentityProviderDefinition;
import org.cloudfoundry.identity.uaa.login.saml.SamlIdentityProviderConfigurator;
import org.cloudfoundry.identity.uaa.login.saml.SamlIdentityProviderDefinition;
import org.cloudfoundry.identity.uaa.util.JsonUtils;
import org.cloudfoundry.identity.uaa.zone.IdentityProvider;
import org.cloudfoundry.identity.uaa.zone.IdentityProviderProvisioning;
Expand All @@ -37,7 +36,7 @@ public class IdentityProviderBootstrap implements InitializingBean {
public static final String DEFAULT_MAP = "{\"default\":\"default\"}";
private IdentityProviderProvisioning provisioning;
private List<IdentityProvider> providers = new LinkedList<>();
private IdentityProviderConfigurator configurator;
private SamlIdentityProviderConfigurator configurator;
private HashMap<String, Object> ldapConfig;
private HashMap<String, Object> keystoneConfig;
private Environment environment;
Expand All @@ -53,14 +52,14 @@ public IdentityProviderBootstrap(IdentityProviderProvisioning provisioning, Envi

}

public void setSamlProviders(IdentityProviderConfigurator configurator) {
public void setSamlProviders(SamlIdentityProviderConfigurator configurator) {
this.configurator = configurator;
}
protected void addSamlProviders() {
if (configurator==null) {
return;
}
for (IdentityProviderDefinition def : configurator.getIdentityProviderDefinitions()) {
for (SamlIdentityProviderDefinition def : configurator.getIdentityProviderDefinitions()) {
IdentityProvider provider = new IdentityProvider();
provider.setType(Origin.SAML);
provider.setOriginKey(def.getIdpEntityAlias());
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/cloudfoundry/identity/uaa/login/saml/LoginSamlAuthenticationProvider.java
View file
Expand Up @@ -74,7 +74,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
boolean addNew = true;
try {
IdentityProvider idp = identityProviderProvisioning.retrieveByOrigin(alias, IdentityZoneHolder.get().getId());
IdentityProviderDefinition samlConfig = idp.getConfigValue(IdentityProviderDefinition.class);
SamlIdentityProviderDefinition samlConfig = idp.getConfigValue(SamlIdentityProviderDefinition.class);
addNew = samlConfig.isAddShadowUserOnLogin();

if (!idp.isActive()) {
Expand Down
14 changes: 6 additions & 8 deletions common/src/main/java/org/cloudfoundry/identity/uaa/login/saml/LoginSamlEntryPoint.java
View file
Expand Up @@ -21,18 +21,16 @@
import org.springframework.security.saml.metadata.ExtendedMetadata;
import org.springframework.security.saml.websso.WebSSOProfileOptions;

import java.util.List;

public class LoginSamlEntryPoint extends SAMLEntryPoint {


private IdentityProviderConfigurator providerDefinitionList;
private SamlIdentityProviderConfigurator providerDefinitionList;

public IdentityProviderConfigurator getProviderDefinitionList() {
public SamlIdentityProviderConfigurator getProviderDefinitionList() {
return providerDefinitionList;
}

public void setProviderDefinitionList(IdentityProviderConfigurator providerDefinitionList) {
public void setProviderDefinitionList(SamlIdentityProviderConfigurator providerDefinitionList) {
this.providerDefinitionList = providerDefinitionList;
}

Expand All @@ -44,7 +42,7 @@ protected WebSSOProfileOptions getProfileOptions(SAMLMessageContext context, Aut
ExtendedMetadata extendedMetadata = this.metadata.getExtendedMetadata(idpEntityId);
if (extendedMetadata!=null) {
String alias = extendedMetadata.getAlias();
IdentityProviderDefinition def = getIDPDefinition(alias);
SamlIdentityProviderDefinition def = getIDPDefinition(alias);
if (def.getNameID()!=null) {
options.setNameID(def.getNameID());
}
Expand All @@ -56,9 +54,9 @@ protected WebSSOProfileOptions getProfileOptions(SAMLMessageContext context, Aut
return options;
}

private IdentityProviderDefinition getIDPDefinition(String alias) throws MetadataProviderException {
private SamlIdentityProviderDefinition getIDPDefinition(String alias) throws MetadataProviderException {
if (alias!=null) {
for (IdentityProviderDefinition def : getProviderDefinitionList().getIdentityProviderDefinitions()) {
for (SamlIdentityProviderDefinition def : getProviderDefinitionList().getIdentityProviderDefinitions()) {
if (alias.equals(def.getIdpEntityAlias()) && IdentityZoneHolder.get().getId().equals(def.getZoneId())) {
return def;
}
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/java/org/cloudfoundry/identity/uaa/login/saml/ProviderChangedListener.java
View file
Expand Up @@ -31,10 +31,10 @@ public class ProviderChangedListener implements ApplicationListener<IdentityProv

private static final Log logger = LogFactory.getLog(ProviderChangedListener.class);
private ZoneAwareMetadataManager metadataManager = null;
private final IdentityProviderConfigurator configurator;
private final SamlIdentityProviderConfigurator configurator;
private final IdentityZoneProvisioning zoneProvisioning;

public ProviderChangedListener(IdentityProviderConfigurator configurator,
public ProviderChangedListener(SamlIdentityProviderConfigurator configurator,
IdentityZoneProvisioning zoneProvisioning) {
this.configurator = configurator;
this.zoneProvisioning = zoneProvisioning;
Expand All @@ -49,10 +49,10 @@ public void onApplicationEvent(IdentityProviderModifiedEvent event) {
if (Origin.SAML.equals(provider.getType())) {
IdentityZone zone = zoneProvisioning.retrieve(provider.getIdentityZoneId());
ZoneAwareMetadataManager.ExtensionMetadataManager manager = metadataManager.getManager(zone);
IdentityProviderDefinition definition = JsonUtils.readValue(provider.getConfig(), IdentityProviderDefinition.class);
SamlIdentityProviderDefinition definition = JsonUtils.readValue(provider.getConfig(), SamlIdentityProviderDefinition.class);
try {
if (provider.isActive()) {
ExtendedMetadataDelegate[] delegates = configurator.addIdentityProviderDefinition(definition);
ExtendedMetadataDelegate[] delegates = configurator.addSamlIdentityProviderDefinition(definition);
if (delegates[1]!=null) {
manager.removeMetadataProvider(delegates[1]);
}
Expand Down

0 comments on commit a175847

Please sign in to comment.