just cleaning up for the night

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@79 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServiceSAML.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServiceSAML.java
index 9341bbf..d129070 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServiceSAML.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServiceSAML.java
@@ -20,7 +20,7 @@ public class HandleServiceSAML {
     public HandleServiceSAML( String domain, String AAurl, String HSname,
                              String KSpath, String KSpass, String KSkeyalias,
                              String KSkeypass, String certalias ) 
-       throws SAMLException, KeyStoreException, Exception
+       throws SAMLException, KeyStoreException, IOException, FileNotFoundException, Exception
     {
        this.domain = domain;
        this.AAurl = AAurl;
@@ -30,7 +30,6 @@ public class HandleServiceSAML {
        ks.load( fis, KSpass.toCharArray());
        privateKey = (PrivateKey)ks.getKey(KSkeyalias, KSkeypass.toCharArray());
        cert =(X509Certificate)ks.getCertificate(certalias);
-
        
        spp = ShibPOSTProfileFactory.getInstance( policies, HSname );
     }
@@ -46,7 +45,7 @@ public class HandleServiceSAML {
                  new QName(org.opensaml.XML.SAMLP_NS,"AttributeQuery") );
            SAMLResponse r = spp.prepare 
            ( shireURL, handle, domain, clientAddress, authMethod, 
-             authInstant, bindings, null, null, null, null
+             authInstant, bindings, privateKey, cert, null, null
              );
            byte[] buf = r.toBase64();
            

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
index 67f5edc..cbf51e1 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java
@@ -71,7 +71,7 @@ public class HandleServlet extends HttpServlet {
            throw new ServletException("Cannot find Handle Service name in init parameters");
        }
        if ( getInitParameter("KSpath") == null || 
-            getInitParameter("AAurl").equals("")) {
+            getInitParameter("KSpath").equals("")) {
            throw new ServletException("Cannot find path to KeyStore file in init parameters");
        }
        if ( getInitParameter("KSpass") == null || 
@@ -79,7 +79,7 @@ public class HandleServlet extends HttpServlet {
            throw new ServletException("Cannot find password to KeyStore in init parameters");
        }
        if ( getInitParameter("KSkeyalias") == null || 
-            getInitParameter("AAurl").equals("")) {
+            getInitParameter("KSkeyalias").equals("")) {
            throw new ServletException("Cannot find private key alias to KeyStore in init parameters");
        }
        if ( getInitParameter("KSkeypass") == null || 
@@ -121,6 +121,7 @@ public class HandleServlet extends HttpServlet {
            createForm( req, res, buf );
        }
        catch (HandleException ex) {
+           System.out.println(ex);
            handleError( req, res, ex );
        }