Attempt at a default "localhost" config

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

diff --git a/src/conf/inqueue_sites.xml b/src/conf/inqueue_sites.xml
new file mode 100644 (file)
index 0000000..41bad81
--- /dev/null
+++ b/src/conf/inqueue_sites.xml
@@ -0,0 +1,31 @@
+<SiteGroup Name="urn:mace:inqueue" xmlns="urn:mace:shibboleth:1.0">
+       <OriginSite Name="urn:mace:inqueue:example.edu" ErrorURL="http://wayf.internet2.edu/InQueue/error.html">
+               <Alias>Example State University</Alias>
+               <Contact Type="technical" Name="InQueue Support" Email="inqueue-support@internet2.edu"/>
+               <HandleService Location="https://wayf.internet2.edu/InQueue/HS" Name="wayf.internet2.edu"/>
+               <AttributeAuthority Location="https://wayf.internet2.edu/InQueue/AA" Name="wayf.internet2.edu"/>
+               <Domain>example.edu</Domain>
+       </OriginSite>
+
+       <OriginSite Name="urn:mace:inqueue:shibdev.edu">
+               <Alias>Shibboleth Development Origin</Alias>
+               <Contact Type="technical" Name="Scott Cantor" Email="cantor.2@osu.edu"/>
+               <HandleService Location="https://shib2.internet2.edu/shibboleth/HS" Name="shib2.internet2.edu"/>
+               <AttributeAuthority Location="https://shib2.internet2.edu/shibboleth/AA" Name="shib2.internet2.edu"/>
+               <Domain>shibdev.edu</Domain>
+       </OriginSite>
+       
+       <DestinationSite Name="urn:mace:inqueue:example.edu">
+               <Alias>Example State University</Alias>
+               <Contact Type="technical" Name="InQueue Support" Email="inqueue-support@internet2.edu"/>
+               <AssertionConsumerServiceURL Location="https://wayf.internet2.edu/SHIRE"/>
+               <AttributeRequester Name="CN=wayf.internet2.edu,OU=TSG,O=University Corporation for Advanced Internet Development,L=Ann Arbor,ST=Michigan,C=US"/>
+       </DestinationSite>
+
+       <DestinationSite Name="urn:mace:inqueue:shibdev.edu">
+               <Alias>Shibboleth Development Target</Alias>
+               <Contact Type="technical" Name="Scott Cantor" Email="cantor.2@osu.edu"/>
+               <AssertionConsumerServiceURL Location="https://shib2.internet2.edu/Shibboleth.shire"/>
+               <AttributeRequester Name="Email=root@shib2.internet2.edu,CN=shib2.internet2.edu,O=UCAID,L=Ann Arbor,ST=Michigan,C=US"/>
+       </DestinationSite>
+</SiteGroup>

diff --git a/src/conf/origin.xml b/src/conf/origin.xml
index fa80413..5b34834 100644 (file)
--- a/src/conf/origin.xml
+++ b/src/conf/origin.xml
@@ -6,14 +6,21 @@
        xmlns:name="urn:mace:shibboleth:namemapper:1.0" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
        xsi:schemaLocation="urn:mace:shibboleth:origin:1.0 origin.xsd" 
-       AAUrl="http://therock.cc.columbia.edu:6666/shibboleth/AA" 
-       defaultRelyingParty="urn:mace:inqueue" 
-       providerId="urn:mace:inqueue:shibdev.edu">
+       AAUrl="https://localhost/shibboleth/AA" 
+       defaultRelyingParty="https://localhost/shibboleth/target" 
+       providerId="https://localhost/shibboleth/origin">
 
-       <RelyingParty name="urn:mace:inqueue" signingCredential="foo">
+       <RelyingParty name="https://localhost/shibboleth/target" signingCredential="foo">
                <HSNameFormat nameMapping="crypto"/>
        </RelyingParty>
 
+       <!-- You'll need to get a test credential from an InQueue CA -->
+       <!--
+       <RelyingParty name="urn:mace:inqueue" signingCredential="inqueue_cred">
+               <HSNameFormat nameMapping="crypto"/>
+       </RelyingParty>
+       -->
+       
        <ReleasePolicyEngine>
                <ArpRepository implementation="edu.internet2.middleware.shibboleth.aa.arp.provider.FileSystemArpRepository">
                        <Path>/conf/arps/</Path>
@@ -50,6 +57,9 @@
        
        <FederationProvider type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadataLoadWrapper"
                 uri="/conf/sites.xml"/>
-
+    <!--
+       <FederationProvider type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadataLoadWrapper"
+                uri="/conf/inqueue_sites.xml"/>
+       -->
 </ShibbolethOriginConfig>
 

diff --git a/src/conf/shib2.crt b/src/conf/shib2.crt
index 03202e4..82f08a8 100644 (file)
--- a/src/conf/shib2.crt
+++ b/src/conf/shib2.crt
@@ -1,50 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICpDCCAg2gAwIBAgICAm8wDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVTMRIwEAYDVQQI
-EwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lz
-Y29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYD
-VQQDExxIRVBLSSBTZXJ2ZXIgQ0EgLS0gMjAwMjA3MDFBMB4XDTAyMDcyNjA1MDg1M1oXDTA2MDkw
-NDA1MDg1M1owZjEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEChMH
-VW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEcMBoGA1UEAxMTc2hpYjIuaW50ZXJuZXQyLmVkdTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzFSvS9qa/UsH9oJH+u1QM7c51P67owRcqEURhTDs
-tT3WBDsP5+YTIGUiwJMkM4hQII6yMI7in6DzbhGQx9T/q6xRqXFXqLk1nrc/kcs+hbR4T11wwW6v
-d1k3uBUHJXV+OzvMEwz2SS0RxFZDw5MGlwJGqkwe5wPN6QUWzCxvpskCAwEAAaMdMBswDAYDVR0T
-AQH/BAIwADALBgNVHQ8EBAMCBaAwDQYJKoZIhvcNAQEEBQADgYEAhrSMGqkpC0zdL/m37A7g32le
-1kgi9PMJzgviXbG1k4eO+xl6JvSfHMfrcjtcHdH+IWZSEoJsKLhGbSSBcOCX34rm4RqE8h4ahgq7
-cDX2RCaY4D26R2cta7ZvXo7CUgJ7vbybSZ7QbqKs3yZcVXIL5sJXkhbZ3dnZRqiEm2VP9ZY=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAlSgAwIBAgICAlYwDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoT
-F1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBLSSBNYXN0ZXIgQ0Eg
-LS0gMjAwMjA3MDFBMB4XDTAyMDYzMDIyMzIxNFoXDTI3MDIyMDIyMzIxNFowgakx
-CzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlz
-b24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJE
-aXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBL
-SSBTZXJ2ZXIgQ0EgLS0gMjAwMjA3MDFBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCvImusW7uaRS7xLsi2ZzZuUz6gbfATwxwvtQ+8cuyDpRlhvr1qnghC9Enj
-RH9qpq/Z5FVZ5bqyGziCy0kEPt+2WiZMGRiQEzloi5HNEtz1Nlc7FCJ0HATxtkEU
-hQ96v2DmoIEogPINqLICIqfiraPWFHOp6qDritrdj/fwLptQawIDAQABoyAwHjAP
-BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBpjANBgkqhkiG9w0BAQQFAAOBgQAt
-txlP3fTyIVMAIm8ddE8Bvk0/5Bhn5KvMAOMtnlCEArcFd4/m+pU4vEDwK6JSIoKf
-N/ySLXlu5ItApeJMWhcqvrczq5BF4/WQZukC1ha6FS2cAmjy35jYWMfVWcdBi9Yi
-M4SJ6gjGf83y9axPpuHcjwxQ5fLqZfnvrWH+1owJhQ==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIC6zCCAlSgAwIBAgICAlQwDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoT
-F1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBLSSBNYXN0ZXIgQ0Eg
-LS0gMjAwMjA3MDFBMB4XDTAyMDYzMDIyMTYzOVoXDTI5MTExNjIyMTYzOVowgakx
-CzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlz
-b24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJE
-aXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBL
-SSBNYXN0ZXIgQ0EgLS0gMjAwMjA3MDFBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQDJ3FDZym9Ja94DP7TUZXf3Vu3CZwqZzYThgjUT2eBJBYVALISSJ+RjJ2j2
-CYpq3wesSgWHqfrpPnTgTBvn5ZZF9diX6ipAmC0H75nySDY8B5AN1RbmPsAZ51F9
-7Eo+6JZ59BFYgowGXyQpMfhBykBSySnvnOX5ygTCz20LwKkErQIDAQABoyAwHjAP
-BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBpjANBgkqhkiG9w0BAQQFAAOBgQB1
-8ZXB+KeXbDVkz+b2xVXYmJiWrp73IOvi3DuIuX1n88tbIH0ts7dJLEqr+c0owgtu
-QBqLb9DfPG2GkJ1uOK75wPY6XWusCKDJKMVY/N4ec9ew55MnDlFFvl4C+LkiS2YS
-Ysrh7fFJKKp7Pkc1fxsusK+MBXjVZtq0baXsU637qw==
+MIICtjCCAh+gAwIBAgIBADANBgkqhkiG9w0BAQQFADA+MQswCQYDVQQGEwJVUzEb
+MBkGA1UEChMSU2hpYmJvbGV0aCBQcm9qZWN0MRIwEAYDVQQDEwlsb2NhbGhvc3Qw
+HhcNMDQwMzI5MDIyMTIxWhcNMzEwODE1MDIyMTIxWjA+MQswCQYDVQQGEwJVUzEb
+MBkGA1UEChMSU2hpYmJvbGV0aCBQcm9qZWN0MRIwEAYDVQQDEwlsb2NhbGhvc3Qw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANlZ1L1mKzYbUVKiMQLhZlfGDyYa
+/jjCiaXP0WhLNgvJpOTeajvsrApYNnFX5MLNzuC3NeQIjXUNLN2Yo2MCSthBIOL5
+qE5dka4z9W9zytoflW1LmJ8vXpx8Ay/meG4z//J5iCpYVEquA0xl28HUIlownZUF
+7w7bx0cF/02qrR23AgMBAAGjgcMwgcAwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJZiO1qs
+yAyc3HwMlL9pJpN6fbGwMGYGA1UdIwRfMF2AFJZiO1qsyAyc3HwMlL9pJpN6fbGw
+oUKkQDA+MQswCQYDVQQGEwJVUzEbMBkGA1UEChMSU2hpYmJvbGV0aCBQcm9qZWN0
+MRIwEAYDVQQDEwlsb2NhbGhvc3SCAQAwDQYJKoZIhvcNAQEEBQADgYEAtc1nWrwY
+Mc1aGcpfBGP6Exx2oOLs6k5GU+nOMN6j8PbJiGKNtmUvW7IL4o5tiSYcLqtQ/jVD
+n3rFsCeDaO+1Qa8+3JBFqfhchC5Jh73C8yqCGeo9QbXyyJRY/sCxU4YjqJz/z/hW
+o/72FFuLImOT2CUdJ/FonPKo2w0NhOTP4Hc=
 -----END CERTIFICATE-----

diff --git a/src/conf/shib2.key b/src/conf/shib2.key
index f93603b..5149449 100644 (file)
Binary files a/src/conf/shib2.key and b/src/conf/shib2.key differ

diff --git a/src/conf/sites.xml b/src/conf/sites.xml
index 058e0bb..6806e2f 100644 (file)
--- a/src/conf/sites.xml
+++ b/src/conf/sites.xml
@@ -1,25 +1,16 @@
-<SiteGroup Name="urn:mace:inqueue" xmlns="urn:mace:shibboleth:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mace:shibboleth:1.0 shibboleth.xsd">
-       <OriginSite Name="urn:mace:inqueue:example.edu" ErrorURL="http://wayf.internet2.edu/InQueue/error.html">
-               <Alias>Example State University</Alias>
-               <Contact Type="technical" Name="Alfred E. Neuman" Email="(no email)"/>
-               <HandleService Location="https://wayf.internet2.edu/InQueue/HS" Name="wayf.internet2.edu"/>
-               <AttributeAuthority Location="https://wayf.internet2.edu/InQueue/AA" Name="wayf.internet2.edu"/>
-               <Domain>example.edu</Domain>
+<SiteGroup Name="https://localhost/shibboleth" xmlns="urn:mace:shibboleth:1.0">
+       <OriginSite Name="https://localhost/shibboleth/origin">
+               <Alias>Localhost Test Deployment</Alias>
+               <Contact Type="technical" Name="Your Name Here" Email="root@localhost"/>
+               <HandleService Location="https://localhost/shibboleth/HS" Name="CN=localhost,O=Shibboleth Project,C=US"/>
+               <AttributeAuthority Location="https://localhost/shibboleth/AA" Name="CN=localhost,O=Shibboleth Project,C=US"/>
+               <Domain>localhost</Domain>
        </OriginSite>
 
-       <OriginSite Name="urn:mace:inqueue:shibdev.edu">
-               <Alias>Shibboleth Development Origin</Alias>
-               <Contact Type="technical" Name="Scott Cantor" Email="cantor.2@osu.edu"/>
-               <HandleService Location="https://shib2.internet2.edu/shibboleth/HS" Name="shib2.internet2.edu"/>
-               <AttributeAuthority Location="https://shib2.internet2.edu/shibboleth/AA" Name="shib2.internet2.edu"/>
-               <Domain>shibdev.edu</Domain>
-       </OriginSite>
-       
-       <DestinationSite Name="urn:mace:inqueue:example.edu">
-               <Alias>Example State University</Alias>
-                       <Contact Type="technical" Name="Walter Hoehn" Email="wassa@memphis.edu"/>
-                       <AssertionConsumerServiceURL Location="http://foo.com/SHIRE"/>
-                       <AttributeRequester Name="CN=shibboleth.example.edu, O=UCAID, C=US"/>
+       <DestinationSite Name="https://localhost/shibboleth/target">
+               <Alias>Localhost Test Deployment</Alias>
+               <Contact Type="technical" Name="Your Name Here" Email="root@localhost"/>
+               <AssertionConsumerServiceURL Location="https://localhost/Shibboleth.shire"/>
+               <AttributeRequester Name="CN=localhost,O=Shibboleth Project,C=US"/>
        </DestinationSite>
-
 </SiteGroup>