anph
/
hugegraph-sync
forked from hugegraph/hugegraph-sync
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add bearer token support (#81)

This commit is contained in:
guoygang 2021-11-02 19:43:38 +08:00 committed by GitHub
parent 53c6503cde
commit 1d27452994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 106 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.baidu.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
<version>1.8.9</version>
<version>1.8.10</version>
<name>hugegraph-common</name>
<url>https://github.com/hugegraph/hugegraph-common</url>

4
src/main/java/com/baidu/hugegraph/perf/NormalStopwatch.java
View File

@ -268,7 +268,9 @@ public final class NormalStopwatch implements Stopwatch {
test.run();
long end = PerfUtil.now();
long cost = end - start - baseCost;
assert cost > 0;
if (cost < 0L) {
cost = 0L;
}
long eachCost = cost / times;
LOG.info("Wasted time test: cost={}ms, base_cost={}ms, {}={}ns",

48
src/main/java/com/baidu/hugegraph/rest/AbstractRestClient.java
View File

@ -19,6 +19,7 @@
package com.baidu.hugegraph.rest;
import java.io.IOException;
import java.net.URI;
import java.security.KeyManagementException;
import java.security.SecureRandom;
@ -38,6 +39,8 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation.Builder;
import javax.ws.rs.client.WebTarget;
@ -78,6 +81,8 @@ public abstract class AbstractRestClient implements RestClient {
// Time unit: ms
private static final long IDLE_TIME = 40L * 1000L;
private static final String TOKEN_KEY = "tokenKey";
private final Client client;
private final WebTarget target;
@ -130,6 +135,32 @@ public abstract class AbstractRestClient implements RestClient {
.build());
}
public AbstractRestClient(String url, String token, int timeout) {
this(url, new ConfigBuilder().configTimeout(timeout)
.configToken(token)
.build());
}
public AbstractRestClient(String url, String token, int timeout,
int maxTotal, int maxPerRoute) {
this(url, new ConfigBuilder().configTimeout(timeout)
.configToken(token)
.configPool(maxTotal, maxPerRoute)
.build());
}
public AbstractRestClient(String url, String token, int timeout,
int maxTotal, int maxPerRoute,
String trustStoreFile,
String trustStorePassword) {
this(url, new ConfigBuilder().configTimeout(timeout)
.configToken(token)
.configPool(maxTotal, maxPerRoute)
.configSSL(trustStoreFile,
trustStorePassword)
.build());
}
public AbstractRestClient(String url, ClientConfig config) {
configConnectionManager(url, config);
this.client = ClientBuilder.newClient(config);
@ -519,6 +550,12 @@ public abstract class AbstractRestClient implements RestClient {
return this;
}
public ConfigBuilder configToken(String token) {
this.config.property(TOKEN_KEY, token);
this.config.register(BearerRequestFilter.class);
return this;
}
public ConfigBuilder configPool(int maxTotal, int maxPerRoute) {
this.config.property("maxTotal", maxTotal);
this.config.property("maxPerRoute", maxPerRoute);
@ -547,4 +584,15 @@ public abstract class AbstractRestClient implements RestClient {
return this.config;
}
}
public static class BearerRequestFilter implements ClientRequestFilter {
@Override
public void filter(ClientRequestContext context) throws IOException {
String token = context.getClient().getConfiguration()
.getProperty(TOKEN_KEY).toString();
context.getHeaders().add(HttpHeaders.AUTHORIZATION,
"Bearer " + token);
}
}
}

2
src/main/java/com/baidu/hugegraph/version/CommonVersion.java
View File

@ -27,5 +27,5 @@ public class CommonVersion {
// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(CommonVersion.class,
"1.8.9");
"1.8.10");
}

53
src/test/java/com/baidu/hugegraph/unit/rest/RestClientTest.java
View File

@ -111,6 +111,33 @@ public class RestClientTest {
this.content = "";
}
public RestClientImpl(String url, String token,
int timeout, int status) {
super(url, token, timeout);
this.status = status;
this.headers = ImmutableMultivaluedMap.empty();
this.content = "";
}
public RestClientImpl(String url, String token, int timeout,
int maxTotal, int maxPerRoute, int status) {
super(url, token, timeout, maxTotal, maxPerRoute);
this.status = status;
this.headers = ImmutableMultivaluedMap.empty();
this.content = "";
}
public RestClientImpl(String url, String token, int timeout,
int maxTotal, int maxPerRoute,
String trustStoreFile,
String trustStorePassword, int status) {
super(url, token, timeout, maxTotal, maxPerRoute,
trustStoreFile, trustStorePassword);
this.status = status;
this.headers = ImmutableMultivaluedMap.empty();
this.content = "";
}
public RestClientImpl(String url, int timeout, int status) {
this(url, timeout, status, ImmutableMultivaluedMap.empty(), "");
}
@ -218,6 +245,13 @@ public class RestClientTest {
Assert.assertEquals(200, restResult.status());
}
@Test
public void testPostWithToken() {
RestClient client = new RestClientImpl("/test", "token", 1000, 200);
RestResult restResult = client.post("path", "body");
Assert.assertEquals(200, restResult.status());
}
@Test
public void testPostWithAllParams() {
RestClient client = new RestClientImpl("/test", "user", "", 1000,
@ -226,6 +260,14 @@ public class RestClientTest {
Assert.assertEquals(200, restResult.status());
}
@Test
public void testPostWithTokenAndAllParams() {
RestClient client = new RestClientImpl("/test", "token", 1000,
10, 5, 200);
RestResult restResult = client.post("path", "body");
Assert.assertEquals(200, restResult.status());
}
@Test
public void testPostHttpsWithAllParams() {
String trustStoreFile = "src/test/resources/cacerts.jks";
@ -237,6 +279,17 @@ public class RestClientTest {
Assert.assertEquals(200, restResult.status());
}
@Test
public void testPostHttpsWithTokenAndAllParams() {
String trustStoreFile = "src/test/resources/cacerts.jks";
String trustStorePassword = "changeit";
RestClient client = new RestClientImpl("/test", "token", 1000,
10, 5, trustStoreFile,
trustStorePassword, 200);
RestResult restResult = client.post("path", "body");
Assert.assertEquals(200, restResult.status());
}
@Test
public void testHostNameVerifier() {
BiFunction<String, String, Boolean> verifer = (url, hostname) -> {