diff options
author | liamfallon <liam.fallon@est.tech> | 2019-09-14 12:39:25 +0100 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-09-18 12:00:30 +0000 |
commit | 304b402d9a1cc20b9d746f16900340e0193cb7d6 (patch) | |
tree | 1165fb1441f7882fda0a01ca8c485eb57d651909 /testsuites/integration/integration-executor-test/src/test | |
parent | 949f47c7c2180bbf101df5234325f469db82848d (diff) |
Disable Jython Excutor for security
The Jython interpreter pulls in many dependencies that are flagged as
having security problems. We will disable Python support in apex-pdp
until Frankfurt, users can compile from source if they wish to re-enable
python support.
Issue-ID: POLICY-1509
Change-Id: I84215ba8d1009cb7af99cd98ba19008fdff5c378
Signed-off-by: liamfallon <liam.fallon@est.tech>
(cherry picked from commit 88f175903e93e138687b5fbfe5140831df5440c2)
Diffstat (limited to 'testsuites/integration/integration-executor-test/src/test')
-rw-r--r-- | testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java index 12a28e293..088d04fd7 100644 --- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java +++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexEngineJython.java @@ -5,15 +5,15 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -32,11 +32,14 @@ import org.onap.policy.apex.context.parameters.SchemaParameters; import org.onap.policy.apex.core.engine.EngineParameters; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; -import org.onap.policy.apex.plugins.executor.jython.JythonExecutorParameters; +import org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters; import org.onap.policy.common.parameters.ParameterService; /** - * The Class TestApexEngineJython. + * The Class TestApexEngineJython should be the test class for the Jython interpreter. + * + * <p>It actually reruns the javascript tests as a placeholder until the Jython security issues are resolved. + * */ public class TestApexEngineJython { private SchemaParameters schemaParameters; @@ -49,12 +52,12 @@ public class TestApexEngineJython { @Before public void beforeTest() { schemaParameters = new SchemaParameters(); - + schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME); schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters()); ParameterService.register(schemaParameters); - + contextParameters = new ContextParameters(); contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME); @@ -66,9 +69,9 @@ public class TestApexEngineJython { ParameterService.register(contextParameters.getDistributorParameters()); ParameterService.register(contextParameters.getLockManagerParameters()); ParameterService.register(contextParameters.getPersistorParameters()); - + engineParameters = new EngineParameters(); - engineParameters.getExecutorParameterMap().put("JYTHON", new JythonExecutorParameters()); + engineParameters.getExecutorParameterMap().put("JAVASCRIPT", new JavascriptExecutorParameters()); ParameterService.register(engineParameters); } @@ -78,7 +81,7 @@ public class TestApexEngineJython { @After public void afterTest() { ParameterService.deregister(engineParameters); - + ParameterService.deregister(contextParameters.getDistributorParameters()); ParameterService.deregister(contextParameters.getLockManagerParameters()); ParameterService.deregister(contextParameters.getPersistorParameters()); @@ -96,8 +99,8 @@ public class TestApexEngineJython { */ @Test public void testApexEngineJython() throws ApexException, InterruptedException, IOException { - new TestApexEngine("JYTHON", engineParameters); + new TestApexEngine("JAVASCRIPT", engineParameters); ThreadUtilities.sleep(5000); - new TestApexEngine("JYTHON", engineParameters); + new TestApexEngine("JAVASCRIPT", engineParameters); } } |