diff --git a/src/prerna/semoss/web/services/local/auth/AdminGroupAuthorizationResource.java b/src/prerna/semoss/web/services/local/auth/AdminGroupAuthorizationResource.java index 67296d3e..2ae6673a 100644 --- a/src/prerna/semoss/web/services/local/auth/AdminGroupAuthorizationResource.java +++ b/src/prerna/semoss/web/services/local/auth/AdminGroupAuthorizationResource.java @@ -43,6 +43,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; +import prerna.auth.AuthProvider; import prerna.auth.User; import prerna.auth.utils.AdminSecurityGroupUtils; import prerna.auth.utils.SecurityAdminUtils; @@ -91,7 +92,7 @@ public Response getGroups(@Context HttpServletRequest request, @QueryParam("sear public Response getGroupDetails(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("type") String type) { groupId = WebUtility.inputSQLSanitizer(groupId); - type = WebUtility.inputSQLSanitizer(type); + type = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(type)); AdminSecurityGroupUtils groupUtils = null; User user = null; try { @@ -160,7 +161,8 @@ public Response addGroup(@Context HttpServletRequest request) { if (newGroupId == null || (newGroupId = newGroupId.trim()).isEmpty()) { throw new IllegalArgumentException("The group id cannot be null or empty"); } - String newGroupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String newGroupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String description = WebUtility.inputSanitizer(request.getParameter("description")); if (description == null) { description = ""; @@ -211,7 +213,8 @@ public Response deleteGroup(@Context HttpServletRequest request) { if (groupId == null || (groupId = groupId.trim()).isEmpty()) { throw new IllegalArgumentException("The group id cannot be null or empty"); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); AdminSecurityGroupUtils.getInstance(user).deleteGroupAndPropagate(groupId, groupType); success = true; @@ -256,12 +259,14 @@ public Response editGroup(@Context HttpServletRequest request) { if (groupId == null || (groupId = groupId.trim()).isEmpty()) { throw new IllegalArgumentException("The group id cannot be null or empty"); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String newGroupId = WebUtility.inputSQLSanitizer(request.getParameter("newGroupId")); if (newGroupId == null || (newGroupId = newGroupId.trim()).isEmpty()) { throw new IllegalArgumentException("The new group id cannot be null or empty"); } - String newType = WebUtility.inputSQLSanitizer(request.getParameter("newType")); + String newType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("newType"))); String newDescription = WebUtility.inputSanitizer(request.getParameter("newDescription")); if ((newType == null || (newType = newType.trim()).isEmpty())) { throw new IllegalArgumentException("The new group type cannot be null"); @@ -313,7 +318,8 @@ public Response editGroupDetails(@Context HttpServletRequest request) { if (newGroupId == null || (newGroupId = newGroupId.trim()).isEmpty()) { throw new IllegalArgumentException("The new group id cannot be null or empty"); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); if ((groupType == null || (groupType = groupType.trim()).isEmpty())) { throw new IllegalArgumentException("The group type cannot be null"); } @@ -666,7 +672,8 @@ public Response addGroupProjectPermission(@Context HttpServletRequest request) { "Must pass a valid integer value. Received value = " + permissionStr); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String endDate = WebUtility.inputSQLSanitizer(request.getParameter("endDate")); AdminSecurityGroupUtils.getInstance(user).addGroupProjectPermission(user, groupId, groupType, projectId, @@ -730,7 +737,8 @@ public Response editGroupProjectPermission(@Context HttpServletRequest request) "Must pass a valid integer value. Received value = " + permissionStr); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String endDate = WebUtility.inputSQLSanitizer(request.getParameter("endDate")); AdminSecurityGroupUtils.getInstance(user).editGroupProjectPermission(user, groupId, groupType, projectId, @@ -780,7 +788,8 @@ public Response removeGroupProjectPermission(@Context HttpServletRequest request if (projectId == null || (projectId = projectId.trim()).isEmpty()) { throw new IllegalArgumentException("The project id ('projectId') cannot be null or empty"); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); AdminSecurityGroupUtils.getInstance(user).removeGroupProjectPermission(user, groupId, groupType, projectId); success = true; @@ -804,7 +813,7 @@ public Response getProjectsForGroup(@Context HttpServletRequest request, @QueryP @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("limit") long limit, @QueryParam("offset") long offset, @QueryParam("onlyApps") boolean onlyApps) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -850,7 +859,7 @@ public Response getProjectsForGroup(@Context HttpServletRequest request, @QueryP public Response getNumProjectsForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("onlyApps") boolean onlyApps) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -896,7 +905,7 @@ public Response getAvailableProjectsForGroup(@Context HttpServletRequest request @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("limit") long limit, @QueryParam("offset") long offset, @QueryParam("onlyApps") boolean onlyApps) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -942,7 +951,7 @@ public Response getAvailableProjectsForGroup(@Context HttpServletRequest request public Response getNumAvailableProjectsForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("onlyApps") boolean onlyApps) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -1032,7 +1041,8 @@ public Response addGroupEnginePermission(@Context HttpServletRequest request) { "Must pass a valid integer value. Received value = " + permissionStr); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String endDate = WebUtility.inputSQLSanitizer(request.getParameter("endDate")); AdminSecurityGroupUtils.getInstance(user).addGroupEnginePermission(user, groupId, groupType, engineId, @@ -1096,7 +1106,8 @@ public Response editGroupEnginePermission(@Context HttpServletRequest request) { "Must pass a valid integer value. Received value = " + permissionStr); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); String endDate = WebUtility.inputSQLSanitizer(request.getParameter("endDate")); AdminSecurityGroupUtils.getInstance(user).editGroupEnginePermission(user, groupId, groupType, engineId, @@ -1146,7 +1157,8 @@ public Response removeGroupEnginePermission(@Context HttpServletRequest request) if (engineId == null || (engineId = engineId.trim()).isEmpty()) { throw new IllegalArgumentException("The project id ('projectId') cannot be null or empty"); } - String groupType = WebUtility.inputSQLSanitizer(request.getParameter("type")); + String groupType = AuthProvider + .getProviderLabel(WebUtility.inputSQLSanitizer(request.getParameter("type"))); AdminSecurityGroupUtils.getInstance(user).removeGroupEnginePermission(user, groupId, groupType, engineId); success = true; @@ -1169,7 +1181,7 @@ public Response removeGroupEnginePermission(@Context HttpServletRequest request) public Response getEnginesForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("limit") long limit, @QueryParam("offset") long offset) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -1214,7 +1226,7 @@ public Response getEnginesForGroup(@Context HttpServletRequest request, @QueryPa @Produces("application/json") public Response getNumEnginesForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -1260,7 +1272,7 @@ public Response getAvailableEnginesForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm, @QueryParam("limit") long limit, @QueryParam("offset") long offset) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; @@ -1306,7 +1318,7 @@ public Response getAvailableEnginesForGroup(@Context HttpServletRequest request, public Response getNumAvailableEnginesForGroup(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("groupType") String groupType, @QueryParam("searchTerm") String searchTerm) { - groupType = WebUtility.inputSQLSanitizer(groupType); + groupType = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(groupType)); groupId = WebUtility.inputSQLSanitizer(groupId); searchTerm = WebUtility.inputSQLSanitizer(searchTerm); AdminSecurityGroupUtils groupUtils = null; diff --git a/src/prerna/semoss/web/services/local/auth/GroupEngineAuthorizationResource.java b/src/prerna/semoss/web/services/local/auth/GroupEngineAuthorizationResource.java index 49c176c7..3f666f69 100644 --- a/src/prerna/semoss/web/services/local/auth/GroupEngineAuthorizationResource.java +++ b/src/prerna/semoss/web/services/local/auth/GroupEngineAuthorizationResource.java @@ -46,6 +46,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import prerna.auth.AccessPermissionEnum; +import prerna.auth.AuthProvider; import prerna.auth.User; import prerna.auth.utils.SecurityGroupEngineUtils; import prerna.semoss.web.services.local.ResourceUtility; @@ -74,7 +75,7 @@ public class GroupEngineAuthorizationResource { public Response getGroupAppPermission(@Context HttpServletRequest request, @QueryParam("groupId") String groupId, @QueryParam("type") String type, @QueryParam("appId") String appId) { - type = WebUtility.inputSanitizer(type); + type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(type)); appId = WebUtility.inputSanitizer(appId); groupId = WebUtility.inputSQLSanitizer(groupId); @@ -139,7 +140,7 @@ public Response addGroupEnginePermission(@Context HttpServletRequest request, Mu } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String engineId = WebUtility.inputSanitizer(form.getFirst("engineId")); String permission = WebUtility.inputSanitizer(form.getFirst("permission")); String endDate = WebUtility.inputSanitizer(form.getFirst("endDate")); @@ -203,7 +204,7 @@ public Response editGroupAppPermission(@Context HttpServletRequest request, Mult } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String appId = WebUtility.inputSanitizer(form.getFirst("appId")); String newPermission = WebUtility.inputSanitizer(form.getFirst("permission")); String endDate = WebUtility.inputSanitizer(form.getFirst("endDate")); @@ -267,7 +268,7 @@ public Response removeGroupAppPermission(@Context HttpServletRequest request, Mu } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String appId = WebUtility.inputSanitizer(form.getFirst("appId")); try { if (groupId == null || (groupId = groupId.trim()).isEmpty()) { diff --git a/src/prerna/semoss/web/services/local/auth/GroupInsightAuthorizationResource.java b/src/prerna/semoss/web/services/local/auth/GroupInsightAuthorizationResource.java index 7e31005e..5ee4d251 100644 --- a/src/prerna/semoss/web/services/local/auth/GroupInsightAuthorizationResource.java +++ b/src/prerna/semoss/web/services/local/auth/GroupInsightAuthorizationResource.java @@ -45,6 +45,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import prerna.auth.AccessPermissionEnum; +import prerna.auth.AuthProvider; import prerna.auth.User; import prerna.auth.utils.SecurityGroupInsightsUtils; import prerna.semoss.web.services.local.ResourceUtility; @@ -75,7 +76,7 @@ public Response getGroupInsightPermission(@Context HttpServletRequest request, @QueryParam("projectId") String projectId, @QueryParam("insightId") String insightId) { projectId = WebUtility.inputSQLSanitizer(projectId); - type = WebUtility.inputSQLSanitizer(type); + type = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(type)); insightId = WebUtility.inputSQLSanitizer(insightId); groupId = WebUtility.inputSQLSanitizer(groupId); @@ -145,7 +146,7 @@ public Response addGroupInsightPermission(@Context HttpServletRequest request, } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSQLSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSQLSanitizer(form.getFirst("projectId")); String insightId = WebUtility.inputSQLSanitizer(form.getFirst("insightId")); String permission = WebUtility.inputSQLSanitizer(form.getFirst("permission")); @@ -216,7 +217,7 @@ public Response editGroupInsightPermission(@Context HttpServletRequest request, } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSQLSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSQLSanitizer(form.getFirst("projectId")); String insightId = WebUtility.inputSQLSanitizer(form.getFirst("insightId")); String newPermission = WebUtility.inputSQLSanitizer(form.getFirst("permission")); @@ -286,7 +287,7 @@ public Response removeGroupInsightPermission(@Context HttpServletRequest request } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSQLSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSQLSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSQLSanitizer(form.getFirst("projectId")); String insightId = WebUtility.inputSQLSanitizer(form.getFirst("insightId")); try { diff --git a/src/prerna/semoss/web/services/local/auth/GroupProjectAuthorizationResource.java b/src/prerna/semoss/web/services/local/auth/GroupProjectAuthorizationResource.java index 85237c14..c1d26fe5 100644 --- a/src/prerna/semoss/web/services/local/auth/GroupProjectAuthorizationResource.java +++ b/src/prerna/semoss/web/services/local/auth/GroupProjectAuthorizationResource.java @@ -46,6 +46,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import prerna.auth.AccessPermissionEnum; +import prerna.auth.AuthProvider; import prerna.auth.User; import prerna.auth.utils.SecurityGroupProjectUtils; import prerna.semoss.web.services.local.ResourceUtility; @@ -76,7 +77,7 @@ public Response getGroupProjectPermission(@Context HttpServletRequest request, @QueryParam("projectId") String projectId) { projectId = WebUtility.inputSanitizer(projectId); - type = WebUtility.inputSanitizer(type); + type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(type)); groupId = WebUtility.inputSQLSanitizer(groupId); Map errorMap = new HashMap(); @@ -141,7 +142,7 @@ public Response addGroupProjectPermission(@Context HttpServletRequest request, } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSanitizer(form.getFirst("projectId")); String permission = WebUtility.inputSanitizer(form.getFirst("permission")); String endDate = WebUtility.inputSanitizer(form.getFirst("endDate")); @@ -206,7 +207,7 @@ public Response editGroupProjectPermission(@Context HttpServletRequest request, } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSanitizer(form.getFirst("projectId")); String newPermission = WebUtility.inputSanitizer(form.getFirst("permission")); String endDate = WebUtility.inputSanitizer(form.getFirst("endDate")); @@ -272,7 +273,7 @@ public Response removeGroupProjectPermission(@Context HttpServletRequest request } String groupId = WebUtility.inputSQLSanitizer(form.getFirst("groupId")); - String type = WebUtility.inputSanitizer(form.getFirst("type")); + String type = AuthProvider.getProviderLabel(WebUtility.inputSanitizer(form.getFirst("type"))); String projectId = WebUtility.inputSanitizer(form.getFirst("projectId")); try { if (groupId == null || (groupId = groupId.trim()).isEmpty()) {