This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 022f2de ATLAS-3329 : Update usage of Servlets.getUserName method to
AtlasAuthorizationUtils.getCurrentUserName()
022f2de is described below
commit 022f2de8954382051a6ed53e4ae91a63f36d4bdd
Author: nixonrodrigues <[email protected]>
AuthorDate: Thu Jul 11 19:40:22 2019 +0530
ATLAS-3329 : Update usage of Servlets.getUserName method to
AtlasAuthorizationUtils.getCurrentUserName()
Change-Id: I6bb6649ec9c82690d81f457de051a72eb9812850
(cherry picked from commit 3ad9016cd6f8fba0426262c90e5a97fe795d3843)
---
.../org/apache/atlas/web/resources/AdminResource.java | 6 +++---
.../java/org/apache/atlas/web/rest/DiscoveryREST.java | 15 ++++++++-------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
index 2716873..e78fcb6 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
@@ -356,7 +356,7 @@ public class AdminResource {
ZipSink exportSink = null;
try {
exportSink = new ZipSink(httpServletResponse.getOutputStream());
- AtlasExportResult result = exportService.run(exportSink, request,
Servlets.getUserName(httpServletRequest),
+ AtlasExportResult result = exportService.run(exportSink, request,
AtlasAuthorizationUtils.getCurrentUserName(),
Servlets.getHostName(httpServletRequest),
AtlasAuthorizationUtils.getRequestIpAddress(httpServletRequest));
@@ -406,7 +406,7 @@ public class AdminResource {
AtlasImportRequest request = AtlasType.fromJson(jsonData,
AtlasImportRequest.class);
ZipSource zipSource = new ZipSource(inputStream);
- result = importService.run(zipSource, request,
Servlets.getUserName(httpServletRequest),
+ result = importService.run(zipSource, request,
AtlasAuthorizationUtils.getCurrentUserName(),
Servlets.getHostName(httpServletRequest),
AtlasAuthorizationUtils.getRequestIpAddress(httpServletRequest));
} catch (AtlasBaseException excp) {
@@ -449,7 +449,7 @@ public class AdminResource {
try {
AtlasImportRequest request = AtlasType.fromJson(jsonData,
AtlasImportRequest.class);
- result = importService.run(request,
Servlets.getUserName(httpServletRequest),
+ result = importService.run(request,
AtlasAuthorizationUtils.getCurrentUserName(),
Servlets.getHostName(httpServletRequest),
AtlasAuthorizationUtils.getRequestIpAddress(httpServletRequest));
} catch (AtlasBaseException excp) {
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
index 8ec3427..e6b338b 100644
--- a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
+++ b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
@@ -20,6 +20,7 @@ package org.apache.atlas.web.rest;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.AtlasErrorCode;
import org.apache.atlas.SortOrder;
+import org.apache.atlas.authorize.AtlasAuthorizationUtils;
import org.apache.atlas.discovery.AtlasDiscoveryService;
import org.apache.atlas.discovery.EntityDiscoveryService;
import org.apache.atlas.exception.AtlasBaseException;
@@ -398,7 +399,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.addSavedSearch(userName=" + savedSearch.getOwnerName() + ",
name=" + savedSearch.getName() + ", searchType=" + savedSearch.getSearchType()
+ ")");
}
- return
discoveryService.addSavedSearch(Servlets.getUserName(httpServletRequest),
savedSearch);
+ return
discoveryService.addSavedSearch(AtlasAuthorizationUtils.getCurrentUserName(),
savedSearch);
} finally {
AtlasPerfTracer.log(perf);
}
@@ -422,7 +423,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.updateSavedSearch(userName=" + savedSearch.getOwnerName() + ",
name=" + savedSearch.getName() + ", searchType=" + savedSearch.getSearchType()
+ ")");
}
- return
discoveryService.updateSavedSearch(Servlets.getUserName(httpServletRequest),
savedSearch);
+ return
discoveryService.updateSavedSearch(AtlasAuthorizationUtils.getCurrentUserName(),
savedSearch);
} finally {
AtlasPerfTracer.log(perf);
}
@@ -449,7 +450,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.getSavedSearch(userName=" + userName + ", name=" + searchName +
")");
}
- return
discoveryService.getSavedSearchByName(Servlets.getUserName(httpServletRequest),
userName, searchName);
+ return
discoveryService.getSavedSearchByName(AtlasAuthorizationUtils.getCurrentUserName(),
userName, searchName);
} finally {
AtlasPerfTracer.log(perf);
}
@@ -473,7 +474,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.getSavedSearches(userName=" + userName + ")");
}
- return
discoveryService.getSavedSearches(Servlets.getUserName(httpServletRequest),
userName);
+ return
discoveryService.getSavedSearches(AtlasAuthorizationUtils.getCurrentUserName(),
userName);
} finally {
AtlasPerfTracer.log(perf);
}
@@ -494,7 +495,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.deleteSavedSearch(guid=" + guid + ")");
}
-
discoveryService.deleteSavedSearch(Servlets.getUserName(httpServletRequest),
guid);
+
discoveryService.deleteSavedSearch(AtlasAuthorizationUtils.getCurrentUserName(),
guid);
} finally {
AtlasPerfTracer.log(perf);
}
@@ -524,7 +525,7 @@ public class DiscoveryREST {
"DiscoveryREST.executeSavedSearchByName(userName=" +
userName + ", " + "name=" + searchName + ")");
}
- AtlasUserSavedSearch savedSearch =
discoveryService.getSavedSearchByName(Servlets.getUserName(httpServletRequest),
userName, searchName);
+ AtlasUserSavedSearch savedSearch =
discoveryService.getSavedSearchByName(AtlasAuthorizationUtils.getCurrentUserName(),
userName, searchName);
return executeSavedSearch(savedSearch);
} finally {
@@ -551,7 +552,7 @@ public class DiscoveryREST {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG,
"DiscoveryREST.executeSavedSearchByGuid(" + searchGuid + ")");
}
- AtlasUserSavedSearch savedSearch =
discoveryService.getSavedSearchByGuid(Servlets.getUserName(httpServletRequest),
searchGuid);
+ AtlasUserSavedSearch savedSearch =
discoveryService.getSavedSearchByGuid(AtlasAuthorizationUtils.getCurrentUserName(),
searchGuid);
return executeSavedSearch(savedSearch);
} finally {
