Merge pull request #3501 from NationalSecurityAgency/t#3500/gb_role_filter

T#3500/gb role filter

Author: dwalizer

dashboard/src/components/badges/global/GlobalBadgePage.vue

@@ -91,7 +91,7 @@ const goLive = (editedBadge) => {
 };
 const badgeEdited = (editedBadge) => {
   const origId = badge.value.badgeId;
-  badgeState.loadGlobalBadgeDetailsState(badgeId.value).finally(() => {
+  badgeState.loadGlobalBadgeDetailsState(editedBadge.badgeId).finally(() => {
     badge.value = badgeState.badge;
     if (origId !== editedBadge.badgeId) {
       badgeId.value = editedBadge.badgeId;

service/src/main/java/skills/auth/AuthUtils.groovy

@@ -29,6 +29,7 @@ class AuthUtils {
     static final Pattern QUIZ_ID_PATTERN = Pattern.compile("^/admin/quiz-definitions/([^/]+).*\$")
     static final Pattern ADMIN_GROUP_ID_PATTERN = Pattern.compile("^/admin/admin-group-definitions/([^/]+).*\$")
     static final Pattern QUIZ_ID_PATTERN_API = Pattern.compile("^/api/quizzes/([^/]+).*\$")
+    static final Pattern GLOBAL_BADGE_ID_PATTERN = Pattern.compile("^/admin/badges/([^/]+).*\$")
 
     // Example: /admin/projects/{projectId}/approvals/approve
     // Example: /admin/projects/{projectId}/approvals/reject
@@ -64,6 +65,10 @@ class AuthUtils {
         return this.getIdFromRequest(servletRequest, ADMIN_GROUP_ID_PATTERN, "adminGroupId")
     }
 
+    static String getGlobalBadgeIdFromRequest(HttpServletRequest servletRequest) {
+        return this.getIdFromRequest(servletRequest, GLOBAL_BADGE_ID_PATTERN, "globalBadgeId")
+    }
+
     private static String getIdFromRequest(HttpServletRequest servletRequest, Pattern pattern, String label) {
         String res
         if (servletRequest) {

service/src/main/java/skills/auth/UserAuthService.groovy

@@ -263,6 +263,13 @@ class UserAuthService {
                 shouldAddRole = true
             }
         }
+        if (userRole.roleName == RoleName.ROLE_GLOBAL_BADGE_ADMIN) {
+            shouldAddRole = false
+            String globalBadgeId = AuthUtils.getGlobalBadgeIdFromRequest(servletRequest)
+            if (globalBadgeId && userRole.globalBadgeId && globalBadgeId.equalsIgnoreCase(userRole.globalBadgeId)) {
+                shouldAddRole = true
+            }
+        }
         return shouldAddRole
     }
 

service/src/test/java/skills/intTests/badges/GlobalBadgeAccessSpecs.groovy

@@ -210,6 +210,8 @@ class GlobalBadgeAccessSpecs extends DefaultIntSpec {
         def user2Service = createService("user2")
 
         when:
+        def badge2 = createBadge(2, 2)
+        user2Service.createGlobalBadge(badge2)
         user2Service.updateGlobalBadge(badge1)
 
         then: