From fce4c57294d23745298344d62c5ef28d01f06eb5 Mon Sep 17 00:00:00 2001
From: srasmusson <rasmusson.stefan@gmail.com>
Date: Sat, 23 Apr 2016 23:34:38 +0200
Subject: [PATCH] Changing EntityIdCriteria to EntityIdCriterion when resolving
 credential

---
 .idea/workspace.xml                           | 95 ++++++++++++-------
 .../steras/opensamlbook/sp/AccessFilter.java  |  5 +-
 .../steras/opensamlbook/sp/SPCredentials.java | 14 ++-
 3 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 773dd6d..f2d8780 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <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/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" />
     </list>
     <ignored path="webprofile-ref-project.iws" />
@@ -30,11 +25,11 @@
   </component>
   <component name="FileEditorManager">
     <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.62680113">
-              <caret line="98" column="7" selection-start-line="98" selection-start-column="7" selection-end-line="98" selection-end-column="7" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="94" column="2" selection-start-line="94" selection-start-column="2" selection-end-line="94" selection-end-column="2" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -62,12 +57,17 @@
           </provider>
         </entry>
       </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">
           <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 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>
@@ -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/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/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/SPCredentials.java" />
       </list>
     </option>
   </component>
@@ -504,7 +504,12 @@
       <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 />
+          <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>
@@ -586,7 +591,12 @@
       <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 />
+          <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>
@@ -668,7 +678,12 @@
       <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 />
+          <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>
@@ -750,7 +765,12 @@
       <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 />
+          <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>
@@ -865,14 +885,6 @@
         </state>
       </provider>
     </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">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -881,23 +893,36 @@
         </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.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">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.62680113">
-          <caret line="98" column="7" selection-start-line="98" selection-start-column="7" selection-end-line="98" selection-end-column="7" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="94" column="2" selection-start-line="94" selection-start-column="2" selection-end-line="94" selection-end-column="2" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </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>
 </project>
\ No newline at end of file
diff --git a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
index 5476a24..3075d5b 100644
--- a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
+++ b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
@@ -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);
 
 
diff --git a/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java b/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java
index d2ad05f..8b1a083 100644
--- a/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java
+++ b/src/main/java/no/steras/opensamlbook/sp/SPCredentials.java
@@ -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;
     }
 
-    */
+
 }