Bug 57197: use proxy for TestSignatureInfo if set via environment variables

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1637979 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 66c62f5efaf80d758d9c75274d82fd43c9355c6f..5490bd592f0582fbe89a31c5c604fb1f74c37366 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -86,8 +86,9 @@ under the License.
     <property name="poi.test.locale" value="-Duser.language=en -Duser.country=US"/>
     <property name="POI.testdata.path" value="test-data"/>
     <property name="java.awt.headless" value="true"/>
-       <property name="additionaljar" value=""/>
-    
+    <property name="additionaljar" value=""/>
+    <property name="http_proxy" value="${env.http_proxy}"/>
+
     <!-- Main: -->
     <property name="main.resource1.dir" value="src/resources/main"/>
     <property name="main.src" location="src/java"/>
@@ -227,6 +228,7 @@ under the License.
         <propertyref name="POI.testdata.path"/>
         <propertyref name="java.awt.headless"/>
         <propertyref name="org.apache.poi.util.POILogger"/>
+        <propertyref name="http_proxy"/>
     </propertyset>
 
     <path id="main.classpath">

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
index d99aadd9ca265177b13ad20c1ccf10625368f403..609a26d6b64db2c455e2de09fe5c0c2d7f2451c9 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java
@@ -309,6 +309,12 @@ public class TestSignatureInfo {
         signatureConfig.setTspUrl("http://timestamp.comodoca.com/rfc3161");\r
         signatureConfig.setTspRequestPolicy(null); // comodoca request fails, if default policy is set ...\r
         signatureConfig.setTspOldProtocol(false);\r
+        \r
+        //set proxy info if any\r
+        String proxy = System.getProperty("http_proxy");\r
+        if (proxy != null && proxy.trim().length() > 0) {\r
+            signatureConfig.setProxyUrl(proxy);\r
+        }\r
 \r
         if (mockTsp) {\r
             TimeStampService tspService = new TimeStampService(){\r