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

95
.idea/workspace.xml generated
View File

@@ -2,12 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0141e75a-a562-4e34-8e98-b8776a8dbb68" name="Default" comment=""> <list default="true" id="0141e75a-a562-4e34-8e98-b8776a8dbb68" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/OpenSAMLUtils.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/OpenSAMLUtils.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/ArtifactResolutionServlet.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/ArtifactResolutionServlet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/IDPCredentials.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/IDPCredentials.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" afterPath="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" />
</list> </list>
<ignored path="webprofile-ref-project.iws" /> <ignored path="webprofile-ref-project.iws" />
@@ -30,11 +25,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AccessFilter.java" pinned="false" current-in-tab="true"> <file leaf-file-name="AccessFilter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java"> <entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.62680113"> <state vertical-scroll-proportion="0.0">
<caret line="98" column="7" selection-start-line="98" selection-start-column="7" selection-end-line="98" selection-end-column="7" /> <caret line="94" column="2" selection-start-line="94" selection-start-column="2" selection-end-line="94" selection-end-column="2" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@@ -62,12 +57,17 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="SPCredentials.java" pinned="false" current-in-tab="false"> <file leaf-file-name="SPCredentials.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java"> <entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.62680113">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="37" column="55" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="55" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -150,8 +150,8 @@
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/ArtifactResolutionServlet.java" /> <option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/idp/ArtifactResolutionServlet.java" />
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/OpenSAMLUtils.java" /> <option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/OpenSAMLUtils.java" />
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java" /> <option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java" />
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" />
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" /> <option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java" />
<option value="$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -504,7 +504,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -586,7 +591,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -668,7 +678,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -750,7 +765,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -865,14 +885,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java"> <entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@@ -881,23 +893,36 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java"> <entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.62680113"> <state vertical-scroll-proportion="0.0">
<caret line="98" column="7" selection-start-line="98" selection-start-column="7" selection-end-line="98" selection-end-column="7" /> <caret line="94" column="2" selection-start-line="94" selection-start-column="2" selection-end-line="94" selection-end-column="2" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.62680113">
<caret line="37" column="55" selection-start-line="37" selection-start-column="38" selection-end-line="37" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1217#1233#0" expanded="true" />
<element signature="e#2349#2350#0" expanded="true" />
<element signature="e#2382#2383#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

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); SAMLEndpointContext endpointContext = peerEntityContext.getSubcontext(SAMLEndpointContext.class, true);
endpointContext.setEndpoint(getIPDEndpoint()); endpointContext.setEndpoint(getIPDEndpoint());
SignatureSigningParameters signatureSigningParameters = new SignatureSigningParameters();
signatureSigningParameters.setSigningCredential(SPCredentials.getCredential());
context.getSubcontext(SecurityParametersContext.class, true).setSignatureSigningParameters();
context.setMessage(authnRequest); context.setMessage(authnRequest);

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

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