Skip to content

Commit 9a6494f

Browse files
anmolnarpetersomogyi
authored andcommitted
HBASE-22759 Extended grant and revoke audit events with caller info - ADDENDUM
Added remote address to grant/revoke audit log messages
1 parent 94e35d8 commit 9a6494f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.protobuf.RpcController;
2424
import com.google.protobuf.Service;
2525
import java.io.IOException;
26+
import java.net.InetAddress;
2627
import java.security.PrivilegedExceptionAction;
2728
import java.util.ArrayList;
2829
import java.util.Collection;
@@ -2072,7 +2073,8 @@ public Void run() throws Exception {
20722073

20732074
if (AUDITLOG.isTraceEnabled()) {
20742075
// audit log should store permission changes in addition to auth results
2075-
AUDITLOG.trace("User {} granted permission {}", caller, perm);
2076+
String remoteAddress = RpcServer.getRemoteAddress().map(InetAddress::toString).orElse("");
2077+
AUDITLOG.trace("User {} (remote address: {}) granted permission {}", caller, remoteAddress, perm);
20762078
}
20772079
} else {
20782080
throw new CoprocessorException(AccessController.class, "This method "
@@ -2129,7 +2131,8 @@ public Void run() throws Exception {
21292131

21302132
if (AUDITLOG.isTraceEnabled()) {
21312133
// audit log should record all permission changes
2132-
AUDITLOG.trace("User {} revoked permission {}", caller, perm);
2134+
String remoteAddress = RpcServer.getRemoteAddress().map(InetAddress::toString).orElse("");
2135+
AUDITLOG.trace("User {} (remote address: {}) revoked permission {}", caller, remoteAddress, perm);
21332136
}
21342137
} else {
21352138
throw new CoprocessorException(AccessController.class, "This method "

0 commit comments

Comments
 (0)