You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/08 18:26:22 UTC
[04/36] incubator-geode git commit: GEODE-962: Updated
trusted.keystore and untrusted.keystore to have certificates that will only
expire in 2026. Changed the way that the HTTP client creates a SSLContext.
GEODE-962: Updated trusted.keystore and untrusted.keystore to have certificates that will only expire in 2026.
Changed the way that the HTTP client creates a SSLContext.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/16d09f65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/16d09f65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/16d09f65
Branch: refs/heads/feature/GEODE-17-2
Commit: 16d09f659f5b699822d81daefba4334457cdebe2
Parents: 0c31f62
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Apr 1 05:37:00 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Sat Apr 2 10:31:20 2016 +1100
----------------------------------------------------------------------
.../controllers/RestAPIsWithSSLDUnitTest.java | 56 +++++++------------
.../src/test/resources/ssl/trusted.keystore | Bin 1183 -> 1078 bytes
.../src/test/resources/ssl/untrusted.keystore | Bin 1185 -> 1083 bytes
3 files changed, 20 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/16d09f65/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index cfca6cb..2e80ebf 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -16,42 +16,7 @@
*/
package com.gemstone.gemfire.rest.internal.web.controllers;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.BindException;
-import java.security.KeyStore;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-
-import com.gemstone.gemfire.test.dunit.*;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.json.JSONObject;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.ClientRegionFactory;
@@ -66,7 +31,26 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.management.ManagementException;
import com.gemstone.gemfire.management.ManagementTestBase;
+import com.gemstone.gemfire.test.dunit.*;
import com.gemstone.gemfire.util.test.TestUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLContext;
+import java.io.*;
+import java.net.BindException;
+import java.security.KeyStore;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/16d09f65/geode-core/src/test/resources/ssl/trusted.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/ssl/trusted.keystore b/geode-core/src/test/resources/ssl/trusted.keystore
index d009d8f..6057e3c 100755
Binary files a/geode-core/src/test/resources/ssl/trusted.keystore and b/geode-core/src/test/resources/ssl/trusted.keystore differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/16d09f65/geode-core/src/test/resources/ssl/untrusted.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/ssl/untrusted.keystore b/geode-core/src/test/resources/ssl/untrusted.keystore
index 34ecf4b..8f23cfe 100755
Binary files a/geode-core/src/test/resources/ssl/untrusted.keystore and b/geode-core/src/test/resources/ssl/untrusted.keystore differ