Skip to content

fix(auth): normalize group provider types through AuthProvider #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themaherkhalil merged 1 commit into from
Oct 1, 2026
Merged

fix(auth): normalize group provider types through AuthProvider #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions src/prerna/semoss/web/services/local/auth/AdminGroupAuthorizationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 = "";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions src/prerna/semoss/web/services/local/auth/GroupEngineAuthorizationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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()) {
Expand Down
9 changes: 5 additions & 4 deletions src/prerna/semoss/web/services/local/auth/GroupInsightAuthorizationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions src/prerna/semoss/web/services/local/auth/GroupProjectAuthorizationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, String> errorMap = new HashMap<String, String>();
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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()) {
Expand Down
Loading