adoroszlai commented on a change in pull request #3163:
URL: https://github.com/apache/ozone/pull/3163#discussion_r831889805
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
##########
@@ -56,13 +61,31 @@ public OMRenewDelegationTokenRequest(OMRequest omRequest) {
@Override
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ // We need to populate user info in our request object.
+ OMRequest request = super.preExecute(ozoneManager);
+
RenewDelegationTokenRequestProto renewDelegationTokenRequest =
- getOmRequest().getRenewDelegationTokenRequest();
+ request.getRenewDelegationTokenRequest();
+
+ AuditLogger auditLogger = ozoneManager.getAuditLogger();
+ Map<String, String> auditMap = null;
- // Call OM to renew token
- long renewTime = ozoneManager.renewDelegationToken(
- OMPBHelper.convertToDelegationToken(
- renewDelegationTokenRequest.getToken()));
+ long renewTime;
+ try {
+ Token<OzoneTokenIdentifier> token = OMPBHelper.convertToDelegationToken(
+ renewDelegationTokenRequest.getToken());
+ auditMap = buildTokenAuditMap(token);
Review comment:
I think we should include renewer in the log in case of failure, too:
```
INFO | OMAudit | user=testuser/[email protected] | ip=172.22.0.4 |
op=RENEW_DELEGATION_TOKEN {kind=OzoneToken, service=172.22.0.9:9862,
renewer=testuser} | ret=SUCCESS |
ERROR | OMAudit | user=testuser2/[email protected] | ip=172.22.0.4 |
op=RENEW_DELEGATION_TOKEN {kind=OzoneToken, service=172.22.0.9:9862} |
ret=FAILURE | TOKEN_ERROR_OTHER ...
```
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMCancelDelegationTokenRequest.java
##########
@@ -70,10 +91,15 @@ public OMClientResponse validateAndUpdateCache(OzoneManager
ozoneManager,
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
+ AuditLogger auditLogger = ozoneManager.getAuditLogger();
+ Map<String, String> auditMap = buildTokenAuditMap(getToken());
Review comment:
Nit: we can assign `getToken()` to a local variable and use it when
assigning `ozoneTokenIdentifier` below.
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/security/OMRenewDelegationTokenRequest.java
##########
@@ -56,13 +61,31 @@ public OMRenewDelegationTokenRequest(OMRequest omRequest) {
@Override
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
+ // We need to populate user info in our request object.
+ OMRequest request = super.preExecute(ozoneManager);
+
RenewDelegationTokenRequestProto renewDelegationTokenRequest =
- getOmRequest().getRenewDelegationTokenRequest();
+ request.getRenewDelegationTokenRequest();
+
+ AuditLogger auditLogger = ozoneManager.getAuditLogger();
+ Map<String, String> auditMap = null;
- // Call OM to renew token
- long renewTime = ozoneManager.renewDelegationToken(
- OMPBHelper.convertToDelegationToken(
- renewDelegationTokenRequest.getToken()));
+ long renewTime;
+ try {
+ Token<OzoneTokenIdentifier> token = OMPBHelper.convertToDelegationToken(
+ renewDelegationTokenRequest.getToken());
+ auditMap = buildTokenAuditMap(token);
+
+ // Call OM to renew token
+ renewTime = ozoneManager.renewDelegationToken(
+ OMPBHelper.convertToDelegationToken(
+ renewDelegationTokenRequest.getToken()));
Review comment:
Nit: no need to convert the token again.
```suggestion
renewTime = ozoneManager.renewDelegationToken(token);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
