[hbase] branch branch-2.5 updated: HBASE-26776 RpcServer failure to SASL handshake always logs user "unknown" to audit log (#4138)

[ndimiduk]

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new ff7f189  HBASE-26776 RpcServer failure to SASL handshake always logs 
user "unknown" to audit log (#4138)
ff7f189 is described below

commit ff7f18923a7ef8273bb6e0aeb96329f68ae395f9
Author: Nick Dimiduk <ndimi...@apache.org>
AuthorDate: Tue Mar 1 14:33:02 2022 +0100

    HBASE-26776 RpcServer failure to SASL handshake always logs user "unknown" 
to audit log (#4138)
    
    Signed-off-by: Andrew Purtell <apurt...@apache.org>
    Signed-off-by: Peter Somogyi <psomo...@apache.org>
---
 .../apache/hadoop/hbase/security/HBaseSaslRpcServer.java   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
index 071fef5..3074fce 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -21,15 +21,11 @@ import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.Map;
-import java.util.Optional;
-
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
-
 import 
org.apache.hadoop.hbase.security.provider.AttemptingUserProvidingSaslServer;
 import 
org.apache.hadoop.hbase.security.provider.SaslServerAuthenticationProvider;
-import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.SecretManager;
 import org.apache.hadoop.security.token.SecretManager.InvalidToken;
 import org.apache.hadoop.security.token.TokenIdentifier;
@@ -66,11 +62,9 @@ public class HBaseSaslRpcServer {
   }
 
   public String getAttemptingUser() {
-    Optional<UserGroupInformation> optionalUser = 
serverWithProvider.getAttemptingUser();
-    if (optionalUser.isPresent()) {
-      optionalUser.get().toString();
-    }
-    return "Unknown";
+    return serverWithProvider.getAttemptingUser()
+      .map(Object::toString)
+      .orElse("Unknown");
   }
 
   public byte[] wrap(byte[] buf, int off, int len) throws SaslException {