From 3be3c52161ee151bbee1ed12733cfe7b2bd5e9a7 Mon Sep 17 00:00:00 2001
From: "Eric J. Bowersox" <erbo@erbosoft.com>
Date: Wed, 18 Jun 2003 05:49:48 +0000
Subject: [PATCH] debugged IDP operation - Venice can now act as a Liberty IDP

---
 conf-sso/idp/idp-descriptor.xml               |   2 +-
 conf-sso/idp/sourceid-sso-providers.xml       |   4 +-
 conf-sso/idp/venice-idp.keystore              | Bin 1291 -> 1429 bytes
 conf-sso/sp/sourceid-sso-providers.xml        | 118 +++++++++++-------
 conf-sso/sp/sp-descriptor.xml                 |   2 +-
 conf-sso/sp/venice-sp.keystore                | Bin 1395 -> 1425 bytes
 .../dynamo/servlet/ServletBase.java           |   3 +-
 7 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/conf-sso/idp/idp-descriptor.xml b/conf-sso/idp/idp-descriptor.xml
index 44341ef..94c39bd 100644
--- a/conf-sso/idp/idp-descriptor.xml
+++ b/conf-sso/idp/idp-descriptor.xml
@@ -10,7 +10,7 @@
 
     <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
       <ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-      <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIIDMDCCAu4CBD7vnjgwCwYHKoZIzjgEAwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxFjAUBgNVBAMTDUVyaWMgQm93ZXJzb3gwHhcNMDMwNjE3MjMwMzIwWhcNMDMwOTE1MjMwMzIwWjB+MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEjMCEGA1UEChMaU2lsdmVyd3Jpc3QgRGVzaWduIFN0dWRpb3MxFDASBgNVBAsTC0RldmVsb3BtZW50MRYwFAYDVQQDEw1FcmljIEJvd2Vyc294MIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAPY0omT9Qes0rZe0C21MetHeTwen3Er5lFgAPWMUgHkLBhdViPfnRtjtCXiiVZ/n85/Hc6yGNDkNvYVsD5CX8mo72vsXXHg5wdyMiFlHZuZFE57bE/4YDg1dtqQ3BE9NHUlxuinbdgJd8mY5uNpy69/9jrbvr5oo1p6ZMdLU3iiowCwYHKoZIzjgEAwUAAy8AMCwCFF5opeaoKbAijQc87yHBHHlONllfAhRqDQFmDitlQJ61lecv/2/tuaxIPw==</ds:X509Certificate>
+      <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICjjCCAfcCBD7v+IcwDQYJKoZIhvcNAQEEBQAwgY0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEbMBkGA1UECxMSVmVuaWNlIERldmVsb3BtZW50MR4wHAYDVQQDExVWZW5pY2UgU2FtcGxlIElEUCBLZXkwHhcNMDMwNjE4MDUyODM5WhcNMDYwMzE0MDUyODM5WjCBjTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNPMQ8wDQYDVQQHEwZEZW52ZXIxIzAhBgNVBAoTGlNpbHZlcndyaXN0IERlc2lnbiBTdHVkaW9zMRswGQYDVQQLExJWZW5pY2UgRGV2ZWxvcG1lbnQxHjAcBgNVBAMTFVZlbmljZSBTYW1wbGUgSURQIEtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6AFthEPxD10J7VTPD5I73NDcdFS3Lw2BUL2OD53PEMyZbQ/WMncckJ4qfbAKbrnXp2BP7w0eNsZZSutGX62q+7rh4Vt5kRt/WE4GO6XSFBn+I6vnjQmyVptZKZf0k6DJf/3Dqlt+sbZo5uaxygQS8wUXyYSLzzXcN6Y2v4Q3JtkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQBwzpyl1BRw+tN1VRra//ReamI8omDaSj+kuxV2jvWxUHS5uuzuK4yKVEOXIoEgnKmoVSq5S3cacxI0g5C30pVy0zXU3VsJJhhngOPFr9G26Ko0oFz77s7Hapar9tX27+0kVh6hf4k4ume90C6QEEjEw3dPR7IgLFpN5qp25StNIw==</ds:X509Certificate>
       </ds:X509Data>
      </ds:KeyInfo>
 
diff --git a/conf-sso/idp/sourceid-sso-providers.xml b/conf-sso/idp/sourceid-sso-providers.xml
index 7f4b24c..b023235 100644
--- a/conf-sso/idp/sourceid-sso-providers.xml
+++ b/conf-sso/idp/sourceid-sso-providers.xml
@@ -10,7 +10,7 @@
 
     <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
       <ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICbjCCAdcCBD7AlmwwDQYJKoZIhvcNAQEEBQAwfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNPMQ8wDQYDVQQHEwZEZW52ZXIxIzAhBgNVBAoTGlNpbHZlcndyaXN0IERlc2lnbiBTdHVkaW9zMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEWMBQGA1UEAxMNRXJpYyBCb3dlcnNveDAeFw0wMzA1MTMwNjUzMzJaFw0wMzA4MTEwNjUzMzJaMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxFjAUBgNVBAMTDUVyaWMgQm93ZXJzb3gwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvjYZPJwt16vTVIKleltTVDyvswVr2vCd9aHg7rKPhNKN+iVS2XY+Y5IopgcVtshQx/SbWnPNldtpGtFewaSQzCud/Lhja1xoGO/nTbjRr7MrPlR3yub8KO90tgslZ9yjEPZDWDEr3Y59ieDpMtAnYjS2GQ2LFRHq63kzd4AXg1AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAVhJqkLZd59BiTjvRF0ZtBKXe+kxnvyclc0MeIzkzGFmnpMuSpSyZ3LlYp0uvFn5OADM6KkXj7DgXIqb1bqIvXmlwDds+oO3KL+WdHBO9KHW0KjR2jpIujpmJ8Eaf/cefcOxxA00CMrwBeL8EXyAaynpcT78nrT5iN3FZwMkBi9o=</ds:X509Certificate>
+        <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICjDCCAfUCBD7v95MwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEbMBkGA1UECxMSVmVuaWNlIERldmVsb3BtZW50MR0wGwYDVQQDExRWZW5pY2UgU2FtcGxlIFNQIEtleTAeFw0wMzA2MTgwNTI0MzVaFw0wNjAzMTQwNTI0MzVaMIGMMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEjMCEGA1UEChMaU2lsdmVyd3Jpc3QgRGVzaWduIFN0dWRpb3MxGzAZBgNVBAsTElZlbmljZSBEZXZlbG9wbWVudDEdMBsGA1UEAxMUVmVuaWNlIFNhbXBsZSBTUCBLZXkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALQjlifEIQu5mOjVdnCeWxOMgR+9T23Zse1m98eiDn/92Q7AHsrDt2HHsLsmN+8YRW+WKh7uWyGP7rYVeDNRb8pPd3f8Lh5sAEI/LtTFnu3zrU/0vXMclTV7HnbnFKYfQN9S28bQtTsFr5m12qJ4cwkCfRrVbOV+mQPPlg9YLgmzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAOxjxzD5uILozSGnrrBWynbvNsE5lF1BejimyBlgYEAb/edxwQeRBs7mYG0jQQxkANuTlSC97p5iFMXzBhbf+GnXG9Zps+jtFM3gKvJYijiTR/nsHUIvVyv69oavZFfBwjBN0fDupJYfzX2QG7n+FEV/WRF0usaaVOPE3kHi8Vb0=</ds:X509Certificate>
       </ds:X509Data>
     </ds:KeyInfo>
 
@@ -33,7 +33,7 @@
     <lib:AuthnRequestsSigned>false</lib:AuthnRequestsSigned>
 
   </lib:SPDescriptor>
-	
+
 	<!--
 		Sample Service Provider Descriptor. If this instance of SourceID-SSO is configured to
 		operate in the "idp" role, then the entry below describes a Service Provider with which
diff --git a/conf-sso/idp/venice-idp.keystore b/conf-sso/idp/venice-idp.keystore
index 337b6a446bebcbccb0b216329bc7002f1fd12b35..b3a5a12f7ac0a7fbcef176b907809fa523ccbf00 100644
GIT binary patch
delta 1271
zcmeC?n#w&vw*F?)qlpX*OuG%5n6?}6v2kg$F|sgfF$pp<vNEtVF)jWgAhwso==GPd
z$45F1!>=9dRC=;z(xp>HE9TE?e3SN3Xv<}By~_Op$~Me$tcU$&lTUV^zt2|PbgbTH
z&L)THj9<9tzt~s$K=Rn`j_jHD1<fWtS@Sx~(^O%a`tfGHk23Z3dCKd4pMQDlYNpe%
zZEGI}xi_3Uv!|gb;y&|_w~`GPBQ33b_NB1vn6BQKQCTf1%yfLG$KCV>P7{7rzH*Ky
zt9G90T(hff@=C^wxfMJvs};2DWPd749On<a@yB`oiSjo})0>xk`PyRt$T@}k$MOZ|
z|K6O%rgup1QbYPLeN+9!t~d36IqSUtE_pX!XTAr==B-sZ#t%b(OxyPU<urGx>B};r
z6RywsWK@%w9vb$|W3eN1>h&+@vQ-*q#h+9^C3kXK@iy~wYVG{D@9oM>c<x-!$@6&G
zQ6qDUiD}Xn&6c@e7K$9{iD;cN$#iD4e%17pa_>zqW#2q{wt1p{tMF1Az1iGbpVaqB
zu$<D7F7?@1Zaw3haO{zw%=*U1T0W~j-#nd?_`c?!j{m%(bJ-JRn`dl1C$L5AbY-#)
z$6@>0cHM~6ozW>9kIr9t{ly+bUcuPS6P6tmiaD44zEXnuldQ$>iE*p<PB^%C^M?ti
z9?MFsF<J0N`eDsu+dKEeBUq&#biBM|{MVvkS^fQYLF;%G{@s&%94F+uqiUi2VV3iI
zYSUu9oF0q$$xlAv6#K1x<<Cpg{r`GxOZV_yH8WD@%ft99(yr}G7he}#TkumlE1+xU
z!`a3+v{$}W=&t)^HPdfxNn6Zuhb-fZ_O*Hn7tNM^VJKv|KWFx7_X2S>)&S|)>_G15
zO$&n5+Y{^Rk1yTZ^7h36?##lUn+2E6x1Q6H_lotZ!`*NC>thyV)%|{8*%h?V`TN&j
z0#W~YCO`LAax35D6`r#2*vl;yFRf*lt`yn7K)P6DCIbTlBLi!Mo~eN)FgZ^GCg(nb
zCdThfEOzgIv>WiUacZ@Bw0-AgWMpAwFlg*G<Tl`BV-97R{DRRlUfMts#O4+j3QNt)
zOiopBNi9pw$uG!F%_}jKGmrsEG7F1BC4&=l3vyBwJY515yi+R;<ivRmj19~TEeuSJ
zEQ~FqfLt>JV?z@t7iiby2aJLB6xq=@AK3@MoXOnS3-m=NQ)45;3&z|Q=a2lcoNq(U
z^G~wAbKy=&$aa0+#(=$j{BzF>oSB)+f6b`8US`5Pt=bJ-c{{H!Pw;=wD`$2r((AQb
z{MuE&cRhR<T{%&@KEjX9dg&z*$$!eLpZ9WZ3Y#6NIsMDz1t;tO9$pn)w{cs>vu7Jm
zu?T%;6+hY1ectqr`7*QpE#_)BnV1<F7?Irv3}I%V!wSyLS$ajJ;Me8SP^nw>|G&g#
zCD|-WxaDQPWVdKp-`9-+B|CS$d8gge72-TysZn9h$`zqnJH5-LiiJ#?Cv3kowdk_x
zmAlcLY7*%UkB_duxb4L%lLaxq-<><2HEs2`tKZ(gRSA<@Sl?-}D}C<;y$J#yM-G?!
oyKhp^iSm86s_dz@uX0lbhf74mp3^(Zi=8>@5`~UQU(D+V01XH*+W-In

delta 1124
zcmbQr-OV*Yw*Cf_!UF~d#(sk)#%=>XHZE;8MixdbCP79<RtA<P#&Y$VYj0{4d01ZY
z{a4z-KVjjA14oXYdid|-60@^Y8qeJ=vPf2zzvZgAb`GDu?zCG?U$Ykp-1sxgWsX+R
zEHUN-s!cn~r>{>+jk?{&+}>@p`tX}Ss=>_{Lgzm|cVb8Cxw7#3FSV*y4xTSFjZu8O
zVUhp2g`%@xaHyJ@|9sh|e&DKU!0NvqrJn>k=QiG(K3n|So%bw1gA=|QmpEE0?z~!i
zAUndWMsi>7TyL%W^E~qz|8UIT*R;wwF8Va%K2f=nk85_jO$big+*Fau7?8lF=<i(Q
z((T$lz3lVO=@(8ZNMsc{zO9#4z20dby4WtZGV)_`%0-_w*-O_>I(s5AGDS>qu9MZ%
z=I=i4tA+MI7BARp_V<lr$F<stRX5|q*M1i8oPAu?Iqdq;?Dl?Vj!1=X7fU%p?gwyA
zTfcT&;I<VPeqM0?>Je9!5WZOV`kGnsjXTuK&7?L;Y`M0jaQ*y~`Nz1v$9>e?<F<W*
z_S^5D_RVS%yxIOTdbhCZk&P~QeAn~aS2F;kg@H9f&(y$@fq~h?po!VQpo!@n6N}yZ
zc@_rTZ0uTX9_K7rm{}PN>L&9u2l|T`2(dATvTzG?yQG$-=HwUTrskCxiW!K2M45$o
zU5hf46`b<RQ;Ul8D-7hsc@2yW%nZ$qj17#945GkXOG8sA7h+~TX=XMtZU?3#9hlP?
zfgE|J#zuy}^}&s@r9zrP_r2!my?OHdo8a~!oA)jZhvn=WwgswXy2d&v1^$k-?Tz@g
z|LE6U2H#H44$ZmVXx&gRYm)ydEn$21%z&j!=Ffk@QZ1l#$ba|B>;JYNlm1~H{`}aA
zWup8nzni~ZJ}P&Z$uvYbN^GLhx6;q+v=gsuz5k@dEIIe02jg)jQHJRW0sW%N+-EjT
z+S#<|bqn{02$`=Sw|#%Op!M2p+k2<?td23;5x%o>%KF{EtX?(!4EN!-t!Hma4~z`&
z+jS+<|5+isKx4xePq9Mf7d{$d!rRYt8ugr5_RvPGsyn2nSL4Crb#mI9mz7S;TU^im
zOVKpx<L{&@MiuKbOFr&f5jdf9Mf3fKQBUWyP3lgIYp4!YO=0x0{&(I}i@C9dfvK^<
zwpU}OeL&S&?bNqSw}a)jluthR@_W6|zEm*={)nRra!v<ZuO`|4ytvKUDNbW*`p-Yl
zKi+w**vsdfpBT;jMD@?CzHj@EUYFx5C|6bz3%t2=qRaDbNB*}lH;3o0<UJ^S**z#G
zudD2C!}OY&eR*bcc76Y!ymt5NXI-Ytm-&=zHSf|wNm9)E3<f$(B6e{ZOP{UK+@RFU
zZu4I8piHHoS!6tuNER<+8lQHm!@R9ipX>k6f4g&yhyB^8^%LyRXtnI~YgD^@KZ@`4
H@`G&vC41wA

diff --git a/conf-sso/sp/sourceid-sso-providers.xml b/conf-sso/sp/sourceid-sso-providers.xml
index fe4f8fa..5c4ae78 100644
--- a/conf-sso/sp/sourceid-sso-providers.xml
+++ b/conf-sso/sp/sourceid-sso-providers.xml
@@ -2,58 +2,86 @@
 <ProviderDirectory xmlns:lib="http://projectliberty.org/schemas/core/2002/12" 
                    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                    xmlns="http://www.sourceid.org/schemas/sso/providers/2002/11">
-  <!--
-    Sample Identity Provider Descriptor. If this instance of SourceID-SSO is configured to
-    operate in the "sp" role, then the entry below describes an Identity Provider with which
-    we are federated. If this instance is configured to operate in the "idp" role, then the entry
-    below will be ignored.
-  -->
+
   <lib:IDPDescriptor xmlns:lib="http://projectliberty.org/schemas/core/2002/12"
                      xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-    <!--
-      Customize the following line to match the ProviderID of the remote provider; if the other
-      provider is SourceID-SSO, then the ProviderID below should match the <provider-id> element
-      in the other deployment's sourceid-sso.xml.
-    -->
-    <lib:ProviderID>SourceID-Sample-IDP</lib:ProviderID>
+    <lib:ProviderID>Venice-SSO-IDP</lib:ProviderID>
 
-    <!--
-      The following KeyInfo represents the public key contained in the sample "sourceid.keystore"
-      file bundled with SourceID-SSO 
-    -->
     <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
       <ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICSjCCAbMCBD4coSAwDQYJKoZIhvcNAQEEBQAwbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjAeFw0wMzAxMDgyMjA3MjhaFw0wMzA0MDgyMjA3MjhaMGwxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEDAOBgNVBAoTB1Vua25vd24xEDAOBgNVBAsTB1Vua25vd24xEDAOBgNVBAMTB1Vua25vd24wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJhokczPBJlZe48d5oKZiX6vo7DBU5b54t9JjSHLOEZd0XK5w81BY4iX8QADMc7GyTrqDDrehfh4S5eQO89Fll50D4f6HpSI2QGtionDrj3kuET9nW9n98IzWc3eiLLH+5q3VGm04rylo4PTnJCeMYmDRqYJkWR1xQbNsrv9HHJAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAI16O969XJkYRJaTiPXMcJg8XRM9oHKqc4L6YEDXGvnQ8NfTPDuJEzKIcU8QWNnprcY+MOue+O2YvP7u9NQuKK4zDA14CcIRb8G+VMLFa2A+BYiD66yIBWsb89YNFYnvH379wGp+ankQBTdljpgFo6Bt+fXmZxB6mToBdXy0h5b8=</ds:X509Certificate>
+      <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICjjCCAfcCBD7v+IcwDQYJKoZIhvcNAQEEBQAwgY0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEbMBkGA1UECxMSVmVuaWNlIERldmVsb3BtZW50MR4wHAYDVQQDExVWZW5pY2UgU2FtcGxlIElEUCBLZXkwHhcNMDMwNjE4MDUyODM5WhcNMDYwMzE0MDUyODM5WjCBjTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNPMQ8wDQYDVQQHEwZEZW52ZXIxIzAhBgNVBAoTGlNpbHZlcndyaXN0IERlc2lnbiBTdHVkaW9zMRswGQYDVQQLExJWZW5pY2UgRGV2ZWxvcG1lbnQxHjAcBgNVBAMTFVZlbmljZSBTYW1wbGUgSURQIEtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6AFthEPxD10J7VTPD5I73NDcdFS3Lw2BUL2OD53PEMyZbQ/WMncckJ4qfbAKbrnXp2BP7w0eNsZZSutGX62q+7rh4Vt5kRt/WE4GO6XSFBn+I6vnjQmyVptZKZf0k6DJf/3Dqlt+sbZo5uaxygQS8wUXyYSLzzXcN6Y2v4Q3JtkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQBwzpyl1BRw+tN1VRra//ReamI8omDaSj+kuxV2jvWxUHS5uuzuK4yKVEOXIoEgnKmoVSq5S3cacxI0g5C30pVy0zXU3VsJJhhngOPFr9G26Ko0oFz77s7Hapar9tX27+0kVh6hf4k4ume90C6QEEjEw3dPR7IgLFpN5qp25StNIw==</ds:X509Certificate>
       </ds:X509Data>
-    </ds:KeyInfo>
+     </ds:KeyInfo>
 
-    <!--
-      The endpoints in the following URL's are correct for services offered by SourceID-SSO.
-      If federating this installation with another instance of SourceID-SSO, then all you need to do
-      is customize the URL's to match your deployment (e.g. replace "http://localhost:9080/sso-sample-idp"
-      with your server name and servlet context).
-    -->
+     <lib:SoapEndpoint>http://localhost:8080/venice-idp/sso/soap/endpoint</lib:SoapEndpoint>
+     <lib:SingleLogoutServiceURL>http://localhost:8080/venice-idp/sso/logout</lib:SingleLogoutServiceURL>
+     <lib:SingleLogoutServiceReturnURL>http://localhost:8080/venice-idp/sso/logout</lib:SingleLogoutServiceReturnURL>
+     <lib:FederationTerminationServiceURL>http://localhost:8080/venice-idp/sso/fedterm</lib:FederationTerminationServiceURL>
+     <lib:FederationTerminationServiceReturnURL>http://localhost:8080/venice-idp/sso/fedterm</lib:FederationTerminationServiceReturnURL>
+     <lib:SingleSignOnServiceURL>http://localhost:8080/venice-idp/sso/authn</lib:SingleSignOnServiceURL>
+     <!--
+       The following profile declarations indicate the variants of the Liberty Protocol which 
+       this provider can speak.
+     -->
+     <lib:RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</lib:RegisterNameIdentifierProtocolProfile>
+     <lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</lib:FederationTerminationNotificationProtocolProfile>
+     <lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</lib:FederationTerminationNotificationProtocolProfile>
+     <lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</lib:SingleLogoutProtocolProfile>
+     <lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</lib:SingleLogoutProtocolProfile>
+     <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-art</lib:SingleSignOnProtocolProfile>
+     <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-post</lib:SingleSignOnProtocolProfile>
+     <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/wml-post</lib:SingleSignOnProtocolProfile>
+     <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/lecp</lib:SingleSignOnProtocolProfile>
 
-    <lib:SoapEndpoint>http://localhost:8080/sso-sample-idp/sso/soap/endpoint</lib:SoapEndpoint>
-    <lib:SingleLogoutServiceURL>http://localhost:8080/sso-sample-idp/sso/logout</lib:SingleLogoutServiceURL>
-    <lib:SingleLogoutServiceReturnURL>http://localhost:8080/sso-sample-idp/sso/logout</lib:SingleLogoutServiceReturnURL>
-    <lib:FederationTerminationServiceURL>http://localhost:8080/sso-sample-idp/sso/fedterm</lib:FederationTerminationServiceURL>
-    <lib:FederationTerminationServiceReturnURL>http://localhost:8080/sso-sample-idp/sso/fedterm</lib:FederationTerminationServiceReturnURL>
-    <lib:SingleSignOnServiceURL>http://localhost:8080/sso-sample-idp/sso/authn</lib:SingleSignOnServiceURL>
-
-    <!--
-      The following profile declarations indicate the variants of the Liberty Protocol which 
-      this provider can speak.
-    -->
-    <lib:RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</lib:RegisterNameIdentifierProtocolProfile>
-    <lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</lib:FederationTerminationNotificationProtocolProfile>
-    <lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</lib:FederationTerminationNotificationProtocolProfile>
-    <lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</lib:SingleLogoutProtocolProfile>
-    <lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</lib:SingleLogoutProtocolProfile>
-    <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-art</lib:SingleSignOnProtocolProfile>
-    <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-post</lib:SingleSignOnProtocolProfile>
-    <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/wml-post</lib:SingleSignOnProtocolProfile>
-    <lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/lecp</lib:SingleSignOnProtocolProfile>
   </lib:IDPDescriptor>
-	
+
+	<!--
+		Sample Identity Provider Descriptor. If this instance of SourceID-SSO is configured to
+		operate in the "sp" role, then the entry below describes an Identity Provider with which
+		we are federated. If this instance is configured to operate in the "idp" role, then the entry
+		below will be ignored.
+	 -->
+	<lib:IDPDescriptor xmlns:lib="http://projectliberty.org/schemas/core/2002/12" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+		<!--
+			Customize the following line to match the ProviderID of the remote provider; if the other
+			provider is SourceID-SSO, then the ProviderID below should match the <provider-id> element
+			in the other deployment's sourceid-sso.xml.
+		 -->
+		<lib:ProviderID>SourceID-Sample-IDP</lib:ProviderID>
+		<!--
+			The following KeyInfo represents the public key contained in the sample "sourceid.keystore"
+			file bundled with SourceID-SSO 
+		 -->
+		<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+			<ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+				<ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICSjCCAbMCBD4coSAwDQYJKoZIhvcNAQEEBQAwbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjAeFw0wMzAxMDgyMjA3MjhaFw0wMzA0MDgyMjA3MjhaMGwxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vua25vd24xEDAOBgNVBAoTB1Vua25vd24xEDAOBgNVBAsTB1Vua25vd24xEDAOBgNVBAMTB1Vua25vd24wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJhokczPBJlZe48d5oKZiX6vo7DBU5b54t9JjSHLOEZd0XK5w81BY4iX8QADMc7GyTrqDDrehfh4S5eQO89Fll50D4f6HpSI2QGtionDrj3kuET9nW9n98IzWc3eiLLH+5q3VGm04rylo4PTnJCeMYmDRqYJkWR1xQbNsrv9HHJAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAI16O969XJkYRJaTiPXMcJg8XRM9oHKqc4L6YEDXGvnQ8NfTPDuJEzKIcU8QWNnprcY+MOue+O2YvP7u9NQuKK4zDA14CcIRb8G+VMLFa2A+BYiD66yIBWsb89YNFYnvH379wGp+ankQBTdljpgFo6Bt+fXmZxB6mToBdXy0h5b8=</ds:X509Certificate>
+			</ds:X509Data>
+		</ds:KeyInfo>
+		<!--
+			The endpoints in the following URL's are correct for services offered by SourceID-SSO.
+			If federating this installation with another instance of SourceID-SSO, then all you need to do
+			is customize the URL's to match your deployment (e.g. replace "http://localhost:9080/sso-sample-idp"
+			with your server name and servlet context).
+		 -->
+		<lib:SoapEndpoint>http://localhost:8080/sso-sample-idp/sso/soap/endpoint</lib:SoapEndpoint>
+		<lib:SingleLogoutServiceURL>http://localhost:8080/sso-sample-idp/sso/logout</lib:SingleLogoutServiceURL>
+		<lib:SingleLogoutServiceReturnURL>http://localhost:8080/sso-sample-idp/sso/logout</lib:SingleLogoutServiceReturnURL>
+		<lib:FederationTerminationServiceURL>http://localhost:8080/sso-sample-idp/sso/fedterm</lib:FederationTerminationServiceURL>
+		<lib:FederationTerminationServiceReturnURL>http://localhost:8080/sso-sample-idp/sso/fedterm</lib:FederationTerminationServiceReturnURL>
+		<lib:SingleSignOnServiceURL>http://localhost:8080/sso-sample-idp/sso/authn</lib:SingleSignOnServiceURL>
+		<!--
+			The following profile declarations indicate the variants of the Liberty Protocol which 
+			this provider can speak.
+		 -->
+		<lib:RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</lib:RegisterNameIdentifierProtocolProfile>
+		<lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-soap</lib:FederationTerminationNotificationProtocolProfile>
+		<lib:FederationTerminationNotificationProtocolProfile>http://projectliberty.org/profiles/fedterm-sp-http</lib:FederationTerminationNotificationProtocolProfile>
+		<lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-soap</lib:SingleLogoutProtocolProfile>
+		<lib:SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-sp-http</lib:SingleLogoutProtocolProfile>
+		<lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-art</lib:SingleSignOnProtocolProfile>
+		<lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/brws-post</lib:SingleSignOnProtocolProfile>
+		<lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/wml-post</lib:SingleSignOnProtocolProfile>
+		<lib:SingleSignOnProtocolProfile>http://projectliberty.org/profiles/lecp</lib:SingleSignOnProtocolProfile>
+	</lib:IDPDescriptor>
+
 </ProviderDirectory>
diff --git a/conf-sso/sp/sp-descriptor.xml b/conf-sso/sp/sp-descriptor.xml
index a9bedcd..e48b394 100644
--- a/conf-sso/sp/sp-descriptor.xml
+++ b/conf-sso/sp/sp-descriptor.xml
@@ -10,7 +10,7 @@
 
     <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
       <ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICbjCCAdcCBD7AlmwwDQYJKoZIhvcNAQEEBQAwfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNPMQ8wDQYDVQQHEwZEZW52ZXIxIzAhBgNVBAoTGlNpbHZlcndyaXN0IERlc2lnbiBTdHVkaW9zMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEWMBQGA1UEAxMNRXJpYyBCb3dlcnNveDAeFw0wMzA1MTMwNjUzMzJaFw0wMzA4MTEwNjUzMzJaMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxFjAUBgNVBAMTDUVyaWMgQm93ZXJzb3gwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALvjYZPJwt16vTVIKleltTVDyvswVr2vCd9aHg7rKPhNKN+iVS2XY+Y5IopgcVtshQx/SbWnPNldtpGtFewaSQzCud/Lhja1xoGO/nTbjRr7MrPlR3yub8KO90tgslZ9yjEPZDWDEr3Y59ieDpMtAnYjS2GQ2LFRHq63kzd4AXg1AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAVhJqkLZd59BiTjvRF0ZtBKXe+kxnvyclc0MeIzkzGFmnpMuSpSyZ3LlYp0uvFn5OADM6KkXj7DgXIqb1bqIvXmlwDds+oO3KL+WdHBO9KHW0KjR2jpIujpmJ8Eaf/cefcOxxA00CMrwBeL8EXyAaynpcT78nrT5iN3FZwMkBi9o=</ds:X509Certificate>
+        <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">MIICjDCCAfUCBD7v95MwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMSMwIQYDVQQKExpTaWx2ZXJ3cmlzdCBEZXNpZ24gU3R1ZGlvczEbMBkGA1UECxMSVmVuaWNlIERldmVsb3BtZW50MR0wGwYDVQQDExRWZW5pY2UgU2FtcGxlIFNQIEtleTAeFw0wMzA2MTgwNTI0MzVaFw0wNjAzMTQwNTI0MzVaMIGMMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEjMCEGA1UEChMaU2lsdmVyd3Jpc3QgRGVzaWduIFN0dWRpb3MxGzAZBgNVBAsTElZlbmljZSBEZXZlbG9wbWVudDEdMBsGA1UEAxMUVmVuaWNlIFNhbXBsZSBTUCBLZXkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALQjlifEIQu5mOjVdnCeWxOMgR+9T23Zse1m98eiDn/92Q7AHsrDt2HHsLsmN+8YRW+WKh7uWyGP7rYVeDNRb8pPd3f8Lh5sAEI/LtTFnu3zrU/0vXMclTV7HnbnFKYfQN9S28bQtTsFr5m12qJ4cwkCfRrVbOV+mQPPlg9YLgmzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAOxjxzD5uILozSGnrrBWynbvNsE5lF1BejimyBlgYEAb/edxwQeRBs7mYG0jQQxkANuTlSC97p5iFMXzBhbf+GnXG9Zps+jtFM3gKvJYijiTR/nsHUIvVyv69oavZFfBwjBN0fDupJYfzX2QG7n+FEV/WRF0usaaVOPE3kHi8Vb0=</ds:X509Certificate>
       </ds:X509Data>
     </ds:KeyInfo>
 
diff --git a/conf-sso/sp/venice-sp.keystore b/conf-sso/sp/venice-sp.keystore
index 929b6504e16f4e80febd2e0718483827927cdc6a..2ac480659fc36b13ebeca54df16c0bd1e44da548 100644
GIT binary patch
delta 1212
zcmey&HIaLQG|SC+UEPWDGWECh+#fZ5vRNBBzd^(&ZW+_B+>g2o&fa|B@M@#`HTJk0
z_gO^}!>Se8HBMQ^ygXg{gLPq4>6RO7<^+Ab^J9r~bQn_;Pxql7gC&^{V<z!;a%B{D
z9q!usLh5K+g~bK_p3hdDY#TD(W}ac%+xXcur1jLh*Q=e`i=TGC(F#6TH(?EP{o)Tx
zJoxnG7g?lBtxz_!%HPWG#$|oz;}#E*C(ZT8YM+I<?Fwa^+-8&U{*SCcljHA=M^7ku
zJU`yKyJ_z1P&cQghkgV%Or5M%a;0;s>-p7-zZ}sho3>@w?aCKP)0pp``ZbL|^Jq%O
ztXBSl&i|hqq!$-%yJhC+r1XTL{@1C{#`1sl&lfDrf4fg^ciOEJ^ObIEzH3___mpW>
z<~hAb_ur+yIO8~>{-wZ|TEA`FnZ?W%3zkph^1PLH;MUuvE4w3q7j4@k%f5MKYR*)V
zvh|MnW`_-&`?Rm@*!FMX<E6_#tMRtan0>!1>!`QL4YMq-zWYD<HZ?D)WK-LJe&UC4
z9t)GN+V$J(YkXb)E(=xAb2VU$Ft|Bk;!hXr9^q7(ZN@(X^qxM7J@mk5t$H>4!Sj{T
zDM_>L+%Mf_{YGtfA!Ej4z7LlVc(=GmKYyUYHj_ox*t3;?^Sw{sH05l5A5sm`YTx5g
zki@}xo~bBwUiFhjbI)!4Fgf{o3#;0KzZwPUr=RRuq2!WjxwW2gma&qRlIgjN`NfkW
zwP#*2zP(HOkoq2lkYg`@J8C>kz0{QT%WR!Pe$tW0Ojo|YerXg^ROFHw9ipImI7-eh
zp|a`4!ZpvQ+~)n`c4g)U%eS9jAAXt3eWLNg=7%ea#a~GH3h%M%*z#)qcH#cx+E!2h
z8twe{*xAeL&1uo<pP$d~-4L$r6k@LNvNO<LT8@AEqdDrUpZz)))^}=?UDvBr>zOOx
zTJzp~a8`VVGy?+zBLi!Mo~eN)0|V0pgC?dPgC@qWOe}WqzfU&cW#iOp^Jx3d%gD&W
z%3#pgGnt1uFizS)l8rf(g<DuCEHy7PIaR?WwJbF!zaTd?uf$N+KpG^;EGz<*3{K1~
z$VpWQ4p8t;tu&Am=QS`kFf+6;Ff}qUHjM&u%?ykUO`u$;71k73F<Fa6wtkE9H1#8j
z+&gEyxLQ^)FIu>#QGTy~?#+#F)4m^H#8?0KCf@<MQ-`-F9^bHA&HTNDYyLDXxp&cu
z{qMGkRu~87pYks+|Dz|D!{B7Ecjf53x1ZPgf7x3sGu5<OuI#zUGI@vlLAQ@x*lNwX
ze&*I&iz<panQEo3<~*&N$$Wkqe}o=q{bnX+Mg~T-@MCUlWU!X_c*ZVIVVAK-=Ib@0
zo96C5yTLD2JRq)5a}!&HgaF(B$~y&)PaHSzoFVOT!C8{Q?8#FP{p#g2S`BLswr>9?
zReJ2}tejuguErHyd!{M%sa*V5%^uKw_0+$;3s>J1{ZP;&TvB7bQct!0b9@ThyZTna
q_-ih)dK;HbwfJa0p<++y-q(}Ud`maa)~_&&5#T(2gVonY+8qE3d?FSA

delta 1182
zcmbQp{h4cmG>d}wss4%bGWEH2A-*$;_kX*v^pa2juU)bVf3G1^N`b;^XPJj}KUBYU
z#ck}fT={!fxZef#=d<GZZNgJr)jl`uf1;9CcU$^|@CqO1nm!9%olV)wd$KK#Eav-m
z&~)Oi(ycwl)$9y5T8oR$MKF5542(9q$JBXW|ANEU?McnI?H=|tXS`E-Z^T<4)pw!x
zb4-;myFd=NN@;<`#)Yrj_>+=%WW?Oxb<wqa!Nj?7H<swl6iZ*$eQcko@3(i#j7l4C
zeQ)}#{@%km{_W)?hiZSpN6Zg`&Wdj+YH8@0`84J3(ItWt81_uQut+|l?^o{XK$~lC
zUFR}6toxv&<*As`yRWfFvq8*Pi<RT>wR*SIJ#LK|+rCHoS3S=A#d+f&*922328aF{
z@0qUae>sP<{Cg8C)N#}B+X{WZ?a$X3aQ-?F8M`{g<m4mYKL!8(MdZxAtg`G}fvoX_
zuV<HsDwdyQv}cWswr99!z4F7e&EcyIpIO;Q8a`l<nsnewK|xOF{^`BP-q?5u{LOrP
zdHt`u^>^5sO{8-7KmN-UFMhJY^Ob^m!l}-u68rA(yk7mcXVKNj5W9nkELYZeaJ}3s
zCpKqt`cYkG2{sSe#}yAcm#<g1smYqM{98@@IfZJ?we6|BC6fP6cmB%fxl?lB#Oprp
zO3N4T^!;5}<>qYI{b|wc`aSy(|2&o9x%Zv%Ayw5EX_c(?`Vt8z9<E6}d`{rtO}Skq
zOyQq?2$(6q$-4EYZ@b^mrt}B%L>qsX?QM*;(Rp^qrbuSlf$7{?Z;YJY|K$$*%{70*
zmo<tG?RO@qb=6F+jsKU#RK%_#Ci*|nZeD22CAp?$CtSXly55Y`^{^D*#}i$g@okp>
zgcsZIe4F%}Pl~OVcXya+N8+lS`w#X$;=I4|;KG0j=GGSWA^t7W{E74CcRQ^<H_0`8
z(kGRP77Ppwj0~(1dZq@J3=B*~22D(P22G6DnON)&Ov^FgW#iOp^Jx3d%gD&W%3x48
znU^`xU&KI&jX9KsTbSD=wJbF!zaTd?uf$NyKm;VpEX?a#l$osHlwY1&RGeR7AScdi
zU~FJ&Xl!6+YHVy21?E~98bY}cGj&NabFv4EZ2j)XiIYzrx?8o^)I%$L=~h$cQ@;(u
z_O9o=A0@~4TH}YW#{EU1y3>=NSt@lU6h`N?^3;27U2bzTcH6|YqHm-;c@FKof4a?V
z>#@eZe<injrG6W2e(GMcF8@&9ckhHvVYR0W`BO}rh4$Wfeq$crWL>5*W$(lZH#P>!
zt=m4?yn?Z!-js=%k%18{gqRx}8N!6JCTxp+ej&-v`l7g7F3Zw;zkJg7tE(0}%PCtL
zOGGYTa(dEIotbxbMlAPUFIMNrU~Hx3`uL57xYDw(d5iSpG7ETb+bwu|O8@Cx8R5Me
zrCYR2%K9eh_08=3;5Ps7@%aUB3YmSG^o;f}R_teqSCBeY7305OeXU)Rd12&%lZ@TB
ZDn#x%uU0!!q5b#uyH>Gk)g@^k^#P3^1gii5

diff --git a/src/dynamo-framework/com/silverwrist/dynamo/servlet/ServletBase.java b/src/dynamo-framework/com/silverwrist/dynamo/servlet/ServletBase.java
index 9cc3006..44881c9 100644
--- a/src/dynamo-framework/com/silverwrist/dynamo/servlet/ServletBase.java
+++ b/src/dynamo-framework/com/silverwrist/dynamo/servlet/ServletBase.java
@@ -173,7 +173,8 @@ public abstract class ServletBase extends HttpServlet implements WebConstants
     SingleNamespaceObjectProvider objp = new SingleNamespaceObjectProvider("__internal__","RequestServices",base_objp);
     objp.setObject("application",getServletContext());
     objp.setObject("request",req);
-    objp.setObject("response",resp);
+    if (resp!=null)
+      objp.setObject("response",resp);
     return new SingletonServiceProvider("RequestServices",svc,ObjectProvider.class,objp);
 
   } // end createRequestServices