public-collect/webprofile-ref-project-v3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changing EntityIdCriteria to EntityIdCriterion when resolving credential

Browse Source
This commit is contained in:
srasmusson
2016-04-23 23:34:38 +02:00
parent 2740e3757e
commit fce4c57294
3 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
View File

@@ -96,7 +96,10 @@ public class AccessFilter implements Filter {
SAMLEndpointContext endpointContext = peerEntityContext.getSubcontext(SAMLEndpointContext.class, true);
endpointContext.setEndpoint(getIPDEndpoint());
SignatureSigningParameters signatureSigningParameters = new SignatureSigningParameters();
signatureSigningParameters.setSigningCredential(SPCredentials.getCredential());
context.getSubcontext(SecurityParametersContext.class, true).setSignatureSigningParameters();
context.setMessage(authnRequest);

14
src/main/java/no/steras/opensamlbook/sp/SPCredentials.java
View File

@@ -1,6 +1,9 @@
package no.steras.opensamlbook.sp;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.Criterion;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.opensaml.security.credential.Credential;
import org.opensaml.security.credential.impl.KeyStoreCredentialResolver;
import org.slf4j.Logger;
@@ -18,7 +21,7 @@ import java.util.Map;
* Created by Privat on 13/05/14.
*/
public class SPCredentials {
/* private static final String KEY_STORE_PASSWORD = "password";
private static final String KEY_STORE_PASSWORD = "password";
private static final String KEY_STORE_ENTRY_PASSWORD = "password";
private static final String KEY_STORE_PATH = "/SPKeystore.jks";
private static final String KEY_ENTRY_ID = "SPKey";
@@ -32,11 +35,12 @@ public class SPCredentials {
passwordMap.put(KEY_ENTRY_ID, KEY_STORE_ENTRY_PASSWORD);
KeyStoreCredentialResolver resolver = new KeyStoreCredentialResolver(keystore, passwordMap);
Criteria criteria = new EntityIDCriteria(KEY_ENTRY_ID);
CriteriaSet criteriaSet = new CriteriaSet(criteria);
Criterion criterion = new EntityIdCriterion(KEY_ENTRY_ID);
CriteriaSet criteriaSet = new CriteriaSet();
credential = resolver.resolveSingle(criteriaSet);
} catch (org.opensaml.xml.security.SecurityException e) {
} catch (ResolverException e) {
throw new RuntimeException("Something went wrong reading credentials", e);
}
}
@@ -57,5 +61,5 @@ public class SPCredentials {
return credential;
}
*/
}