From b557c90270aeb7287aca3a039bdaf0f95d7190de Mon Sep 17 00:00:00 2001 From: Vladimir Schafer Date: Sun, 3 Apr 2011 21:16:27 +0300 Subject: [PATCH] SES-86 Changed "singing" to "signing" --- .../saml/context/SAMLContextProviderImpl.java | 4 ++-- .../security/saml/metadata/ExtendedMetadata.java | 12 ++++++------ .../security/saml/metadata/MetadataGenerator.java | 2 +- .../saml/trust/MetadataCredentialResolver.java | 12 ++++++------ .../security/saml/web/MetadataController.java | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java index c995344..7d194dc 100755 --- a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java +++ b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java @@ -232,8 +232,8 @@ private void populateLocalEntity(SAMLMessageContext samlContext) throws Metadata samlContext.setLocalEntityRoleMetadata(roleDescriptor); samlContext.setLocalExtendedMetadata(extendedMetadata); - if (extendedMetadata.getSingingKey() != null) { - samlContext.setLocalSigningCredential(keyManager.getCredential(extendedMetadata.getSingingKey())); + if (extendedMetadata.getSigningKey() != null) { + samlContext.setLocalSigningCredential(keyManager.getCredential(extendedMetadata.getSigningKey())); } else { samlContext.setLocalSigningCredential(keyManager.getDefaultCredential()); } diff --git a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java index 799d58d..87c2a8b 100755 --- a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java +++ b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java @@ -47,7 +47,7 @@ public class ExtendedMetadata implements Serializable, Cloneable { * Key (stored in the local keystore) used for signing/verifying signature of messages sent/coming from this * entity. For local entities private key must be available, for remote entities only public key is required. */ - private String singingKey; + private String signingKey; /** * Key (stored in the local keystore) used for encryption/decryption of messages coming/sent from this entity. For local entities @@ -133,8 +133,8 @@ public void setAlias(String alias) { * * @return signing key, default if null */ - public String getSingingKey() { - return singingKey; + public String getSigningKey() { + return signingKey; } /** @@ -143,10 +143,10 @@ public String getSingingKey() { *

* Value can be used to override credential contained in the remote metadata. * - * @param singingKey key for creation/verification of signatures + * @param signingKey key for creation/verification of signatures */ - public void setSingingKey(String singingKey) { - this.singingKey = singingKey; + public void setSigningKey(String signingKey) { + this.signingKey = signingKey; } /** diff --git a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java index 40ef35f..85be9e3 100644 --- a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java +++ b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java @@ -123,7 +123,7 @@ protected KeyInfo generateKeyInfoForCredential(Credential credential) { public void generateExtendedMetadata(ExtendedMetadata metadata) { metadata.setEncryptionKey(encryptionKey); - metadata.setSingingKey(signingKey); + metadata.setSigningKey(signingKey); metadata.setAlias(entityAlias); metadata.setLocal(true); } diff --git a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java index 75d5cd5..da873a9 100644 --- a/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java +++ b/spring-security-saml/saml2-core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java @@ -83,9 +83,9 @@ protected Collection retrieveFromMetadata(String entityID, QName rol if (usage.equals(UsageType.UNSPECIFIED)) { Collection credentials = new LinkedList(); - if (extendedMetadata.getSingingKey() != null) { - log.debug("Using customized signing key {} from extended metadata for entityID {}", extendedMetadata.getSingingKey(), entityID); - credentials.add(keyManager.getCredential(extendedMetadata.getSingingKey())); + if (extendedMetadata.getSigningKey() != null) { + log.debug("Using customized signing key {} from extended metadata for entityID {}", extendedMetadata.getSigningKey(), entityID); + credentials.add(keyManager.getCredential(extendedMetadata.getSigningKey())); } if (extendedMetadata.getEncryptionKey() != null) { log.debug("Using customized encryption key {} from extended metadata for entityID {}", extendedMetadata.getEncryptionKey(), entityID); @@ -95,9 +95,9 @@ protected Collection retrieveFromMetadata(String entityID, QName rol return credentials; } } else if (usage.equals(UsageType.SIGNING)) { - if (extendedMetadata.getSingingKey() != null) { - log.debug("Using customized signing key {} from extended metadata for entityID {}", extendedMetadata.getSingingKey(), entityID); - return Collections.singleton(keyManager.getCredential(extendedMetadata.getSingingKey())); + if (extendedMetadata.getSigningKey() != null) { + log.debug("Using customized signing key {} from extended metadata for entityID {}", extendedMetadata.getSigningKey(), entityID); + return Collections.singleton(keyManager.getCredential(extendedMetadata.getSigningKey())); } } else if (usage.equals(UsageType.ENCRYPTION)) { if (extendedMetadata.getEncryptionKey() != null) { diff --git a/spring-security-saml/saml2-sample/src/main/java/org/springframework/security/saml/web/MetadataController.java b/spring-security-saml/saml2-sample/src/main/java/org/springframework/security/saml/web/MetadataController.java index ae7f636..20589b9 100755 --- a/spring-security-saml/saml2-sample/src/main/java/org/springframework/security/saml/web/MetadataController.java +++ b/spring-security-saml/saml2-sample/src/main/java/org/springframework/security/saml/web/MetadataController.java @@ -176,7 +176,7 @@ protected ModelAndView displayMetadata(EntityDescriptor entityDescriptor, Extend metadata.setRequireLogoutRequestSigned(extendedMetadata.isRequireLogoutRequestSigned()); metadata.setRequireLogoutResponseSigned(extendedMetadata.isRequireLogoutResponseSigned()); metadata.setEncryptionKey(extendedMetadata.getEncryptionKey()); - metadata.setSigningKey(extendedMetadata.getSingingKey()); + metadata.setSigningKey(extendedMetadata.getSigningKey()); // TODO TLS key ModelAndView model = new ModelAndView(new InternalResourceView("/WEB-INF/security/metadataView.jsp", true)); @@ -263,7 +263,7 @@ protected String getConfiguration(String fileName, ExtendedMetadata metadata) { " \n" + " \n" + " \n" + - " \n" + + " \n" + " \n" + " \n" + " \n" +