chore: revert back to nucleus trie

aws-greengrass · Feb 2, 2024 · 283fc94 · 283fc94
1 parent 270080f
commit 283fc94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 352 deletions.
diff --git a/src/main/java/com/aws/greengrass/clientdevices/auth/PermissionEvaluationUtils.java b/src/main/java/com/aws/greengrass/clientdevices/auth/PermissionEvaluationUtils.java
@@ -5,11 +5,11 @@
 
 package com.aws.greengrass.clientdevices.auth;
 
+import com.aws.greengrass.authorization.WildcardTrie;
 import com.aws.greengrass.clientdevices.auth.configuration.GroupManager;
 import com.aws.greengrass.clientdevices.auth.configuration.Permission;
 import com.aws.greengrass.clientdevices.auth.exception.PolicyException;
 import com.aws.greengrass.clientdevices.auth.session.Session;
-import com.aws.greengrass.clientdevices.auth.util.WildcardTrie;
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
 import com.aws.greengrass.util.Utils;
@@ -37,7 +37,6 @@ public final class PermissionEvaluationUtils {
     private static final Pattern SERVICE_RESOURCE_PATTERN = Pattern.compile(
             String.format(SERVICE_RESOURCE_FORMAT, SERVICE_PATTERN_STRING, SERVICE_RESOURCE_TYPE_PATTERN_STRING,
                     SERVICE_RESOURCE_NAME_PATTERN_STRING), Pattern.UNICODE_CHARACTER_CLASS);
-    private final WildcardTrie wildcardTrie = new WildcardTrie();
     private final GroupManager groupManager;
 
     /**
@@ -132,7 +131,8 @@ private boolean compareResource(Resource requestResource, String policyResource)
             return true;
         }
 
-        wildcardTrie.set(policyResource);
+        WildcardTrie wildcardTrie = new WildcardTrie();
+        wildcardTrie.add(policyResource);
         return wildcardTrie.matchesStandard(requestResource.getResourceStr());
     }
 

diff --git a/src/main/java/com/aws/greengrass/clientdevices/auth/util/WildcardTrie.java b/src/main/java/com/aws/greengrass/clientdevices/auth/util/WildcardTrie.java