Merge branch 'master' of https://github.com/Evolveum/midpoint

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html

@@ -21,19 +21,16 @@
                 </div>
 
                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                    <div class="box box-solid">
-                        <div class="box-body">
-                            <div class="row">
-                                <div class="col-lg-3 col-md-2 col-sm-2 col-xs-2">
-                                    <div wicket:id="navigation"></div>
-                                </div>
-                                <div class="col-lg-9 col-md-10 col-sm-10 col-xs-10">
-                                    <div wicket:id="mainPanel"></div>
-                                </div>
-                            </div>
+                    <div class="details-panel">
+                        <div class="details-panel-navigation">
+                            <div wicket:id="navigation"></div>
+                        </div>
+                        <div class="details-panel-details-form">
+                            <div wicket:id="mainPanel"></div>
                         </div>
                     </div>
                 </div>
+
             </form>
 
         </div>

gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

@@ -2015,7 +2015,6 @@ th.composited-icon {
     z-index: 1;
     //top: 0;
     right: 0;
-    background-color: @sidebar-light-bg;
     overflow-x: hidden;
     padding-top: 16px;
 
@@ -2254,3 +2253,24 @@ fieldset.objectButtons {
   margin-left: 5px;
   font-weight: 400;
 }
+
+.details-panel {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  background-color: white;
+}
+
+.details-panel-navigation {
+  order: 1;
+  flex-grow: 1;
+  background-color: @sidebar-light-bg;
+
+}
+
+.details-panel-details-form {
+  order: 2;
+  flex-grow: 11;
+  padding-top: 5px;
+  padding-left: 20px;
+}

model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptEvaluator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2019 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -8,23 +8,18 @@
 
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.repo.common.expression.ExpressionSyntaxException;
-import com.evolveum.midpoint.util.exception.CommunicationException;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
-import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
-
-import org.jetbrains.annotations.NotNull;
+import com.evolveum.midpoint.util.exception.*;
 
 /**
  * @author Radovan Semancik
  */
 public interface ScriptEvaluator {
 
-    @NotNull
-    <T, V extends PrismValue> List<V> evaluate(ScriptExpressionEvaluationContext context)
+    @NotNull <T, V extends PrismValue> List<V> evaluate(ScriptExpressionEvaluationContext context)
             throws ExpressionEvaluationException, ObjectNotFoundException, ExpressionSyntaxException, CommunicationException,
             ConfigurationException, SecurityViolationException;
 
@@ -37,4 +32,12 @@ <T, V extends PrismValue> List<V> evaluate(ScriptExpressionEvaluationContext con
      * Returns URL of the language that this evaluator can handle
      */
     String getLanguageUrl();
+
+    /**
+     * Can indicate that script evaluator is not initialized, e.g. optional script evaluators
+     * (Python) or depending on the JDK platform (JavaScript/ECMAScript).
+     */
+    default boolean isInitialized() {
+        return true;
+    }
 }

model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java

@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2010-2019 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.model.common.expression.script;
 
 import java.util.Collection;
-
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.common.LocalizationService;
-import com.evolveum.midpoint.prism.PrismContext;
-
-import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
-
 import com.google.common.annotations.VisibleForTesting;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.prism.ItemDefinition;
+import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.repo.common.expression.AbstractAutowiredExpressionEvaluatorFactory;
 import com.evolveum.midpoint.repo.common.expression.ExpressionEvaluator;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
 import com.evolveum.midpoint.schema.expression.ExpressionProfile;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.SecurityContextManager;
@@ -66,7 +63,7 @@ public QName getElementName() {
     }
 
     @Override
-    public <V extends PrismValue,D extends ItemDefinition> ExpressionEvaluator<V> createEvaluator(Collection<JAXBElement<?>> evaluatorElements,
+    public <V extends PrismValue, D extends ItemDefinition> ExpressionEvaluator<V> createEvaluator(Collection<JAXBElement<?>> evaluatorElements,
             D outputDefinition, ExpressionProfile expressionProfile, ExpressionFactory expressionFactory, String contextDescription, Task task, OperationResult result) throws SchemaException, SecurityViolationException {
 
         // TODO is output definition required to be non-null here, or it can be null?
@@ -79,4 +76,8 @@ public <V extends PrismValue,D extends ItemDefinition> ExpressionEvaluator<V> cr
         return new ScriptExpressionEvaluator<>(ELEMENT_NAME, evaluatorBean, outputDefinition, protector, prismContext,
                 scriptExpression, securityContextManager, localizationService);
     }
+
+    public ScriptExpressionFactory getScriptExpressionFactory() {
+        return scriptExpressionFactory;
+    }
 }

model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java

@@ -87,4 +87,8 @@ public String getLanguageUrl() {
         return MidPointConstants.EXPRESSION_LANGUAGE_URL_BASE + getLanguageName();
     }
 
+    @Override
+    public boolean isInitialized() {
+        return scriptEngine != null;
+    }
 }

model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020 Evolveum and contributors
+ * Copyright (C) 2013-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -108,7 +108,9 @@ public static ExpressionFactory createInitializedExpressionFactory(
 
         Jsr223ScriptEvaluator jsEvaluator = new Jsr223ScriptEvaluator(
                 "ECMAScript", prismContext, protector, LocalizationTestUtil.getLocalizationService());
-        scriptExpressionFactory.registerEvaluator(jsEvaluator.getLanguageUrl(), jsEvaluator);
+        if (jsEvaluator.isInitialized()) {
+            scriptExpressionFactory.registerEvaluator(jsEvaluator.getLanguageUrl(), jsEvaluator);
+        }
 
         ScriptExpressionEvaluatorFactory scriptExpressionEvaluatorFactory =
                 new ScriptExpressionEvaluatorFactory(

model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019 Evolveum and contributors
+ * Copyright (C) 2013-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -15,21 +15,27 @@
 import javax.xml.namespace.QName;
 
 import org.testng.AssertJUnit;
+import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
 import com.evolveum.midpoint.common.Clock;
 import com.evolveum.midpoint.model.common.AbstractModelCommonTest;
 import com.evolveum.midpoint.model.common.ConstantsManager;
+import com.evolveum.midpoint.model.common.expression.script.ScriptExpressionEvaluatorFactory;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
 import com.evolveum.midpoint.repo.common.DirectoryFileObjectResolver;
 import com.evolveum.midpoint.repo.common.ObjectResolver;
-import com.evolveum.midpoint.repo.common.expression.*;
+import com.evolveum.midpoint.repo.common.expression.Expression;
+import com.evolveum.midpoint.repo.common.expression.ExpressionEvaluationContext;
+import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
+import com.evolveum.midpoint.repo.common.expression.Source;
 import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
 import com.evolveum.midpoint.schema.constants.ExpressionConstants;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
 import com.evolveum.midpoint.schema.expression.ExpressionProfile;
@@ -104,7 +110,8 @@ public void setup() throws SchemaException, SAXException, IOException {
         Protector protector = ExpressionTestUtil.createInitializedProtector(prismContext);
         Clock clock = new Clock();
         constantsManager = new ConstantsManager();
-        expressionFactory = ExpressionTestUtil.createInitializedExpressionFactory(resolver, protector, prismContext, clock, null, null);
+        expressionFactory = ExpressionTestUtil.createInitializedExpressionFactory(
+                resolver, protector, prismContext, clock, null, null);
 
         expressionProfile = compileExpressionProfile(getExpressionProfileName());
         System.out.println("Using expression profile: " + expressionProfile);
@@ -152,8 +159,8 @@ public void test110Path() throws Exception {
         ExpressionEvaluationContext expressionContext = new ExpressionEvaluationContext(sources, variables, getTestNameShort(), null);
 
         // WHEN
-        PrismValueDeltaSetTriple<PrismPropertyValue<String>> outputTriple = evaluatePropertyExpression(expressionType, PrimitiveType.STRING, expressionContext,
-                result);
+        PrismValueDeltaSetTriple<PrismPropertyValue<String>> outputTriple =
+                evaluatePropertyExpression(expressionType, PrimitiveType.STRING, expressionContext, result);
 
         // THEN
         assertOutputTriple(outputTriple)
@@ -297,7 +304,8 @@ public void test154ScriptGroovySystemDeny() throws Exception {
 
     @Test
     public void test160ScriptJavaScript() throws Exception {
-        // GIVEN
+        skipIfEcmaScriptEngineNotSupported();
+        given();
         OperationResult result = createOperationResult();
 
         rememberScriptExecutionCount();
@@ -307,11 +315,11 @@ public void test160ScriptJavaScript() throws Exception {
         VariablesMap variables = prepareBasicVariables();
         ExpressionEvaluationContext expressionContext = new ExpressionEvaluationContext(sources, variables, getTestNameShort(), null);
 
-        // WHEN
+        when();
         PrismValueDeltaSetTriple<PrismPropertyValue<String>> outputTriple =
                 evaluatePropertyExpression(expressionType, PrimitiveType.STRING, expressionContext, result);
 
-        // THEN
+        then();
         assertOutputTriple(outputTriple)
                 .assertEmptyMinus()
                 .assertEmptyPlus()
@@ -368,7 +376,8 @@ protected ExpressionType parseExpression(File file) throws SchemaException, IOEx
     }
 
     protected Source<PrismPropertyValue<String>, PrismPropertyDefinition<String>> prepareStringSource() throws SchemaException {
-        PrismPropertyDefinition<String> propDef = prismContext.definitionFactory().createPropertyDefinition(ExpressionConstants.VAR_INPUT_QNAME, PrimitiveType.STRING.getQname());
+        PrismPropertyDefinition<String> propDef = prismContext.definitionFactory()
+                .createPropertyDefinition(ExpressionConstants.VAR_INPUT_QNAME, PrimitiveType.STRING.getQname());
         PrismProperty<String> inputProp = prismContext.itemFactory().createProperty(ExpressionConstants.VAR_INPUT_QNAME, propDef);
         PrismPropertyValue<String> pval = prismContext.itemFactory().createPropertyValue(INPUT_VALUE);
         inputProp.add(pval);
@@ -393,25 +402,29 @@ protected VariablesMap prepareBasicVariables() throws SchemaException, IOExcepti
     protected <V extends PrismValue, D extends ItemDefinition> PrismValueDeltaSetTriple<V> evaluateExpression(
             ExpressionType expressionType, D outputDefinition, ExpressionEvaluationContext expressionContext,
             OperationResult result)
-            throws SchemaException, ObjectNotFoundException, SecurityViolationException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
+            throws SchemaException, ObjectNotFoundException, SecurityViolationException,
+            ExpressionEvaluationException, CommunicationException, ConfigurationException {
         Expression<V, D> expression = expressionFactory.makeExpression(expressionType, outputDefinition, getExpressionProfile(),
                 expressionContext.getContextDescription(), expressionContext.getTask(), result);
         logger.debug("Starting evaluation of expression: {}", expression);
         return expression.evaluate(expressionContext, result);
     }
 
     protected <T> PrismValueDeltaSetTriple<PrismPropertyValue<T>> evaluatePropertyExpression(
-            ExpressionType expressionType, QName outputType, ExpressionEvaluationContext expressionContext, OperationResult result)
-            throws SchemaException, ObjectNotFoundException, SecurityViolationException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
+            ExpressionType expressionType, QName outputType,
+            ExpressionEvaluationContext expressionContext, OperationResult result)
+            throws SchemaException, ObjectNotFoundException, SecurityViolationException,
+            ExpressionEvaluationException, CommunicationException, ConfigurationException {
         PrismPropertyDefinition<T> outputDefinition = prismContext.definitionFactory().createPropertyDefinition(
                 ExpressionConstants.OUTPUT_ELEMENT_NAME, outputType);
         return evaluateExpression(expressionType, outputDefinition, expressionContext, result);
     }
 
     protected <T> PrismValueDeltaSetTriple<PrismPropertyValue<T>> evaluatePropertyExpression(
-            ExpressionType expressionType, PrimitiveType outputType, ExpressionEvaluationContext expressionContext,
-            OperationResult result)
-            throws SchemaException, ObjectNotFoundException, SecurityViolationException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
+            ExpressionType expressionType, PrimitiveType outputType,
+            ExpressionEvaluationContext expressionContext, OperationResult result)
+            throws SchemaException, ObjectNotFoundException, SecurityViolationException,
+            ExpressionEvaluationException, CommunicationException, ConfigurationException {
         return evaluatePropertyExpression(expressionType, outputType.getQname(), expressionContext, result);
     }
 
@@ -512,4 +525,17 @@ protected <V extends PrismValue> PrismValueDeltaSetTripleAsserter<V, Void> asser
         asserter.display();
         return asserter;
     }
+
+    /**
+     * Newer JDK is not shipped with JavaScript/ECMAScript engine, we want to skip related tests.
+     */
+    protected void skipIfEcmaScriptEngineNotSupported() {
+        ScriptExpressionEvaluatorFactory evaluatorFactory = (ScriptExpressionEvaluatorFactory)
+                expressionFactory.getEvaluatorFactory(SchemaConstantsGenerated.C_SCRIPT);
+        if (!evaluatorFactory.getScriptExpressionFactory().getEvaluators()
+                .containsKey("http://midpoint.evolveum.com/xml/ns/public/expression/language#ECMAScript")) {
+            display("Script engine for ECMAScript missing, skipping the tests.");
+            throw new SkipException("Script engine not available");
+        }
+    }
 }