Our own parser

Author: kumargu

libs/agent-sm/agent-policy/src/main/java/org/opensearch/secure_sm/policy/PolicyFile.java

@@ -198,12 +198,12 @@ private boolean init(URL policy, PolicyInfo newInfo) {
 
         try (InputStreamReader isr = getInputStreamReader(getInputStream(policy))) {
 
-            PolicyParser pp = new PolicyParser(expandProperties);
+            PolicyParser pp = new PolicyParser();
             pp.read(isr);
 
-            Enumeration<PolicyParser.GrantEntry> enum_ = pp.grantElements();
+            Enumeration<PolicyParser.GrantNode> enum_ = pp.grantElements();
             while (enum_.hasMoreElements()) {
-                PolicyParser.GrantEntry ge = enum_.nextElement();
+                PolicyParser.GrantNode ge = enum_.nextElement();
                 addGrantEntry(ge, newInfo);
             }
             return true;
@@ -249,7 +249,7 @@ private void initStaticPolicy(final PolicyInfo newInfo) {
      *
      * @return null if signedBy alias is not recognized
      */
-    private CodeSource getCodeSource(PolicyParser.GrantEntry ge, PolicyInfo newInfo) throws java.net.MalformedURLException {
+    private CodeSource getCodeSource(PolicyParser.GrantNode ge, PolicyInfo newInfo) throws java.net.MalformedURLException {
         Certificate[] certs = null;
         URL location;
 
@@ -262,17 +262,17 @@ private CodeSource getCodeSource(PolicyParser.GrantEntry ge, PolicyInfo newInfo)
     /**
      * Add one policy entry to the list.
      */
-    private void addGrantEntry(PolicyParser.GrantEntry ge, PolicyInfo newInfo) {
+    private void addGrantEntry(PolicyParser.GrantNode ge, PolicyInfo newInfo) {
 
         try {
             CodeSource codesource = getCodeSource(ge, newInfo);
             // skip if signedBy alias was unknown...
             if (codesource == null) return;
 
             PolicyEntry entry = new PolicyEntry(codesource);
-            Enumeration<PolicyParser.PermissionEntry> enum_ = ge.permissionElements();
+            Enumeration<PolicyParser.PermissionNode> enum_ = ge.permissionElements();
             while (enum_.hasMoreElements()) {
-                PolicyParser.PermissionEntry pe = enum_.nextElement();
+                PolicyParser.PermissionNode pe = enum_.nextElement();
 
                 try {
                     // perform ${{ ... }} expansions within permission name
@@ -617,7 +617,7 @@ private static String canonPath(String path) throws IOException {
         }
     }
 
-    private void expandPermissionName(PolicyParser.PermissionEntry pe) throws Exception {
+    private void expandPermissionName(PolicyParser.PermissionNode pe) throws Exception {
         // short cut the common case
         if (pe.name == null || pe.name.indexOf("${{", 0) == -1) {
             return;