summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-07-10 13:01:02 +0200
committerGitHub <noreply@github.com>2019-07-10 13:01:02 +0200
commit0232a991e934babaddef0332c8916a30f7360fd6 (patch)
tree26488e39f69389b0b33b0cd39773e787c7248523
parent957bbe9989a63a6e930a05b2e1f596b10a0c31b5 (diff)
parentdb8f8cfcbfaf5b976a1550ff09953f251890f836 (diff)
Merge pull request #10008 from vespa-engine/bjorncs/configserver-rpc-authz
Bjorncs/configserver rpc authz
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifier.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifier.java b/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifier.java
index 77aac21fcf6..2f446db4114 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifier.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifier.java
@@ -11,6 +11,6 @@ import java.util.List;
*/
public interface NodeIdentifier {
- NodeIdentity identifyNode(List<X509Certificate> peerCertificateChain);
+ NodeIdentity identifyNode(List<X509Certificate> peerCertificateChain) throws NodeIdentifierException;
}
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
index caeff01f440..15e52e48c3a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
@@ -157,7 +157,7 @@ public class MultiTenantRpcAuthorizer implements RpcAuthorizer {
private void handleAuthorizationFailure(Request request, Throwable throwable) {
String errorMessage = String.format("For request '%s' from '%s' (mode=%s): %s", request.methodName(), request.target().toString(), mode.toString(), throwable.getMessage());
- log.log(LogLevel.WARNING, errorMessage);
+ log.log(LogLevel.INFO, errorMessage);
log.log(LogLevel.DEBUG, throwable, throwable::getMessage);
if (mode == Mode.ENFORCE) {
JrtErrorCode error = throwable instanceof AuthorizationException ? JrtErrorCode.UNAUTHORIZED : JrtErrorCode.AUTHORIZATION_FAILED;