Don't support policy placholder and expansion

Author: kumargu

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

@@ -136,64 +136,52 @@ private void initPolicyFile(final PolicyInfo newInfo, final URL url) {
     }
 
     private boolean initPolicyFile(final String propname, final String urlname, final PolicyInfo newInfo) {
-        boolean loaded_policy = false;
+        boolean loadedPolicy = false;
 
         if (allowSystemProperties) {
-            String extra_policy = System.getProperty(propname);
-            if (extra_policy != null) {
-                boolean overrideAll = false;
-                if (extra_policy.startsWith("=")) {
-                    overrideAll = true;
-                    extra_policy = extra_policy.substring(1);
+            String extraPolicy = System.getProperty(propname);
+            if (extraPolicy != null) {
+                boolean overrideAll = extraPolicy.startsWith("=");
+                if (overrideAll) {
+                    extraPolicy = extraPolicy.substring(1);
                 }
+
                 try {
-                    extra_policy = PropertyExpander.expand(extra_policy);
-                    URL policyURL;
-
-                    File policyFile = new File(extra_policy);
-                    if (policyFile.exists()) {
-                        policyURL = ParseUtil.fileToEncodedURL(new File(policyFile.getCanonicalPath()));
-                    } else {
-                        policyURL = newURL(extra_policy);
-                    }
+                    File policyFile = new File(extraPolicy);
+                    URL policyURL = policyFile.exists() ? policyFile.getCanonicalFile().toURI().toURL() : new URL(extraPolicy);
+
                     if (init(policyURL, newInfo)) {
-                        loaded_policy = true;
+                        loadedPolicy = true;
                     }
-                } catch (Exception e) {}
+                } catch (Exception e) {
+                    // ignore invalid policy path
+                }
+
                 if (overrideAll) {
-                    return Boolean.valueOf(loaded_policy);
+                    return loadedPolicy;
                 }
             }
         }
 
-        int n = 1;
-        String policy_uri;
-
-        while ((policy_uri = Security.getProperty(urlname + n)) != null) {
+        int index = 1;
+        String policyUri;
+        while ((policyUri = Security.getProperty(urlname + index)) != null) {
             try {
-                URL policy_url = null;
-                String expanded_uri = PropertyExpander.expand(policy_uri).replace(File.separatorChar, '/');
-
-                if (policy_uri.startsWith("file:${java.home}/") || policy_uri.startsWith("file:${user.home}/")) {
-
-                    // this special case accommodates
-                    // the situation java.home/user.home
-                    // expand to a single slash, resulting in
-                    // a file://foo URI
-                    policy_url = new File(expanded_uri.substring(5)).toURI().toURL();
-                } else {
-                    policy_url = new URI(expanded_uri).toURL();
-                }
+                URL policyUrl = policyUri.startsWith("file:")
+                    ? new File(policyUri.substring(5)).toURI().toURL()
+                    : new URI(policyUri).toURL();
 
-                if (init(policy_url, newInfo)) {
-                    loaded_policy = true;
+                if (init(policyUrl, newInfo)) {
+                    loadedPolicy = true;
                 }
             } catch (Exception e) {
-                // ignore that policy
+                // ignore bad entry
             }
-            n++;
+
+            index++;
         }
-        return Boolean.valueOf(loaded_policy);
+
+        return loadedPolicy;
     }
 
     /**

libs/agent-sm/agent-policy/src/test/java/org/opensearch/secure_sm/policy/PolicyParserTests.java renamed to libs/secure-sm/src/test/java/org/opensearch/secure_sm/PolicyParserTests.java

@@ -5,9 +5,9 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
+package org.opensearch.secure_sm;
 
-package org.opensearch.secure_sm.policy;
-
+import org.opensearch.secure_sm.policy.PolicyParser;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;