axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r414453 - in /webservices/axis2/trunk/c/rampart: ./ samples/callback/ samples/client/echo/ samples/client/echo/data/ src/handlers/ src/util/
Date Thu, 15 Jun 2006 04:13:47 GMT
Author: damitha
Date: Wed Jun 14 21:13:45 2006
New Revision: 414453

URL: http://svn.apache.org/viewvc?rev=414453&view=rev
Log:
Applying patches supplied by Kaushalye

Modified:
    webservices/axis2/trunk/c/rampart/COPYING
    webservices/axis2/trunk/c/rampart/INSTALL
    webservices/axis2/trunk/c/rampart/NEWS
    webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c
    webservices/axis2/trunk/c/rampart/samples/client/echo/README.txt
    webservices/axis2/trunk/c/rampart/samples/client/echo/data/axis2.xml
    webservices/axis2/trunk/c/rampart/samples/client/echo/data/server.axis2.xml
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
    webservices/axis2/trunk/c/rampart/src/util/username_token.c

Modified: webservices/axis2/trunk/c/rampart/COPYING
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/COPYING?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/COPYING (original)
+++ webservices/axis2/trunk/c/rampart/COPYING Wed Jun 14 21:13:45 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Modified: webservices/axis2/trunk/c/rampart/INSTALL
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/INSTALL?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/INSTALL (original)
+++ webservices/axis2/trunk/c/rampart/INSTALL Wed Jun 14 21:13:45 2006
@@ -9,6 +9,9 @@
 
 Engage rampart with axis2/C
 ==================================
+Prerequisites
+-----------------------------------
+You must have openssl installed in you system.
 
 Configuring:
 -----------------------------------

Modified: webservices/axis2/trunk/c/rampart/NEWS
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/NEWS?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/NEWS (original)
+++ webservices/axis2/trunk/c/rampart/NEWS Wed Jun 14 21:13:45 2006
@@ -8,13 +8,13 @@
     1. PlainText password
     2. Digested password
 
-2. Support for callback mechanism
-3. Ability to send Timestamp tokens
+2. Ability to send Timestamp tokens
+3. Support for callback mechanism
 4. Support for both dynamic and static configurations.
 
 Un-Implemented Architecture Features 
 ------------------------------------
-1. Timestamptoken verification
+1. Timestamp token verification
 2. Support for Signing and Encrypting messages
 
 

Modified: webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/callback/pwcb.c Wed Jun 14 21:13:45 2006
@@ -10,7 +10,6 @@
 axis2_char_t* get_sample_password(rampart_callback_t *rcb,
             const axis2_env_t *env, const axis2_char_t *username)
 {
-    printf("\nget_sample_password for [%s]", username);
     axis2_char_t * pw = NULL;
     if(0 == AXIS2_STRCMP(username, "Kau"))
     {
@@ -18,7 +17,6 @@
     }else if(0 == AXIS2_STRCMP(username, "TinTin")){
         pw = "TinTinPW";
     }else{
-        printf("\nWho is this? [%s]", username);
     }
     return pw;
 };
@@ -31,7 +29,6 @@
 axis2_get_instance(rampart_callback_t **inst,
                    const axis2_env_t *env)
 {
-    printf("\naxis2_get_instance");
     rampart_callback_t* rcb = NULL;
 
     rcb = AXIS2_MALLOC(env->allocator,

Modified: webservices/axis2/trunk/c/rampart/samples/client/echo/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/echo/README.txt?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/echo/README.txt (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/echo/README.txt Wed Jun 14 21:13:45 2006
@@ -9,24 +9,28 @@
 
 2. Create client repository
     e.g. ~/client_repo [CLIENT_REPO]
-
-3. Copy ./data/axis2.xml to CLIENT_REPO
+    
+3. Copy rampart/samples/client/data/axis2.xml to CLIENT_REPO
 
 4. Copy AXIS2_HOME/lib to CLIENT_REPO
 
 5. Copy AXIS2_HOME/modules to CLIENT_REPO
    
-6. Enable rampart in axis2.xml in the server and add In/Outflow parameters as
-    in ./data/server.axis2.xml
+6. Enable rampart in axis2.xml in the AXIS2_HOME and add In/Outflow parameters as
+    in rampart/samples/client/data/server.axis2.xml. (Or copy the
+    server.axis2.xml file to AXIS2_HOME/ directory and rename it as axis2.xml)
 
 7. Go to samples/calback/ and run make install. This will create pwcb.so inside
     rampart/targt directory. Specify the correct path to pwcb.so using
-    passwordCallbackClass parameter in the configuration file.
+    passwordCallbackClass parameter in the configuration file. Windows user
+    please specify the path to pwcb.DLL.
+
     <action>
         ....
         <passwordCallbackClass>/your/path/to/libpwcb.so</passwordCallbackClass>
         ....
     </action>
+    
     NOTE: Right now this sample callback will provide only two pairs of
     Username/password. You may add more by editing the get_password() function
     in pwcb.c
@@ -35,7 +39,11 @@
 8. To view the message flow use TCPMonitor
     Listen port: 9090
 
-9. Run the echo sample as ./echo
+9. Start server in port 8080 
+     ./axis2_http_server -p8080
 
+10. Run the echo sample as ./echo
 
+11. You should be able to see the security token is attached to the header of
+    the SOAP message.
 NOTE : Also you can use other samples available under AXIS2C.

Modified: webservices/axis2/trunk/c/rampart/samples/client/echo/data/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/echo/data/axis2.xml?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/echo/data/axis2.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/echo/data/axis2.xml Wed Jun 14 21:13:45
2006
@@ -27,7 +27,18 @@
         <passwordCallbackClass>/home/kau/axis2/c/rampart/target/libpwcb.so</passwordCallbackClass>
       </action>
     </parameter>
+
+
+    <parameter name="InflowSecurity">
+      <action>
+        <items>UsernameToken Timestamp</items>
+        <passwordCallbackClass>/home/kau/axis2/c/rampart/target/libpwcb.so</passwordCallbackClass>
+      </action>
+    </parameter>
+
+
     <!--Rampart client configuration END -->
+
 
 
     <!--if you want to extract the service archive file and work with that please uncomment
this-->

Modified: webservices/axis2/trunk/c/rampart/samples/client/echo/data/server.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/echo/data/server.axis2.xml?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/echo/data/server.axis2.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/echo/data/server.axis2.xml Wed Jun 14
21:13:45 2006
@@ -18,6 +18,16 @@
         <port>5555</port>
     </hostConfiguration>
 
+    <parameter name="OutflowSecurity">
+      <action>
+        <items>UsernameToken  Timestamp</items>
+        <user>Kau</user>
+        <passwordType>passwordText</passwordType>
+        <passwordCallbackClass>/home/kau/axis2/c/rampart/target/libpwcb.so</passwordCallbackClass>
+      </action>
+    </parameter>
+
+
     <parameter name="InflowSecurity">
       <action>
         <items>UsernameToken Timestamp</items>

Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c Wed Jun 14 21:13:45
2006
@@ -196,10 +196,14 @@
                 if(0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_USERNAMETOKEN , AXIS2_STRTRIM(env,
item, NULL)))
                 {
                     sec_node = rampart_build_username_token(env, ctx, param_action,  sec_node,
sec_ns_obj);
+                    if(!sec_node)
+                          return AXIS2_FAILURE;
     
                 }else if(0 == AXIS2_STRCMP(RAMPART_ACTION_ITEMS_TIMESTAMP, AXIS2_STRTRIM(env,
item, NULL)))
                 {
                     sec_node = rampart_build_timestamp_token(env, ctx, sec_node, sec_ns_obj,
300);
+                    if(!sec_node)
+                          return AXIS2_FAILURE;
                 }else
                 {
                     rampart_print_info(env," Rampart happy to see usernametokens and timestamps
at the moment");

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_util.c?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_util.c Wed Jun 14 21:13:45 2006
@@ -37,11 +37,11 @@
 	char* rand_str = NULL;
 	axis2_char_t* encoded_str=NULL;
 	num=rand();
-	rand_str= AXIS2_MALLOC(env->allocator,16);
+	rand_str= AXIS2_MALLOC(env->allocator,sizeof(char)*16);
 	sprintf(rand_str, "%16d", num);
 
 
-    encoded_str = AXIS2_MALLOC(env->allocator, sizeof(SIZE_NONCE));
+    encoded_str = AXIS2_MALLOC(env->allocator, sizeof(char)*SIZE_NONCE);
     axis2_base64_encode(encoded_str,rand_str,AXIS2_STRLEN(rand_str));
     AXIS2_FREE(env->allocator, rand_str);
 	return encoded_str;

Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?rev=414453&r1=414452&r2=414453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Wed Jun 14 21:13:45 2006
@@ -128,8 +128,12 @@
     username = rampart_get_action_params(env, ctx, param_action, RAMPART_USER);
     password_type= rampart_get_action_params(env, ctx, param_action, RAMPART_PASSWORD_TYPE);
 
-    /*Override static configs with dynamic values*/     
     password = rampart_get_password(env, ctx, param_action);
+    
+    if(!password)
+    {
+        return NULL;
+    }   
     
     if(rampart_get_value(env, ctx,RAMPART_USER))    
         username = rampart_get_value(env, ctx,RAMPART_USER);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message