You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/03/30 01:18:38 UTC
[incubator-skywalking] 02/02: Merge branch 'feature/token-auth' of
https://github.com/apache/incubator-skywalking into feature/token-auth
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch feature/token-auth
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit c07cf9284df7b97b48a52dabca5836ffea03b391
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Fri Mar 30 09:18:02 2018 +0800
Merge branch 'feature/token-auth' of https://github.com/apache/incubator-skywalking into feature/token-auth
# Conflicts:
# apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleChecker.java
---
.../collector/agent/grpc/provider/AuthenticationSimpleChecker.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleChecker.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleChecker.java
index 6167788..be50a5c 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleChecker.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleChecker.java
@@ -36,6 +36,9 @@ import org.apache.skywalking.apm.collector.server.grpc.GRPCServer;
public enum AuthenticationSimpleChecker {
INSTANCE;
+ private static final Metadata.Key<String> AUTH_HEAD_HEADER_NAME =
+ Metadata.Key.of("Authentication", Metadata.ASCII_STRING_MARSHALLER);
+
private String expectedToken = "";
public void build(GRPCServer gRPCServer, BindableService targetService) {
@@ -45,7 +48,7 @@ public enum AuthenticationSimpleChecker {
public <REQ, RESP> ServerCall.Listener<REQ> interceptCall(ServerCall<REQ, RESP> serverCall,
Metadata metadata,
ServerCallHandler<REQ, RESP> next) {
- String token = metadata.get(Metadata.Key.of("Authentication", Metadata.ASCII_STRING_MARSHALLER));
+ String token = metadata.get(AUTH_HEAD_HEADER_NAME);
if (expectedToken.equals(token)) {
return next.startCall(serverCall, metadata);
} else {
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.