[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wsf-c-commits
Subject:    [Wsf-c-commits] svn commit r16272 - trunk/wsf/php/src
From:       svn () wso2 ! org
Date:       2008-04-28 13:21:09
Message-ID: E1JqTI5-0003Wz-IP () wso2 ! org
[Download RAW message or body]

Author: dimuthu
Date: Mon Apr 28 06:21:05 2008
New Revision: 16272

Log:

adding custom token without providing policy support


Modified:
   trunk/wsf/php/src/wsf_client.c
   trunk/wsf/php/src/wsf_policy.c

Modified: trunk/wsf/php/src/wsf_client.c
==============================================================================
--- trunk/wsf/php/src/wsf_client.c	(original)
+++ trunk/wsf/php/src/wsf_client.c	Mon Apr 28 06:21:05 2008
@@ -214,7 +214,7 @@
             "[wsf_client] policy object found ");
     }
 
-    if (sec_token && policy) {
+    if (sec_token) {
         wsf_policy_handle_client_security (sec_token, policy, env,
             svc_client TSRMLS_CC);
     }

Modified: trunk/wsf/php/src/wsf_policy.c
==============================================================================
--- trunk/wsf/php/src/wsf_policy.c	(original)
+++ trunk/wsf/php/src/wsf_policy.c	Mon Apr 28 06:21:05 2008
@@ -100,12 +100,13 @@
         tmp_rampart_ctx.callback_function = NULL;
 		
     }
-    if (!sec_token && !policy)
+    if (!sec_token) {
         return AXIS2_FAILURE;
+    }
 
     /* if incoming policy and outgoing policy are diffrenet from each
        other */
-    if (Z_TYPE_P (policy) == IS_OBJECT) {
+    if (policy && Z_TYPE_P (policy) == IS_OBJECT) {
         ht = Z_OBJPROP_P (policy);
         if (zend_hash_find (ht, WS_IN_POLICY, sizeof (WS_IN_POLICY),
                 (void **) &tmp_type) == SUCCESS) {
@@ -152,7 +153,7 @@
     }
     /* since creating policy xml is the same procedure use one
        function */
-    if (Z_TYPE_P (policy) == IS_OBJECT && is_multiple_flow == AXIS2_FALSE) {
+    if (policy && Z_TYPE_P (policy) == IS_OBJECT && is_multiple_flow == AXIS2_FALSE) {
         outgoing_policy_node =
             wsf_do_create_policy (sec_token, policy, AXIS2_FAILURE, env TSRMLS_CC);
         incoming_policy_node =
@@ -165,6 +166,18 @@
         wsf_set_tmp_rampart_options (tmp_rampart_ctx, sec_token, policy,
         env TSRMLS_CC);
 
+    if(tmp_rampart_ctx.custom_tokens == NULL && policy == NULL) {
+        return AXIS2_FAILURE;
+    }
+
+    if(policy == NULL && tmp_rampart_ctx.custom_tokens != NULL) {
+
+        neethi_options_t *neethi_options = NULL;
+
+        neethi_options = neethi_options_create (env); 
+        incoming_policy_node = neethi_options_get_root_node (neethi_options, env);
+    }
+
     rampart_ctx = rampart_context_create (env);
 
     if (incoming_policy_node) {

_______________________________________________
Wsf-c-commits mailing list
Wsf-c-commits@wso2.org
http://www.wso2.org/cgi-bin/mailman/listinfo/wsf-c-commits
[prev in list] [next in list] [prev in thread] [next in thread]