You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ma...@apache.org on 2007/05/25 08:31:58 UTC
svn commit: r541566 [1/2] - in /webservices/axis2/scratch/c/neethi/rampart:
./ build/linux/ build/win32/ include/ samples/ samples/client/sec_echo/
samples/client/sec_echo/data/ samples/secpolicy/
samples/secpolicy/scenario1/ samples/secpolicy/scenario...
Author: manjula
Date: Thu May 24 23:31:53 2007
New Revision: 541566
URL: http://svn.apache.org/viewvc?view=rev&rev=541566
Log:
Committing latest changes.
Added:
webservices/axis2/scratch/c/neethi/rampart/build/linux/
- copied from r539258, webservices/rampart/trunk/c/build/linux/
webservices/axis2/scratch/c/neethi/rampart/build/linux/install_rampart_bin_dist.sh
- copied unchanged from r539258, webservices/rampart/trunk/c/build/linux/install_rampart_bin_dist.sh
webservices/axis2/scratch/c/neethi/rampart/build/win32/make_bin_dist.bat
- copied unchanged from r539258, webservices/rampart/trunk/c/build/win32/make_bin_dist.bat
webservices/axis2/scratch/c/neethi/rampart/maven.xml
- copied unchanged from r539258, webservices/rampart/trunk/c/maven.xml
webservices/axis2/scratch/c/neethi/rampart/project.properties
- copied unchanged from r539258, webservices/rampart/trunk/c/project.properties
webservices/axis2/scratch/c/neethi/rampart/project.xml
- copied unchanged from r539258, webservices/rampart/trunk/c/project.xml
webservices/axis2/scratch/c/neethi/rampart/rampart-bindist.sh
- copied unchanged from r539258, webservices/rampart/trunk/c/rampart-bindist.sh
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/client.axis2.xml
- copied unchanged from r539258, webservices/rampart/trunk/c/samples/client/sec_echo/data/client.axis2.xml
Removed:
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/client.enc.axis2.xml
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_neethi.c
Modified:
webservices/axis2/scratch/c/neethi/rampart/ (props changed)
webservices/axis2/scratch/c/neethi/rampart/INSTALL
webservices/axis2/scratch/c/neethi/rampart/Makefile.am
webservices/axis2/scratch/c/neethi/rampart/README
webservices/axis2/scratch/c/neethi/rampart/build/win32/configure.in
webservices/axis2/scratch/c/neethi/rampart/build/win32/deploy_rampart.bat
webservices/axis2/scratch/c/neethi/rampart/build/win32/makefile
webservices/axis2/scratch/c/neethi/rampart/configure.ac
webservices/axis2/scratch/c/neethi/rampart/include/rampart_context.h
webservices/axis2/scratch/c/neethi/rampart/include/rampart_engine.h
webservices/axis2/scratch/c/neethi/rampart/samples/INSTALL
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/Makefile.am
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/Makefile.am
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.bat
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.sh
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo.c
webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo_helper.c
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/README.txt
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/deploy.sh
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/client-outgoing-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/service-incoming-secpolicy.xml
webservices/axis2/scratch/c/neethi/rampart/samples/server/sec_echo/services.xml
webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_out_handler.c
webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/c14n/sorted_list.c
webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/xml_encryption.c
webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/model/rampart_config.c
webservices/axis2/scratch/c/neethi/rampart/src/util/Makefile.am
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_context.c
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_engine.c
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_sec_header_processor.c
webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_timestamp_token.c
Propchange: webservices/axis2/scratch/c/neethi/rampart/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 24 23:31:53 2007
@@ -1 +1 @@
-/webservices/rampart/trunk/c:1-532306
+/webservices/rampart/trunk/c:1-539314
Modified: webservices/axis2/scratch/c/neethi/rampart/INSTALL
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/INSTALL?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/INSTALL (original)
+++ webservices/axis2/scratch/c/neethi/rampart/INSTALL Thu May 24 23:31:53 2007
@@ -1,50 +1,120 @@
-Getting Rampart/C source working on Linux
-============================================
-
------------------------------------
-Build the source
------------------------------------
-
-This can be done using the following command sequence:
- ./configure
- make
- make install
-
-
-Engage rampart with axis2/C
-============================================
-
------------------------------------
-Prerequisites:
------------------------------------
-You must have openssl installed in you system.
-
------------------------------------
-Configuring:
------------------------------------
-
-1. Run build.sh in rampart/trunk/c directory
-
-2. This will install the rampart module under AXIS2C_HOME/deploy/modules
-
-3. To engage rampart add to axis2.xml
- <module ref="rampart"/>
-
-NOTE: See the README file in samples/client/enc_echo for more information on configuration setup.
-
------------------------------------
-Writing callback modules:
------------------------------------
-
-User can specify which .so (or DLL) library to use to callback the password.
-For this user must provide a function pointer for get_password() operation in rampart_callback_t
-See samples/callback/pwcb.c for clarity
-
-
-Getting Rampart/C binary distribution working on Linux
-============================================
-1. Copy modules/rampart to $AXIS2C_HOME/modules
-2. Copy samples/sec_echo to $AXIS2C_HOME/services/
-3. Go to samples/secpolicy/ and try a scenario
- %s test_scen.sh scenarioX server-port
-
+Table of contents
+=================
+ |_ Getting Rampart/C source working on Linux
+ |_ Getting Rampart/C binary distribution working on Linux
+ |_ Getting Rampart/C source working on Win32
+ |_ Getting Rampart/C binary working on Win32
+ |_ Engage Rampart/C with axis2/C
+ |_ Trying out the samples in Win32
+
+
+Getting Rampart/C source working on Linux
+=========================================
+Build the source
+
+This can be done using the following command sequence:
+ ./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include/axis2-1.0
+ make
+ make install
+
+If you need to try samples, you need to build them.
+ -Go to samples and run the script build.sh
+ -Then go to samples/secpolicy and try a scenario
+ %sh test_scen.sh scenarioX server-port
+
+Getting Rampart/C binary distribution working on Linux
+======================================================
+1. Copy modules/rampart to $AXIS2C_HOME/modules
+2. Copy samples/server/sec_echo to $AXIS2C_HOME/services/
+3. Engage rampart as described in section "Engage Rampart/C with axis2/C"
+4. Go to samples/client/sec_echo/ and deploy the client repo
+ %sh deploy_client_repo.sh
+5. Go to samples/secpolicy/ and try a scenario
+ %sh test_scen.sh scenarioX server-port
+
+Getting Rampart/C source working on Win32
+=========================================
+
+1. Set the AXIS2C_HOME envirionment variable to direct to your Axis2/C Installation.
+ SET AXIS2C_HOME=[your-path-to-axis2c]
+
+2. Extract the source package and build the source.
+ Unzip the source package.
+ Go to the "build\win32" directory of the distribution.
+ Set the parameters of the configure.in
+ AXIS2_BIN_DIR = <path/to/where/you/have/installed/axis2>
+ OPENSSL_BIN_DIR = <path/to/where/you/have/installed/openssl>
+ DEBUG = <1 if enabled, 0 otherwise>
+ Run "nmake install"
+
+3. Engage Rampart/C with Axis2/C as described in the "Engaging Rampart/C with axis2/C" section.
+
+
+Getting Rampart/C binary distribution working on Win32
+======================================================
+
+1. Set the AXIS2C_HOME envirionment variable to direct to your Axis2/C Installation.
+ SET AXIS2C_HOME=[your-path-to-axis2c]
+
+2. Run the deploy_rampart.bat that could be found in the root of the rampart binary distribution.
+ deploy_rampart.bat
+
+3. Engage Rampart/C with Axis2/C as described in the "Engaging Rampart/C with axis2/C" section.
+
+Engaging Rampart/C with axis2/C
+===============================
+Prerequisites:
+You must have openssl installed in you system.
+
+Configuring:
+You can engage Rampart/C in global level or in service level.
+Just add following entry either to axis2.xml(gloabl level) or in services.xml(service level).
+ <module ref="rampart"/>
+
+Apart from that you must define security policies for outgoing messages and incoming messages.
+This can be done adding parameters as follows in the same descriptor file that you engaged rampart.
+ <parameter name="OutflowSecurityPolicy">/your/path/to/outgoing-secpolicy.xml</parameter>
+ <parameter name="InflowSecurityPolicy">/your/path/to/incoming-secpolicy.xml</parameter>
+
+NOTE: There are several samples security policy xml files for different scenarios under samples/secpolicy/
+ Please refer the README file for more information
+
+The final configuration setup should be as follows
+CLIENT SIDE:
+axis2.xml
+ |-------------------> <module ref="rampart"/>
+ |-------------------> <parameter name="OutflowSecurityPolicy">/../../outgoing-secpolicy.xml</parameter>
+ |-------------------> <parameter name="InflowSecurityPolicy">/../../incoming-secpolicy.xml</parameter>
+
+SERVER SIDE:
+services.xml(or axis2.xml)
+ |-------------------> <module ref="rampart"/>
+ |-------------------> <parameter name="OutflowSecurityPolicy">/../../outgoing-secpolicy.xml</parameter>
+ |-------------------> <parameter name="InflowSecurityPolicy">/../../incoming-secpolicy.xml</parameter>
+
+
+Trying out the samples on Win32
+===============================
+
+There are 9 scenarios that you can try out with the sec_echo sample of the Rampart/C distribution.
+You can find more about it from the README.TXT file inside samples\secpolicy folder.
+
+1. Set the AXIS2C_HOME envirionment variable to direct to your Axis2/C Installation.
+ SET AXIS2C_HOME=[your-path-to-axis2c]
+
+2. Run the deploy_client_repo.bat file found in the samples\client\sec_echo folder.
+ This will create an axis2 client repository for the samples in the AXIS2C_HOME\clientrepo directory.
+
+3. Set the outflow and inflow secpolicy parameters in axis2.xml of the client repo, according to the scenario that you are running.
+ e.g.
+ <parameter name="OutflowSecurityPolicy">D:\rampart-bin-0.90-win32\samples\secpolicy\scenario1\client-outgoing-secpolicy.xml</parameter>
+ <parameter name="InflowSecurityPolicy">D:\rampart-bin-0.90-win32\samples\secpolicy\scenario1\client-incoming-secpolicy.xml</parameter>
+
+4. Set the outflow and inflow secpolicy parameters in services.xml of the sec_echo service in the axis2 server repo.
+ e.g.
+ <parameter name="OutflowSecurityPolicy">D:\rampart-bin-0.90-win32\samples\secpolicy\scenario1\service-outgoing-secpolicy.xml</parameter>
+ <parameter name="InflowSecurityPolicy">D:\rampart-bin-0.90-win32\samples\secpolicy\scenario1\service-incoming-secpolicy.xml</parameter>
+
+NOTE: In steps 3 & 4 you have to use the corresponding scenario files in each parameter. For example if you are running the sample scenario 3, all the files should be from scenario 3.
+
+Thank you for using Rampart/C
Modified: webservices/axis2/scratch/c/neethi/rampart/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/Makefile.am?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/rampart/Makefile.am Thu May 24 23:31:53 2007
@@ -1,5 +1,5 @@
SUBDIRS = src test
include_HEADERS=$(top_builddir)/include/*.h
-EXTRA_DIST = LICENSE build.sh autogen.sh samples
+EXTRA_DIST = LICENSE NOTICE build.sh autogen.sh samples build
Modified: webservices/axis2/scratch/c/neethi/rampart/README
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/README?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/README (original)
+++ webservices/axis2/scratch/c/neethi/rampart/README Thu May 24 23:31:53 2007
@@ -1,10 +1,10 @@
- Apache Axis2/C Rampart
+ Apache Rampart/C
What is it?
-----------
- Apache Rampart is the security module of the Apache Axis2/C. Rampart
+ Apache Rampart/C is the security module of the Apache Axis2/C. Rampart/C
is an effort to implement Axis2 Rampart module in C.
Please have a look at
@@ -36,21 +36,21 @@
Contacts
--------
- o If you want freely available support for using Apache Axis2/C Rampart please
+ o If you want freely available support for using Apache Rampart/C please
join the Apache Axis2/C user community by subscribing to users mailing
list, axis-c-user@ws.apache.org' as described at
http://ws.apache.org/axis2/c/mail-lists.html
- o If you have a bug report for Apache Axis2/C Rampart please go log a Jira issue
- at http://issues.apache.org/jira/browse/AXIS2C
+ o If you have a bug report for Apache Rampart/C please go log a Jira issue
+ at http://issues.apache.org/jira/browse/RAMPARTC
- o If you want to participate in actively developing Apache Axis2/C Rampart please
+ o If you want to participate in actively developing Apache Rampart/C please
subscribe to the `axis-c-dev@ws.apache.org' mailing list as described at
http://ws.apache.org/axis2/c/mail-lists.html
Acknowledgments
----------------
- Apache Axis2/C Rampart relies heavily on the use of autoconf and libtool to provide
+ Apache Rampart/C relies heavily on the use of autoconf and libtool to provide
a build environment. And also it uses openssl.
Modified: webservices/axis2/scratch/c/neethi/rampart/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/build/win32/configure.in?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/build/win32/configure.in (original)
+++ webservices/axis2/scratch/c/neethi/rampart/build/win32/configure.in Thu May 24 23:31:53 2007
@@ -1,6 +1,8 @@
-AXIS2_BIN_DIR = E:\axis2c-bin-1.0.0-win32
-OPENSSL_BIN_DIR = E:\OpenSSL
+AXIS2_BIN_DIR = D:\axis2c-bin-1.0.0-win32
+OPENSSL_BIN_DIR = D:\OpenSSL
DEBUG = 1
-
+MAJOR_VER = 0
+MINOR_VER = 90
+PATCH_VER =
Modified: webservices/axis2/scratch/c/neethi/rampart/build/win32/deploy_rampart.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/build/win32/deploy_rampart.bat?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/build/win32/deploy_rampart.bat (original)
+++ webservices/axis2/scratch/c/neethi/rampart/build/win32/deploy_rampart.bat Thu May 24 23:31:53 2007
@@ -1,6 +1,6 @@
md %AXIS2C_HOME%\modules\rampart\
-copy rampart\mod_rampart.dll %AXIS2C_HOME%\modules\rampart\
-copy rampart\module.xml %AXIS2C_HOME%\modules\rampart\
+copy modules\rampart\mod_rampart.dll %AXIS2C_HOME%\modules\rampart\
+copy modules\rampart\module.xml %AXIS2C_HOME%\modules\rampart\
md %AXIS2C_HOME%\services\sec_echo\
copy bin\samples\services\sec_echo\sec_echo.dll %AXIS2C_HOME%\services\sec_echo\
@@ -12,7 +12,12 @@
md %AXIS2C_HOME%\bin\samples\rampart\client\
md %AXIS2C_HOME%\bin\samples\rampart\client\sec_echo\
-copy bin\samples\client\sec_echo\echo.exe %AXIS2C_HOME%\bin\samples\rampart\client\sec_echo
+copy bin\samples\client\sec_echo\echo.exe %AXIS2C_HOME%\bin\samples\rampart\client\sec_echo\
md %AXIS2C_HOME%\bin\samples\rampart\callback
-copy bin\samples\callback\pwcb.dll %AXIS2C_HOME%\bin\samples\rampart\callback
+copy bin\samples\callback\pwcb.dll %AXIS2C_HOME%\bin\samples\rampart\callback\
+
+md %AXIS2C_HOME%\bin\samples\rampart\credential_provider
+copy bin\samples\credential_provider\cred_provider.dll %AXIS2C_HOME%\bin\samples\rampart\credential_provider\
+
+xcopy bin\samples\keys %AXIS2C_HOME%\bin\samples\rampart\keys\ /E /I /Y /S
Modified: webservices/axis2/scratch/c/neethi/rampart/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/build/win32/makefile?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/build/win32/makefile (original)
+++ webservices/axis2/scratch/c/neethi/rampart/build/win32/makefile Thu May 24 23:31:53 2007
@@ -6,8 +6,9 @@
RAMPART_SOURCE_DIR = ..\..\
RAMPART_INTDIR = .\int.msvc
-RAMPART_DISTDIR = .\..\rampart
-
+RAMPART_DIST_NAME = .\..\rampartc-$(MAJOR_VER).$(MINOR_VER)
+#RAMPART_DISTDIR = .\..\rampartc
+RAMPART_DISTDIR = $(RAMPART_DIST_NAME)
#rampart module
@@ -34,13 +35,13 @@
##################### compiler options
-CC = cl.exe
+CC = @cl.exe
CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
/D "AXIS2_SVR_MULTI_THREADED" /w /nologo $(AXIS2_INCLUDE_PATH)
################### linker options
-LD = link.exe
+LD = @link.exe
LDFLAGS = /nologo /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(OPENSSL_BIN_DIR)\lib\VC \
/LIBPATH:$(AXIS2_BIN_DIR)\lib
@@ -67,33 +68,35 @@
distdir:
if not exist $(RAMPART_DISTDIR) mkdir $(RAMPART_DISTDIR)
- mkdir $(RAMPART_DISTDIR)\bin
mkdir $(RAMPART_DISTDIR)\bin\samples\callback
mkdir $(RAMPART_DISTDIR)\bin\samples\authn_provider
- mkdir $(RAMPART_DISTDIR)\bin\samples\services
mkdir $(RAMPART_DISTDIR)\bin\samples\services\sec_echo
mkdir $(RAMPART_DISTDIR)\bin\samples\client\sec_echo
- mkdir $(RAMPART_DISTDIR)\rampart
+ mkdir $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\data
+ mkdir $(RAMPART_DISTDIR)\bin\samples\credential_provider
+ mkdir $(RAMPART_DISTDIR)\modules\rampart
mkdir $(RAMPART_DISTDIR)\include
clean:
if exist $(RAMPART_DISTDIR) rmdir /S /Q $(RAMPART_DISTDIR)
- if exist $(RAMPART_INTDIR) rmdir /S /Q $(RAMPART_INTDIR)
+ if exist $(RAMPART_INTDIR) rmdir /S /Q $(RAMPART_INTDIR)
intdirs:
if not exist $(RAMPART_INTDIR) mkdir $(RAMPART_INTDIR)
+
if not exist $(RAMPART_INTDIR)\samples\callback\pwcb mkdir $(RAMPART_INTDIR)\samples\callback\pwcb
if not exist $(RAMPART_INTDIR)\samples\authn_provider mkdir $(RAMPART_INTDIR)\samples\authn_provider
if not exist $(RAMPART_INTDIR)\samples\services\sec_echo\ mkdir $(RAMPART_INTDIR)\samples\services\sec_echo
if not exist $(RAMPART_INTDIR)\samples\client\sec_echo\ mkdir $(RAMPART_INTDIR)\samples\client\sec_echo
+ if not exist $(RAMPART_INTDIR)\samples\credential_provider\ mkdir $(RAMPART_INTDIR)\samples\credential_provider
mod_rampart:
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC) $(OMXMLSEC_SRC) $(SECPOLICY_SRC) $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\*.obj \
$(LIBS) axutil.lib axiom.lib axis2_parser.lib axis2_engine.lib \
- /DLL /OUT:$(RAMPART_DISTDIR)\rampart\mod_rampart.dll /IMPLIB:$(RAMPART_DISTDIR)\rampart\mod_rampart.lib
+ /DLL /OUT:$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.dll /IMPLIB:$(RAMPART_DISTDIR)\modules\rampart\mod_rampart.lib
- copy $(RAMPART_SOURCE_DIR)\src\data\module.xml $(RAMPART_DISTDIR)\rampart
+ copy $(RAMPART_SOURCE_DIR)\src\data\module.xml $(RAMPART_DISTDIR)\modules\rampart
mod_rampart_pwcb:
@@ -105,7 +108,7 @@
mod_rampart_authn:
$(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(RAMPART_SOURCE_DIR)\samples\authn_provider\authn_provider.c \
/Fo$(RAMPART_INTDIR)\samples\authn_provider\ /c
- $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\authn_provider\*.obj mod_rampart.lib axutil.lib /LIBPATH:$(RAMPART_DISTDIR)\rampart /DLL \
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\authn_provider\*.obj mod_rampart.lib axutil.lib /LIBPATH:$(RAMPART_DISTDIR)\modules\rampart /DLL \
/OUT:$(RAMPART_DISTDIR)\bin\samples\authn_provider\authn.dll
mod_rampart_services_sec_echo:
@@ -125,23 +128,65 @@
/Fo$(RAMPART_INTDIR)\samples\client\sec_echo\ /c
$(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\client\sec_echo\echo.obj axutil.lib axiom.lib \
axis2_parser.lib axis2_engine.lib /OUT:$(RAMPART_DISTDIR)\bin\samples\client\sec_echo\echo.exe
+
+ copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\deploy_client_repo.bat $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\
+
+ copy $(RAMPART_SOURCE_DIR)\samples\client\sec_echo\data\client.axis2.xml $(RAMPART_DISTDIR)\bin\samples\client\sec_echo\data\
+
+mod_rampart_samples_credential_provider:
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) \
+ $(RAMPART_SOURCE_DIR)\samples\credential_provider\*.c \
+ /Fo$(RAMPART_INTDIR)\samples\credential_provider\ /c
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\samples\credential_provider\cred_provider.obj \
+ axutil.lib axiom.lib axis2_parser.lib $(LIBS) axis2_engine.lib \
+ axis2_http_receiver.lib axis2_http_sender.lib \
+ /DLL /OUT:$(RAMPART_DISTDIR)\bin\samples\credential_provider\cred_provider.dll
mod_rampart_samples: mod_rampart_samples_sec_echo mod_rampart_services_sec_echo
mod_rampart_copy_include:
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\rampart\include $(AXIS2_BINDIR)\rampart\include
- copy $(RAMPART_SOURCE_DIR)\rampart\README $(AXIS2_BINDIR)\rampart
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\include $(RAMPART_DISTDIR)\include
mod_rampart_copy_keys:
- if not exist $(RAMPART_SAMPLES_KEYS_DIR) mkdir $(RAMPART_SAMPLES_KEYS_DIR)
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\rampart\samples\keys\* $(RAMPART_SAMPLES_KEYS_DIR)
+ if not exist $(RAMPART_DISTDIR)\bin\samples\keys mkdir $(RAMPART_DISTDIR)\bin\samples\keys
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\keys\* $(RAMPART_DISTDIR)\bin\samples\keys
mod_rampart_copy_deploy:
- copy deploy_rampart.bat $(RAMPART_DISTDIR)\
+ copy deploy_rampart.bat $(RAMPART_DISTDIR)
+
+copy_sec_policy:
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\secpolicy $(RAMPART_DISTDIR)\bin\samples\secpolicy
+
+copy_dist_files:
+ copy $(RAMPART_SOURCE_DIR)\README $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\INSTALL $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\AUTHORS $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\COPYING $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\LICENSE $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\NEWS $(RAMPART_DISTDIR)
+ copy $(RAMPART_SOURCE_DIR)\NOTICE $(RAMPART_DISTDIR)
+
+
+#copy make_bin_dist.bat $(RAMPART_DISTDIR)
+
+mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include copy_dist_files
+
+mv_dist:
+ move $(RAMPART_DISTDIR) $(RAMPART_DIST_NAME)
+
+del_am:
+ chdir $(RAMPART_DISTDIR)
+ del /s *.am
+ chdir .\..\win32
+
+dist: clean distdir intdirs mod_rampart mod_rampart_pwcb mod_rampart_authn mod_rampart_services_sec_echo mod_rampart_samples_sec_echo mod_rampart_samples_credential_provider mod_rampart_copy_deploy copy_sec_policy mod_rampart_copy_include copy_dist_files mod_rampart_copy_keys del_am
-mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include
+deploy:
+ chdir $(RAMPART_DISTDIR)
+ deploy_rampart.bat
+ chdir .\..\win32
-dist: clean distdir intdirs mod_rampart mod_rampart_pwcb mod_rampart_authn mod_rampart_services_sec_echo mod_rampart_samples_sec_echo mod_rampart_copy_deploy
+install: dist deploy
Modified: webservices/axis2/scratch/c/neethi/rampart/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/configure.ac?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/configure.ac (original)
+++ webservices/axis2/scratch/c/neethi/rampart/configure.ac Thu May 24 23:31:53 2007
@@ -65,7 +65,7 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
-AC_MSG_CHECKING(path to use Axis2C . This is a compulsory to build Sandesha2C)
+AC_MSG_CHECKING(path to use Axis2C . This is a compulsory to build Rampart-C)
AC_ARG_WITH(axis2,
[ --with-axis2[=PATH] use axis2c.],
[ case "$withval" in
Modified: webservices/axis2/scratch/c/neethi/rampart/include/rampart_context.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/include/rampart_context.h?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/include/rampart_context.h (original)
+++ webservices/axis2/scratch/c/neethi/rampart/include/rampart_context.h Thu May 24 23:31:53 2007
@@ -175,6 +175,11 @@
const axutil_env_t *env,
int ttl);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_rd_val(rampart_context_t *rampart_context,
+ const axutil_env_t *env,
+ axis2_char_t *rd_val);
+
/**********************************************************8*/
/*Getters of the above set functions*/
@@ -248,7 +253,13 @@
rampart_context_get_ttl(
rampart_context_t *rampart_context,
const axutil_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ rampart_context_get_rd_val(
+ rampart_context_t *rampart_context,
+ const axutil_env_t *env);
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_password_type(
rampart_context_t *rampart_context,
@@ -490,6 +501,12 @@
rampart_context_set_ttl_from_file(
rampart_context_t *rampart_context,
const axutil_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_rd_val_from_file(
+ rampart_context_t *rampart_context,
+ const axutil_env_t *env);
+
#ifdef __cplusplus
Modified: webservices/axis2/scratch/c/neethi/rampart/include/rampart_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/include/rampart_engine.h?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/include/rampart_engine.h (original)
+++ webservices/axis2/scratch/c/neethi/rampart/include/rampart_engine.h Thu May 24 23:31:53 2007
@@ -24,14 +24,7 @@
#include <rp_includes.h>
#include <rampart_context.h>
-#include <rp_secpolicy.h>
-#include <rampart_authn_provider.h>
-#include <rampart_util.h>
-#include <axutil_property.h>
#include <rampart_constants.h>
-#include <rampart_callback.h>
-#include <rp_policy_creator.h>
-#include <rampart_handler_util.h>
#include <axis2_msg_ctx.h>
@@ -40,25 +33,11 @@
{
#endif
- /**
- * Initializes the rampart engine. This will perform the configuration loading for the rampart module.
- * @param env pointer to environment struct
- * @param msg_ctx message context
- * @param is_inflow if the initialization is in IN-FLOW of the message this should be set to TRUE
- * @return a rampart context nurished with configurations.
- */
- AXIS2_EXTERN rampart_context_t* AXIS2_CALL
- rampart_engine_init(const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axis2_bool_t is_inflow);
- /**
- *
- *
- */
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
- rampart_engine_shutdown(const axutil_env_t *env,
- rampart_context_t *rampart_context);
-
+ AXIS2_EXTERN rampart_context_t *AXIS2_CALL
+ rampart_engine_build_configuration(
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ axis2_bool_t is_inflow);
#ifdef __cplusplus
}
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/INSTALL
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/INSTALL?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/INSTALL (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/INSTALL Thu May 24 23:31:53 2007
@@ -7,8 +7,10 @@
make install
use './configure --help' for options
-NOTE: If you don't provide a --prefix configure option, it will by default
-install into /usr/local/axis2c/rampart/samples directory.
+Trying samples
+=============================================
+Please refer the ../INSTALL for more information
+
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/Makefile.am?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/Makefile.am Thu May 24 23:31:53 2007
@@ -1,6 +1,8 @@
SUBDIRS = data
prgbindir=$(prefix)/bin/samples/rampart/client/sec_echo
-prgbin_PROGRAMS = echo
+prgbin_PROGRAMS = echo
+datadir=$(prefix)/bin/samples/rampart/client/sec_echo
+data_DATA= README.txt update_n_run.sh deploy_client_repo.sh
#samplesdir=$(prefix)/samples/client/echo
#samples_DATA=echo.c README.txt Makefile.am Makefile.in
echo_SOURCES = echo.c echo_helper.c
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/Makefile.am?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/data/Makefile.am Thu May 24 23:31:53 2007
@@ -1,6 +1,2 @@
-datadir=$(prefix)/bin/samples/rampart/client/enc_echo/data
-configdir=$(prefix)/rampart/config
-#config_DATA=server.enc.axis2.xml
-#data_DATA=server.enc.axis2.xml
-#EXTRA_DIST=server.enc.axis2.xml
-
+datadir=$(prefix)/bin/samples/rampart/client/sec_echo/data
+data_DATA= client.axis2.xml
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.bat
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.bat?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.bat (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.bat Thu May 24 23:31:53 2007
@@ -1,7 +1,7 @@
echo off
rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\clientrepo
+set CLIENT_REPO=%AXIS2C_HOME%\client_repo
echo Start creating a client repository at %CLIENT_REPO%
@@ -14,10 +14,7 @@
@echo Copying axis2.xml to client_repo
-copy /Y ".\data\client.enc.axis2.xml" "%CLIENT_REPO%\axis2.xml"
-
-rem @echo Copying axis2.xml to AXIS2C_HOME
-rem copy /Y ".\data\server.enc.axis2.xml" "%AXIS2C_HOME%\axis2.xml"
+copy /Y ".\data\client.axis2.xml" "%CLIENT_REPO%\axis2.xml"
@echo Copying libraries to client_repo
xcopy /S/I/Q/Y "%AXIS2C_HOME%\lib" "%CLIENT_REPO%\lib"
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.sh?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.sh (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/deploy_client_repo.sh Thu May 24 23:31:53 2007
@@ -15,7 +15,7 @@
#copy [client]axis2.xml to CLIENT_REPO
echo "Copying axis2.xml to $CLIENT_REPO"
-cp data/client.enc.axis2.xml $CLIENT_REPO/axis2.xml
+cp data/client.axis2.xml $CLIENT_REPO/axis2.xml
#copy libs to client_repo
echo "Copying libraries to $CLIENT_REPO"
@@ -25,7 +25,7 @@
echo "Copying latest modules to $CLIENT_REPO"
cp -r $AXIS2C_HOME/modules $CLIENT_REPO/
-sed -i 's/AXIS2_USER/'$USER'/g' $CLIENT_REPO/axis2.xml
-sed -i 's/AXIS2_USER/'$USER'/g' $SERVICE_HOME/services.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $CLIENT_REPO/axis2.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $SERVICE_HOME/services.xml
echo "WARNING: Make sure that you have correct configurations in sec_echo/services.xml and $CLIENT_REPO/axis2.xml file."
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo.c Thu May 24 23:31:53 2007
@@ -105,6 +105,7 @@
/*AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
axutil_error_get_message(env->error));*/
+ return -1;
}
/* Set service client options */
@@ -124,16 +125,13 @@
/* Send request */
ret_node = axis2_svc_client_send_receive(svc_client, env, payload);
- if (ret_node)
- {
+ if (ret_node){
axis2_char_t *om_str = NULL;
om_str = axiom_node_to_string(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
- }
- else
- {
+ }else{
/*AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
axutil_error_get_message(env->error));*/
@@ -171,7 +169,7 @@
axiom_namespace_t *ns1 = NULL;
axis2_char_t *om_str = NULL;
- ns1 = axiom_namespace_create(env, /*"http://ws.apache.org/axis2/c/samples"*/ "http://sample03.policy.samples.rampart.apache.org/xsd", "ns1");
+ ns1 = axiom_namespace_create(env, /*"http://ws.apache.org/axis2/c/samples"*/ "http://example.com/ws/2004/09/policy", "ns1");
echo_om_ele = axiom_element_create(env, NULL, /*"echoString"*/"EchoRequest", ns1, &echo_om_node);
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo_helper.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo_helper.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/client/sec_echo/echo_helper.c Thu May 24 23:31:53 2007
@@ -7,6 +7,7 @@
#include <axiom_xml_reader.h>
#include <neethi_engine.h>
#include <axis2_policy_include.h>
+#include <axis2_msg.h>
#include "echo_helper.h"
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -22,6 +23,8 @@
axis2_svc_t *svc = NULL;
axis2_desc_t *desc = NULL;
axis2_policy_include_t *policy_include = NULL;
+ axis2_op_t *op = NULL;
+ axis2_msg_t *msg = NULL;
reader = axiom_xml_reader_create_for_file(env, "policy.xml", NULL);
@@ -74,8 +77,23 @@
{
printf("service is NULL\n");
return AXIS2_FAILURE;
- }
- desc = axis2_svc_get_base(svc, env);
+ }
+ op = axis2_svc_get_op_with_name(svc, env, AXIS2_ANON_OUT_IN_OP);
+ if(!op)
+ {
+ printf("Operation is NULL\n");
+ return AXIS2_FAILURE;
+ }
+ msg = axis2_op_get_msg(op, env, "out");
+ if(!msg)
+ {
+ printf("Message is NULL\n");
+ return AXIS2_FAILURE;
+ }
+
+ /*desc = axis2_op_get_base(op, env);*/
+ desc = axis2_msg_get_base(msg, env);
+ /*desc = axis2_svc_get_base(svc, env);*/
if(!desc)
{
printf("Description is NULL\n");
@@ -87,7 +105,7 @@
printf("Policy include is NULL");
return AXIS2_FAILURE;
}
- axis2_policy_include_add_policy_element(policy_include, env, AXIS2_SERVICE_POLICY, neethi_policy);
+ axis2_policy_include_add_policy_element(policy_include, env, AXIS2_MESSAGE_POLICY, neethi_policy);
}
}
}
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/README.txt?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/README.txt (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/README.txt Thu May 24 23:31:53 2007
@@ -1,5 +1,4 @@
-The scenarios available here can be deployed using either deploy.sh(UNIX) or
-deploy.bat(WIN32).
+The scenarios available here can be deployed using deploy.sh
Simply give the scenario name as an argument to the script
e.g. %sh deploy.sh scenario1
@@ -29,7 +28,7 @@
---
* I am in a HURRY and I need to try a scenario
--------------------------------------------
-If you are in a really hurry and need to try a scenario please use the
+If you are in a real hurry and need to try a scenario please use the
test_scen.sh
Usage : %sh test_scen.sh scenarioX server-port
e.g. %s test_scen.sh scenario3 8080
@@ -47,4 +46,17 @@
Make sure that you give the correct port that you configured in TCPMon
while running the scripts
+* I cannot run samples and the log says "[rampart][rampart_Engine] Cannot get policy"
+----------------------------------------------------------
+Check your descriptor file where you engaged rampart(i.e. services.xml or
+axis2.xml)
+Make sure that you have correct values for
+ <parameter name="OutflowSecurityPolicy"></parameter>
+ and
+ <parameter name="InflowSecurityPolicy"></parameter>
+
+* I cannot run samples and log says keys cannot be loaded
+--------------------------------------------------------
+Check you rpolicy files. Make sure that you have correct paths specified for
+key/certificate files
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/deploy.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/deploy.sh?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/deploy.sh (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/deploy.sh Thu May 24 23:31:53 2007
@@ -16,8 +16,8 @@
cp $1/client-incoming-secpolicy.xml $CLIENT_REPO/incoming-secpolicy.xml
echo "replacing username in policy files."
-sed -i 's/AXIS2_USER/'$USER'/g' $CLIENT_REPO/outgoing-secpolicy.xml
-sed -i 's/AXIS2_USER/'$USER'/g' $CLIENT_REPO/incoming-secpolicy.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $CLIENT_REPO/outgoing-secpolicy.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $CLIENT_REPO/incoming-secpolicy.xml
#copy service policy files to SERVICE_HOME
@@ -26,6 +26,6 @@
cp $1/service-incoming-secpolicy.xml $SERVICE_HOME/incoming-secpolicy.xml
echo "replacing username in policy files."
-sed -i 's/AXIS2_USER/'$USER'/g' $SERVICE_HOME/outgoing-secpolicy.xml
-sed -i 's/AXIS2_USER/'$USER'/g' $SERVICE_HOME/incoming-secpolicy.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $SERVICE_HOME/outgoing-secpolicy.xml
+sed -i 's,AXIS2C_HOME,'$AXIS2C_HOME',g' $SERVICE_HOME/incoming-secpolicy.xml
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -25,7 +25,7 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
- <rampc:TimeToLive>360</rampc:TimeToLive>
+ <rampc:TimeToLive>1201</rampc:TimeToLive>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -32,7 +32,7 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:User>Gampola</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -32,7 +32,7 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<rampc:User>Gampola</rampc:User>
<rampc:PasswordType>Digest</rampc:PasswordType>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -39,8 +39,8 @@
</sp:EncryptedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -39,8 +39,8 @@
</sp:EncryptedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -47,8 +47,8 @@
</sp:EncryptedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -46,8 +46,8 @@
</sp:EncryptedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -38,9 +38,9 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -38,9 +38,9 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -46,10 +46,10 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -46,10 +46,10 @@
</sp:SignedParts>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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:ReceiverCertificate>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -57,10 +57,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -58,10 +58,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -56,10 +56,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -56,10 +56,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -56,10 +56,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario8/service-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -56,10 +56,10 @@
<rampc:TimeToLive>360</rampc:TimeToLive>
<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/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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:ReceiverCertificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/client-outgoing-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/client-outgoing-secpolicy.xml Thu May 24 23:31:53 2007
@@ -42,9 +42,9 @@
</rampc:SignedItems-->
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
<rampc:EncryptionUser>a</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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_key.pem</rampc:PrivateKey>
+ <rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/ahome/a_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/service-incoming-secpolicy.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/secpolicy/scenario9/service-incoming-secpolicy.xml Thu May 24 23:31:53 2007
@@ -41,10 +41,11 @@
<rampc:Element Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
</rampc:SignedItems>
<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+ <rampc:ReplayDetection>200</rampc:ReplayDetection>
<rampc:EncryptionUser>b</rampc:EncryptionUser>
- <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <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:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+ <rampc:Certificate>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_cert.cert</rampc:Certificate>
+ <rampc:PrivateKey>AXIS2C_HOME/bin/samples/rampart/keys/bhome/b_key.pem</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified: webservices/axis2/scratch/c/neethi/rampart/samples/server/sec_echo/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/samples/server/sec_echo/services.xml?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/samples/server/sec_echo/services.xml (original)
+++ webservices/axis2/scratch/c/neethi/rampart/samples/server/sec_echo/services.xml Thu May 24 23:31:53 2007
@@ -6,8 +6,8 @@
</description>
<!--Rampart configurations START -->
<module ref="rampart"/>
- <parameter name="OutflowSecurityPolicy">/home/AXIS2_USER/axis2/c/deploy/services/sec_echo/outgoing-secpolicy.xml</parameter>
- <parameter name="InflowSecurityPolicy">/home/AXIS2_USER/axis2/c/deploy/services/sec_echo/incoming-secpolicy.xml</parameter>
+ <parameter name="OutflowSecurityPolicy">AXIS2C_HOME/services/sec_echo/outgoing-secpolicy.xml</parameter>
+ <parameter name="InflowSecurityPolicy">AXIS2C_HOME/services/sec_echo/incoming-secpolicy.xml</parameter>
<!--Rampart configurations END -->
Modified: webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_in_handler.c Thu May 24 23:31:53 2007
@@ -34,7 +34,7 @@
#include <rampart_sec_header_processor.h>
#include <rampart_sec_processed_result.h>
#include <rampart_context.h>
-#include <rampart_neethi.h>
+#include <rampart_engine.h>
/*************************** Function headers *********************************/
axis2_status_t AXIS2_CALL
@@ -109,7 +109,7 @@
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "SOAP header found");
- rampart_context = rampart_neethi_build_configuration(env, msg_ctx, AXIS2_TRUE);
+ rampart_context = rampart_engine_build_configuration(env, msg_ctx, AXIS2_TRUE);
if(!rampart_context)
{
@@ -138,7 +138,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[rampart][rampart_in_handler] Unable to set the security processed results");
}
- /*rampart_context = rampart_neethi_build_configuration(env, msg_ctx, AXIS2_TRUE);*/
+ /*rampart_context = rampart_engine_build_configuration(env, msg_ctx, AXIS2_TRUE);*/
/* rampart_context = rampart_engine_init(env,msg_ctx,AXIS2_TRUE);*/
/*
Modified: webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_out_handler.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/handlers/rampart_out_handler.c Thu May 24 23:31:53 2007
@@ -30,7 +30,7 @@
#include <rampart_encryption.h>
#include <rampart_sec_header_builder.h>
#include <rampart_context.h>
-#include <rampart_neethi.h>
+#include <rampart_engine.h>
/*********************** Function headers *********************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -121,7 +121,7 @@
return AXIS2_SUCCESS;
}
- rampart_context = rampart_neethi_build_configuration(env, msg_ctx, AXIS2_FALSE);
+ rampart_context = rampart_engine_build_configuration(env, msg_ctx, AXIS2_FALSE);
if(!rampart_context)
{
@@ -129,11 +129,6 @@
return AXIS2_FAILURE;
}
-/*
- rampart_context = rampart_engine_init(env,msg_ctx,AXIS2_FALSE);
- if(!rampart_context)
- return AXIS2_FAILURE;
-*/
/*We call the security header builder*/
status = rampart_shb_build_message(env, msg_ctx, rampart_context, soap_envelope);
if(AXIS2_FAILURE == status){
Modified: webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/c14n/sorted_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/c14n/sorted_list.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/c14n/sorted_list.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/c14n/sorted_list.c Thu May 24 23:31:53 2007
@@ -52,7 +52,7 @@
)
{
if(!(*node)) {
- *node = (c14n_sorted_list_t *) malloc(sizeof(node));
+ *node = (c14n_sorted_list_t *) malloc(sizeof(**node));
(*node)->left = (*node)->right = NULL;
(*node)->val = val;
return;
Modified: webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/xml_encryption.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/xml_encryption.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/omxmlsec/xml_encryption.c Thu May 24 23:31:53 2007
@@ -489,6 +489,7 @@
axiom_node_t *cd_node = NULL;
axis2_char_t *enc_mtd_algo = NULL;
axis2_char_t *cipher_val = NULL;
+ axis2_char_t *new_cipher_val = NULL;
axis2_status_t status = AXIS2_FAILURE;
oxs_buffer_t *input_buf = NULL;
oxs_buffer_t *result_buf = NULL;
@@ -505,6 +506,8 @@
if(!cipher_val){
return AXIS2_FAILURE;
}
+
+ new_cipher_val = oxs_util_get_newline_removed_string(env, cipher_val);
/*Get key used to encrypt*/
key_info_node = oxs_axiom_get_first_child_node_by_name(env, encrypted_key_node, OXS_NODE_KEY_INFO,OXS_DSIG_NS,OXS_DS);
@@ -516,7 +519,7 @@
/*Get the pkey used to decrypt the session key. If found set it to the asym_ctx*/
/*Create the input buffer*/
input_buf = oxs_buffer_create(env);
- oxs_buffer_populate(input_buf, env, (unsigned char*)cipher_val, axutil_strlen(cipher_val));
+ oxs_buffer_populate(input_buf, env, (unsigned char*)new_cipher_val, axutil_strlen(new_cipher_val));
/*Create a results buffer*/
result_buf = oxs_buffer_create(env);
Modified: webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/builder/rampart_config_builder.c Thu May 24 23:31:53 2007
@@ -192,5 +192,20 @@
else
return AXIS2_FAILURE;
}
+ else if(axutil_strcmp(local_name, RP_RD) == 0)
+ {
+ if(rp_match_rampart_config_qname(env, RP_RD,node,element))
+ {
+ axis2_char_t *rd_val = NULL;
+ rd_val = axiom_element_get_text(element, env, node);
+ printf("rd_val = %s", rd_val);
+ rp_rampart_config_set_rd_val(rampart_config, env, rd_val);
+ return AXIS2_SUCCESS;
+ }else{
+ return AXIS2_FAILURE;
+ }
+ }
else return AXIS2_FAILURE;
}
+
+
Modified: webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/model/rampart_config.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/model/rampart_config.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/model/rampart_config.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/secpolicy/model/rampart_config.c Thu May 24 23:31:53 2007
@@ -29,6 +29,7 @@
axis2_char_t *receiver_certificate_file;
axis2_char_t *certificate_file;
axis2_char_t *private_key_file;
+ axis2_char_t *rd_val;
};
AXIS2_EXTERN rp_rampart_config_t *AXIS2_CALL
@@ -55,6 +56,7 @@
rampart_config->authenticate_module = NULL;
rampart_config->password_type = NULL;
rampart_config->time_to_live = NULL;
+ rampart_config->rd_val = NULL;
return rampart_config;
}
@@ -273,5 +275,27 @@
AXIS2_PARAM_CHECK(env->error,time_to_live,AXIS2_FAILURE);
rampart_config->time_to_live = time_to_live;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+rp_rampart_config_get_rd_val(
+ rp_rampart_config_t *rampart_config,
+ const axutil_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ return rampart_config->rd_val;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rp_rampart_config_set_rd_val(rp_rampart_config_t *rampart_config,
+ const axutil_env_t *env,
+ axis2_char_t *rd_val)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, rd_val, AXIS2_FAILURE);
+
+ rampart_config->rd_val = rd_val;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/neethi/rampart/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/util/Makefile.am?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/util/Makefile.am (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/util/Makefile.am Thu May 24 23:31:53 2007
@@ -6,7 +6,7 @@
rampart_util.c rampart_handler_util.c rampart_username_token.c rampart_timestamp_token.c \
rampart_encryption.c rampart_sec_header_processor.c rampart_sec_processed_result.c \
rampart_sec_header_builder.c rampart_context.c rampart_token_processor.c rampart_signature.c \
- rampart_token_builder.c rampart_rd_record.c rampart_replay_detector.c rampart_neethi.c
+ rampart_token_builder.c rampart_rd_record.c rampart_replay_detector.c rampart_engine.c
librampart_util_la_LIBADD = -lssl \
Modified: webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_context.c?view=diff&rev=541566&r1=541565&r2=541566
==============================================================================
--- webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_context.c Thu May 24 23:31:53 2007
@@ -35,6 +35,7 @@
password_callback_fn pwcb_function;
rampart_is_replayed_fn is_replayed_function;
int ttl;
+ axis2_char_t *rd_val;
axis2_char_t *password_type;
/****************************/
@@ -156,6 +157,7 @@
rampart_context->pwcb_function = NULL;
rampart_context->is_replayed_function = NULL;
rampart_context->ttl = 0;
+ rampart_context->rd_val = NULL;
rampart_context->password_type = NULL;
rampart_context->secpolicy = NULL;
@@ -372,6 +374,19 @@
return AXIS2_SUCCESS;
}
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rampart_context_set_rd_val(rampart_context_t *rampart_context,
+ const axutil_env_t *env,
+ axis2_char_t *rd_val)
+{
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, rd_val, AXIS2_FAILURE);
+
+ rampart_context->rd_val = rd_val;
+ return AXIS2_SUCCESS;
+}
+
/*End of implementation*/
/*Getters of the PHP-RAMPART interface*/
@@ -520,6 +535,16 @@
return rampart_context->ttl;
}
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+rampart_context_get_rd_val(
+ rampart_context_t *rampart_context,
+ const axutil_env_t *env)
+{
+ AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
+
+ return rampart_context->rd_val;
+}
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_password_type(
rampart_context_t *rampart_context,
@@ -1376,6 +1401,23 @@
rampart_context->ttl = 300;
else
rampart_context->ttl = axutil_atoi(time_to_live);
+
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rampart_context_set_rd_val_from_file(
+ rampart_context_t *rampart_context,
+ const axutil_env_t *env)
+{
+ rp_rampart_config_t *config = NULL;
+ axis2_char_t *rd_val = NULL;
+ config = rp_secpolicy_get_rampart_config(rampart_context->secpolicy,env);
+ if(!config)
+ return AXIS2_FAILURE;
+
+ /*rd_val = rp_rampart_config_get_rd_val(config,env);*/
+ rampart_context->rd_val = rd_val;
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org