You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/27 10:30:19 UTC
svn commit: r1721791 - in /axis/axis2/java/rampart/branches/1_6: ./
modules/rampart-samples/policy/sample01/
modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/
Author: veithen
Date: Sun Dec 27 09:30:19 2015
New Revision: 1721791
URL: http://svn.apache.org/viewvc?rev=1721791&view=rev
Log:
RAMPART-343: Merge r1440274 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/README.txt
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/services.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 27 09:30:19 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640,1721694,1721717,1721719-1721721,1721749,1721751
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1440274,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,171922
9,1719232,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640,1721694,1721717,1721719-1721721,1721749,1721751
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/README.txt?rev=1721791&r1=1721790&r2=1721791&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/README.txt (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/README.txt Sun Dec 27 09:30:19 2015
@@ -3,6 +3,16 @@ UsernameToken Authentication
The policy uses a TransportBinding and requires a SignedSupportingToken which
is a UsernameToken and the inclusion of a TimeStamp.
-Note that Rampart does not enforce the use of HTTPS transport and that
+Note that Rampart enforces the use of HTTPS transport and that
{http://ws.apache.org/rampart/policy}RampartConfig assertion provides
-additional information required to secure the message.
\ No newline at end of file
+additional information required to secure the message.
+
+The policy included in the services.xml file has the following comment :
+<!--<sp:HttpsToken RequireClientCertificate="false"/> -->
+
+If you uncomment this and deploy the service you will see the following error message :
+org.apache.axis2.AxisFault: Expected transport is "https" but incoming transport found : "http"
+
+You can find a complete tutorial on transport level
+security here:
+http://wso2.org/library/3190
\ No newline at end of file
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/services.xml?rev=1721791&r1=1721790&r2=1721791&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/services.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample01/services.xml Sun Dec 27 09:30:19 2015
@@ -32,7 +32,8 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <!-- REMOVED TO MAKE THE SAMPLE RUN WITH THE axis2server-->
+ <!--<sp:HttpsToken RequireClientCertificate="false"/> -->
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721791&r1=1721790&r2=1721791&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java Sun Dec 27 09:30:19 2015
@@ -47,8 +47,7 @@ public class SampleTest extends TestCase
suite.addTest(new SampleTest("basic", "09"));
suite.addTest(new SampleTest("basic", "10"));
suite.addTest(new SampleTest("basic", "11"));
- // TODO: failing
-// suite.addTest(new SampleTest("policy", "01"));
+ suite.addTest(new SampleTest("policy", "01"));
suite.addTest(new SampleTest("policy", "02"));
suite.addTest(new SampleTest("policy", "03"));
suite.addTest(new SampleTest("policy", "04"));