match server https certificate (#110)

hugegraph · Nov 23, 2020 · 783e687 · 783e687
1 parent b08f929
commit 783e687
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/assembly/travis/conf/server.keystore b/assembly/travis/conf/server.keystore
diff --git a/assembly/travis/install-hugegraph.sh b/assembly/travis/install-hugegraph.sh
@@ -48,8 +48,6 @@ cd ../
 
 cd $HTTPS_SERVER_DIR
 
-cp ../$TRAVIS_DIR/conf/server.keystore conf
-
 REST_SERVER_CONFIG="conf/rest-server.properties"
 
 GREMLIN_SERVER_CONFIG="conf/gremlin-server.yaml"
@@ -58,11 +56,9 @@ sed -i "s?http://127.0.0.1:8080?https://127.0.0.1:8443?g" "$REST_SERVER_CONFIG"
 
 sed -i "s/#port: 8182/port: 8282/g" "$GREMLIN_SERVER_CONFIG"
 
-echo "restserver.protocol=https" >> $REST_SERVER_CONFIG
-
-echo "ssl.keystore_password=123456" >> $REST_SERVER_CONFIG
+echo "ssl.keystore_password=hugegraph" >> $REST_SERVER_CONFIG
 
-echo "ssl.keystore_file=conf/server.keystore" >> $REST_SERVER_CONFIG
+echo "ssl.keystore_file=conf/hugegraph-server.keystore" >> $REST_SERVER_CONFIG
 
 echo "gremlinserver.url=http://127.0.0.1:8282" >> $REST_SERVER_CONFIG
 

diff --git a/src/test/java/com/baidu/hugegraph/functional/HugeClientHttpsTest.java b/src/test/java/com/baidu/hugegraph/functional/HugeClientHttpsTest.java
@@ -42,8 +42,8 @@ public class HugeClientHttpsTest extends BaseFuncTest {
     private static final int MAX_CONNS_PER_ROUTE = 10;
     private static final int MAX_CONNS = 10;
     private static final int IDLE_TIME = 30;
-    private static final String TRUST_STORE_FILE = "src/test/resources/cacerts.jks";
-    private static final String TRUST_STORE_PASSWORD = "changeit";
+    private static final String TRUST_STORE_FILE = "src/test/resources/hugegraph.truststore";
+    private static final String TRUST_STORE_PASSWORD = "hugegraph";
 
     private static HugeClient client;
 

diff --git a/src/test/resources/cacerts.jks b/src/test/resources/cacerts.jks
diff --git a/src/test/resources/hugegraph.truststore b/src/test/resources/hugegraph.truststore