service support https access #1036

shzcore · 2020-06-14T05:02:52Z

implement #445

codecov · 2020-06-14T05:20:43Z

Codecov Report

Merging #1036 into master will decrease coverage by 0.12%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##             master    #1036      +/-   ##
============================================
- Coverage     69.20%   69.08%   -0.13%     
- Complexity     5403     5422      +19     
============================================
  Files           328      329       +1     
  Lines         26334    26411      +77     
  Branches       3750     3762      +12     
============================================
+ Hits          18225    18246      +21     
- Misses         6331     6379      +48     
- Partials       1778     1786       +8

Impacted Files	Coverage Δ	Complexity Δ
...in/java/com/baidu/hugegraph/server/RestServer.java	`54.02% <30.76%> (-4.65%)`	`0.00 <0.00> (ø)`
...java/com/baidu/hugegraph/config/ServerOptions.java	`98.33% <100.00%> (+0.15%)`	`0.00 <0.00> (ø)`
.../src/main/java/com/baidu/hugegraph/job/SysJob.java	`71.42% <0.00%> (-28.58%)`	`3.00% <0.00%> (-1.00%)`
.../java/com/baidu/hugegraph/auth/HugePermission.java	`70.00% <0.00%> (-10.00%)`	`6.00% <0.00%> (-1.00%)`
...ava/com/baidu/hugegraph/io/HugeGraphSONModule.java	`77.66% <0.00%> (-4.16%)`	`11.00% <0.00%> (ø%)`
...om/baidu/hugegraph/backend/store/BackendEntry.java	`71.42% <0.00%> (-2.86%)`	`1.00% <0.00%> (ø%)`
...om/baidu/hugegraph/api/filter/ExceptionFilter.java	`68.36% <0.00%> (-2.61%)`	`0.00% <0.00%> (ø%)`
...om/baidu/hugegraph/task/StandardTaskScheduler.java	`85.26% <0.00%> (-1.27%)`	`67.00% <0.00%> (-2.00%)`
...gegraph/backend/serializer/BinaryBackendEntry.java	`82.27% <0.00%> (-0.44%)`	`28.00% <0.00%> (-1.00%)`
...a/com/baidu/hugegraph/backend/query/Condition.java	`77.94% <0.00%> (-0.37%)`	`32.00% <0.00%> (ø%)`
... and 29 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ebe79aa...13074c4. Read the comment docs.

javeme

also update title "add sup https"

javeme · 2020-06-15T05:07:36Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -212,4 +212,27 @@ public static synchronized ServerOptions instance() {
                    disallowEmpty(),
                    "hugegraph:9fd95c9c-711b-415b-b85f-d4df46ba5c31"
            );
+    public static final ConfigOption<String> KEYSTORE_SERVER_FILE =
+            new ConfigOption<>(
+                    "server.keystore.file",


prefer ssl.server_keystore_file

javeme · 2020-06-15T05:09:27Z

hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java

+            sslContext.setKeyStoreFile(keystoreServerFile);
+            sslContext.setKeyStorePass(keystoreServerPassword);
+            server = GrizzlyHttpServerFactory.createHttpServer(uri, rc, true,
+                                                               new SSLEngineConfigurator(sslContext)


define a var for 'new SSLEngineConfigurator(sslContext)'

javeme · 2020-06-15T05:10:35Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<String> SECURITY_PROTOCOL =
+            new ConfigOption<>(
+                    "security.protocol",


prefer server.protocol

javeme · 2020-06-15T05:11:55Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "server.keystore.password",
+                    "The server keystore password.",
+                    disallowEmpty(),
+                    "abc123"


don't set by default, just keep empty

javeme · 2020-06-15T05:14:31Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<String> KEYSTORE_SERVER_FILE =
+            new ConfigOption<>(
+                    "server.keystore.file",
+                    "The server keystore file.",


improve description: The path of server keystore file used when https protocol is enabled

javeme · 2020-06-15T05:15:01Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<String> KEYSTORE_SERVER_PASSWORD =
+            new ConfigOption<>(
+                    "server.keystore.password",
+                    "The server keystore password.",


improve description

javeme · 2020-06-15T05:15:19Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<String> KEYSTORE_SERVER_PASSWORD =
+            new ConfigOption<>(
+                    "server.keystore.password",


prefer ssl.server_keystore_password

javeme · 2020-06-15T05:15:52Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<String> SECURITY_PROTOCOL =
+            new ConfigOption<>(
+                    "security.protocol",
+                    "security.protocol.",


improve description

javeme · 2020-06-16T14:19:13Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "The server keystore file.",
+                    "ssl.server_keystore_file",
+                    "The path of server keystore file used when https " +
+                            "protocol is enabled.",


align with "The path..."

javeme · 2020-06-16T14:19:19Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "abc123"
+                    "ssl.server_keystore_password",
+                    "The password of the path of the server keystore file " +
+                            "used when the https protocol is enabled.",


javeme · 2020-06-16T14:20:45Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "security.protocol",
-                    "security.protocol.",
+                    "server.protocol",
+                    "Fill in when https protocol is enabled.",


The protocol of rest-server, allowed values are: http or https.

javeme · 2020-06-16T14:22:31Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "server.protocol",
+                    "Fill in when https protocol is enabled.",
+                    disallowEmpty(),


allowValues("http", "https")

Linary · 2020-06-18T02:17:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "server.protocol",
+                    "The protocol of rest-server, allowed values are: " +
+                    "http or https.",
+                    allowValues("http","https"),


add an space between "http" and "https"

add sup https

0c54274

javeme requested changes Jun 15, 2020

View reviewed changes

Code specification

58ee346

javeme requested changes Jun 16, 2020

View reviewed changes

code specification

042af67

javeme previously approved these changes Jun 17, 2020

View reviewed changes

shzcore changed the title ~~add sup https~~ service support https access Jun 17, 2020

houzhizhen previously approved these changes Jun 18, 2020

View reviewed changes

Linary requested changes Jun 18, 2020

View reviewed changes

add an space between http and https

13074c4

shzcore dismissed stale reviews from houzhizhen and javeme via 13074c4 June 18, 2020 02:23

Linary approved these changes Jun 18, 2020

View reviewed changes

zhoney approved these changes Jun 18, 2020

View reviewed changes

houzhizhen approved these changes Jun 18, 2020

View reviewed changes

javeme merged commit 0db1aba into apache:master Jun 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

service support https access #1036

service support https access #1036

shzcore commented Jun 14, 2020 •

edited by javeme

codecov bot commented Jun 14, 2020 •

edited

javeme left a comment

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 15, 2020

javeme Jun 16, 2020

javeme Jun 16, 2020

javeme Jun 16, 2020

javeme Jun 16, 2020

Linary Jun 18, 2020

service support https access #1036

service support https access #1036

Conversation

shzcore commented Jun 14, 2020 • edited by javeme

codecov bot commented Jun 14, 2020 • edited

Codecov Report

javeme left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shzcore commented Jun 14, 2020 •

edited by javeme

codecov bot commented Jun 14, 2020 •

edited