Author: manjula
Date: Tue Mar 27 22:34:44 2007
New Revision: 523182
URL: http://svn.apache.org/viewvc?view=rev&rev=523182
Log:
Copy latest changes to the svn.
Modified:
webservices/rampart/trunk/c/include/rampart_constants.h
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
webservices/rampart/trunk/c/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c
webservices/rampart/trunk/c/src/secpolicy/builder/policy_creator.c
webservices/rampart/trunk/c/src/util/rampart_engine.c
webservices/rampart/trunk/c/src/util/rampart_handler_util.c
Modified: webservices/rampart/trunk/c/include/rampart_constants.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_constants.h?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_constants.h (original)
+++ webservices/rampart/trunk/c/include/rampart_constants.h Tue Mar 27 22:34:44
2007
@@ -98,7 +98,10 @@
#define RAMPART_OUTFLOW_SECURITY_POLICY "OutflowSecurityPolicy"
#define INFLOW_RAMPART_CONTEXT "InflowRampartContext"
-#define OUTFLOW_RAMPART_CONTEXT "OutflowRampartContext"
+#define OUTFLOW_RAMPART_CONTEXT "OutflowRampartContext"
+
+#define IN_MESSAGE_SECURITY "InMessageSecurity"
+#define OUT_MESSAGE_SECURITY "OutMessageSEcurity"
/*
#define RAMPART_PASSWORD_TEXT "passwordText"
#define RAMPART_PASSWORD_DIGEST "passwordDigest"
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -49,9 +49,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario6/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -49,9 +49,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -54,9 +54,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -52,9 +52,9 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_key.pem</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/trunk/c/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario8/service-incoming-secpolicy.xml?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
---
webservices/rampart/trunk/c/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
(original)
+++
webservices/rampart/trunk/c/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
Tue Mar 27 22:34:44 2007
@@ -52,9 +52,9 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
-
<rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
-
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_key.pem</rampc:PrivateKey>
+
<rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+
<rampc:Certificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c Tue Mar 27
22:34:44 2007
@@ -138,124 +138,12 @@
{
AXIS2_LOG_INFO(env->log,
"[rampart][rampart_in_handler] Security Header processing
failed.");
+ rampart_engine_shutdown(env,rampart_context);
return status;
}
-
+
/*This method will free the rampart_context*/
- status = rampart_engine_shutdown(env,rampart_context);
-
-/*
- rampart_context_free(rampart_context,env);
- rampart_context = NULL;
-*/
+ /*status = rampart_engine_shutdown(env,rampart_context);*/
+
return status;
}
-
-
-/*
-axis2_status_t AXIS2_CALL
-rampart_in_handler_invoke(struct axis2_handler *handler,
- const axis2_env_t *env,
- struct axis2_msg_ctx *msg_ctx)
-{
- axiom_soap_envelope_t *soap_envelope = NULL;
- axiom_soap_header_t *soap_header = NULL;
- axis2_status_t status = AXIS2_FAILURE;
- axis2_param_t *param_in_flow_security = NULL;
- axis2_ctx_t *ctx = NULL;
- axis2_array_list_t *action_list = NULL;
- axis2_param_t *param_action = NULL;
- axiom_node_t *sec_node = NULL;
- rampart_actions_t *actions = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
-
- soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
-
- if (soap_envelope)
- {
-
- soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
- if (soap_header)
- {
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "SOAP header found");
-
-
- actions = rampart_actions_create(env);
-
-
- ctx = axis2_msg_ctx_get_base(msg_ctx, env);
- param_in_flow_security = rampart_get_security_param(env, msg_ctx,
-
RAMPART_INFLOW_SECURITY);
-
- if (param_in_flow_security)
- {
- AXIS2_LOG_INFO(env->log,
- "[rampart][rampart_in_handler]Inflow Security
found");
-
-
- action_list = rampart_get_actions(env, ctx,
-
param_in_flow_security);
-
- if (action_list)
- {
-
- if (axis2_array_list_is_empty(action_list, env))
- {
- AXIS2_LOG_INFO(env->log,
- "[rampart][rampart_in_handler]
No actions defined.");
- }
-
- param_action = (axis2_param_t*)
axis2_array_list_get(action_list,
- env, 0);
-
- if (param_action)
- {
- status = RAMPART_ACTIONS_POPULATE_FROM_PARAMS(actions,
- env,
param_action);
- }else{
- AXIS2_LOG_INFO(env->log,
- "[rampart][rampart_in_handler]
Cannot find first action element from the InflowSecurityParameter");
- }
- }
- }else{
- AXIS2_LOG_INFO(env->log,
- "[rampart][rampart_in_handler] No Inflow
Security in the paramter list.");
- return AXIS2_SUCCESS;
- }
-
- status = RAMPART_ACTIONS_POPULATE_FROM_CTX(actions, env, ctx);
-
- sec_node = rampart_get_security_token(env, msg_ctx, soap_header);
-
-
- status = rampart_set_security_processed_results_property(env,
msg_ctx);
- if(AXIS2_FAILURE == status){
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[rampart][rampart_in_handler] Unable
to set the security processed results");
- }
-
- if(!sec_node){
- AXIS2_LOG_INFO(env->log,
- "[rampart][rampart_in_handler] No
security header element.");
- return AXIS2_SUCCESS;
-
- }
-
-
- status = rampart_shp_process_message(env, msg_ctx, actions,
- soap_envelope, sec_node);
- if (AXIS2_FAILURE == status)
- {
- return AXIS2_FAILURE;
- }
-
-
-
- }else{
-
- return AXIS2_SUCCESS;
- }
- }
- return status;}*/
Modified: webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_out_handler.c Tue Mar 27
22:34:44 2007
@@ -133,7 +133,7 @@
rampart_engine_shutdown(env,rampart_context);
return AXIS2_FAILURE;
}
- status = rampart_engine_shutdown(env,rampart_context);
+ /*status = rampart_engine_shutdown(env,rampart_context);*/
}
return status;
}
Modified: webservices/rampart/trunk/c/src/secpolicy/builder/policy_creator.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/policy_creator.c?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/src/secpolicy/builder/policy_creator.c
(original)
+++ webservices/rampart/trunk/c/src/secpolicy/builder/policy_creator.c Tue Mar
27 22:34:44 2007
@@ -28,12 +28,14 @@
if(!builder)
{
AXIOM_XML_READER_FREE(reader, env);
+ reader = NULL;
return NULL;
}
document = axiom_stax_builder_get_document(builder, env);
if(!document)
{
axiom_stax_builder_free(builder, env);
+ builder = NULL;
return NULL;
}
@@ -41,6 +43,7 @@
if(!root)
{
axiom_stax_builder_free(builder, env);
+ builder = NULL;
AXIS2_LOG_INFO(env->log,"[rp][policy_creator] Root element is NULL");
return NULL;
}
Modified: webservices/rampart/trunk/c/src/util/rampart_engine.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_engine.c?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_engine.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_engine.c Tue Mar 27 22:34:44
2007
@@ -20,6 +20,7 @@
*/
#include <rampart_engine.h>
+#include <axis2_ctx.h>
/*This method sets all the configurations
loads required modules and start rampart.*/
@@ -34,6 +35,13 @@
const axis2_env_t *env,
axis2_char_t *file_name);
+rampart_context_t *AXIS2_CALL
+get_rampart_context_in_server_side(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ const axis2_char_t *key);
+
+
AXIS2_EXTERN rampart_context_t* AXIS2_CALL
rampart_engine_init(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
@@ -63,16 +71,24 @@
}
else
{
- value =
rampart_get_rampart_configuration(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY);
- if(!value)
+ if(axis2_msg_ctx_get_server_side(msg_ctx,env))
{
- AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors in
the configurations");
- return NULL;
- }
- file_name = (axis2_char_t *)value;
- return build_rampart_context_from_file(env,file_name);
- }
+ return
get_rampart_context_in_server_side(env,msg_ctx,IN_MESSAGE_SECURITY);
+ }
+ else
+ {
+ value =
rampart_get_rampart_configuration(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY);
+ if(!value)
+ {
+ AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors
in the configurations");
+ return NULL;
+ }
+ file_name = (axis2_char_t *)value;
+ return build_rampart_context_from_file(env,file_name);
+ }
+ }
}
+
else
{
value =
rampart_get_rampart_configuration(env,msg_ctx,OUTFLOW_RAMPART_CONTEXT);
@@ -88,14 +104,21 @@
}
else
{
- value =
rampart_get_rampart_configuration(env,msg_ctx,RAMPART_OUTFLOW_SECURITY_POLICY);
- if(!value)
+ if(axis2_msg_ctx_get_server_side(msg_ctx,env))
{
- AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors in
the configurations");
- return NULL;
+ return
get_rampart_context_in_server_side(env,msg_ctx,OUT_MESSAGE_SECURITY);
+ }
+ else
+ {
+ value =
rampart_get_rampart_configuration(env,msg_ctx,RAMPART_OUTFLOW_SECURITY_POLICY);
+ if(!value)
+ {
+ AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors
in the configurations");
+ return NULL;
+ }
+ file_name = (axis2_char_t *)value;
+ return build_rampart_context_from_file(env,file_name);
}
- file_name = (axis2_char_t *)value;
- return build_rampart_context_from_file(env,file_name);
}
}
}
@@ -192,6 +215,77 @@
}
return rampart_context;
+}
+
+rampart_context_t *AXIS2_CALL
+get_rampart_context_in_server_side(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ const axis2_char_t *key)
+{
+
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_ctx_t *ctx = NULL;
+ axis2_property_t *property = NULL;
+
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx,env);
+ if(!conf_ctx)
+ {
+ AXIS2_LOG_INFO(env->log, "[rampart][engine] Conf context is NULL ");
+ return NULL;
+ }
+ ctx = axis2_conf_ctx_get_base(conf_ctx,env);
+ if(!ctx)
+ {
+ AXIS2_LOG_INFO(env->log, "[rampart][engine] axis2 context is NULL ");
+ return NULL;
+ }
+ property = axis2_ctx_get_property(ctx,env,key);
+ if(property)
+ {
+ return (rampart_context_t *)axis2_property_get_value(property,env);
+ }
+ else
+ {
+ axis2_char_t *file_name = NULL;
+ rampart_context_t *rampart_context = NULL;
+
+ if(axis2_strcmp(key,IN_MESSAGE_SECURITY)==0)
+ {
+ file_name =(axis2_char_t
*)rampart_get_rampart_configuration(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY);
+ if(file_name)
+ {
+ rampart_context =
build_rampart_context_from_file(env,file_name);
+ property = axis2_property_create(env);
+ axis2_property_set_value(property,env,rampart_context);
+ axis2_ctx_set_property(ctx,env,key,property);
+ return rampart_context;
+ }
+ else
+ {
+ AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors in
the configurations");
+ return NULL;
+ }
+ }
+ else if(axis2_strcmp(key,OUT_MESSAGE_SECURITY)==0)
+ {
+ file_name =(axis2_char_t
*)rampart_get_rampart_configuration(env,msg_ctx,RAMPART_OUTFLOW_SECURITY_POLICY);
+ if(file_name)
+ {
+ rampart_context =
build_rampart_context_from_file(env,file_name);
+ property = axis2_property_create(env);
+ axis2_property_set_value(property,env,rampart_context);
+ axis2_ctx_set_property(ctx,env,key,property);
+ return rampart_context;
+ }
+ else
+ {
+ AXIS2_LOG_INFO(env->log,"[rampart][rampart_engine] Errors in
the configurations");
+ return NULL;
+ }
+ }
+ else return NULL;
+ }
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/rampart/trunk/c/src/util/rampart_handler_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_handler_util.c?view=diff&rev=523182&r1=523181&r2=523182
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_handler_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_handler_util.c Tue Mar 27
22:34:44 2007
@@ -395,7 +395,7 @@
return axis2_conf_get_enable_security(conf,env);
}
- engaged_modules = AXIS2_SVC_GET_ALL_MODULE_QNAMES(svc,env);
+ engaged_modules = axis2_svc_get_all_module_qnames(svc,env);
if(engaged_modules)
{
size = axis2_array_list_size(engaged_modules,env);
