Merge remote-tracking branch 'origin/master' into feature/boot

# Conflicts: # gui/admin-gui/src/main/webapp/WEB-INF/web.xml # repo/security-impl/pom.xml
Evolveum · Oct 23, 2017 · 84295cc · 84295cc
2 parents 3cf02ac + 20224d8
commit 84295cc
Show file tree

Hide file tree

Showing 535 changed files with 14,350 additions and 6,047 deletions.
diff --git a/config/sql/_all/h2-3.7-all.sql b/config/sql/_all/h2-3.7-all.sql
@@ -399,6 +399,14 @@ CREATE TABLE m_form (
   PRIMARY KEY (oid)
 );
 
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+
 CREATE TABLE m_generic_object (
   name_norm  VARCHAR(255),
   name_orig  VARCHAR(255),
@@ -861,6 +869,9 @@ CREATE INDEX iAuditRefValRecordId
 ALTER TABLE m_case
   ADD CONSTRAINT uc_case_name UNIQUE (name_norm);
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
 ALTER TABLE m_connector_host
 ADD CONSTRAINT uc_connector_host_name UNIQUE (name_norm);
 
@@ -1110,6 +1121,11 @@ ALTER TABLE m_case
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
+
 ALTER TABLE m_connector
 ADD CONSTRAINT fk_connector
 FOREIGN KEY (oid)

diff --git a/config/sql/_all/mysql-3.7-all.sql b/config/sql/_all/mysql-3.7-all.sql
@@ -498,6 +498,16 @@ CREATE TABLE m_form (
   COLLATE utf8_bin
   ENGINE = InnoDB;
 
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
 CREATE TABLE m_generic_object (
   name_norm  VARCHAR(255),
   name_orig  VARCHAR(255),
@@ -1078,6 +1088,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
 ALTER TABLE m_form
   ADD CONSTRAINT uc_form_name UNIQUE (name_norm);
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm);
 
@@ -1359,6 +1372,11 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object (oid);
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object (oid);
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT fk_generic_object
 FOREIGN KEY (oid)

diff --git a/config/sql/_all/oracle-3.7-all.sql b/config/sql/_all/oracle-3.7-all.sql
@@ -398,6 +398,13 @@ CREATE TABLE m_form (
   PRIMARY KEY (oid)
 ) INITRANS 30;
 
+CREATE TABLE m_function_library (
+  name_norm VARCHAR2(255 CHAR),
+  name_orig VARCHAR2(255 CHAR),
+  oid       VARCHAR2(36 CHAR) NOT NULL,
+  PRIMARY KEY (oid)
+) INITRANS 30;
+
 CREATE TABLE m_generic_object (
   name_norm  VARCHAR2(255 CHAR),
   name_orig  VARCHAR2(255 CHAR),
@@ -877,6 +884,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus) INITRANS 30;
 ALTER TABLE m_form
   ADD CONSTRAINT uc_form_name UNIQUE (name_norm) INITRANS 30;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm) INITRANS 30;
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm) INITRANS 30;
 
@@ -1156,6 +1166,11 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT fk_generic_object
 FOREIGN KEY (oid)

diff --git a/config/sql/_all/postgresql-3.7-all.sql b/config/sql/_all/postgresql-3.7-all.sql
@@ -395,6 +395,13 @@ CREATE TABLE m_form (
   PRIMARY KEY (oid)
 );
 
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
 CREATE TABLE m_generic_object (
   name_norm  VARCHAR(255),
   name_orig  VARCHAR(255),
@@ -867,6 +874,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
 ALTER TABLE m_form
   ADD CONSTRAINT uc_form_name UNIQUE (name_norm);
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm);
 
@@ -1146,6 +1156,11 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT fk_generic_object
 FOREIGN KEY (oid)

diff --git a/config/sql/_all/sqlserver-3.7-all.sql b/config/sql/_all/sqlserver-3.7-all.sql
@@ -395,6 +395,13 @@ CREATE TABLE m_form (
   PRIMARY KEY (oid)
 );
 
+CREATE TABLE m_function_library (
+  name_norm NVARCHAR(255) COLLATE database_default,
+  name_orig NVARCHAR(255) COLLATE database_default,
+  oid       NVARCHAR(36) COLLATE database_default NOT NULL,
+  PRIMARY KEY (oid)
+);
+
 CREATE TABLE m_generic_object (
   name_norm  NVARCHAR(255) COLLATE database_default,
   name_orig  NVARCHAR(255) COLLATE database_default,
@@ -867,6 +874,9 @@ CREATE INDEX iFocusEffective ON m_focus (effectiveStatus);
 ALTER TABLE m_form
   ADD CONSTRAINT uc_form_name UNIQUE (name_norm);
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT uc_generic_object_name UNIQUE (name_norm);
 
@@ -1146,6 +1156,11 @@ ALTER TABLE m_form
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
+
 ALTER TABLE m_generic_object
 ADD CONSTRAINT fk_generic_object
 FOREIGN KEY (oid)

diff --git a/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql b/config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
@@ -66,6 +66,14 @@ CREATE TABLE m_case (
   PRIMARY KEY (oid)
 );
 
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+
 ALTER TABLE m_case
   ADD CONSTRAINT uc_case_name UNIQUE (name_norm);
 
@@ -74,6 +82,14 @@ ALTER TABLE m_case
 FOREIGN KEY (oid)
 REFERENCES m_object;
 
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
+
 ALTER TABLE m_assignment_reference ALTER COLUMN containerType RENAME TO targetType;
 ALTER TABLE m_reference ALTER COLUMN containerType RENAME TO targetType;
 

diff --git a/config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql
@@ -0,0 +1,14 @@
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
diff --git a/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql
@@ -0,0 +1,17 @@
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+)
+  DEFAULT CHARACTER SET utf8
+  COLLATE utf8_bin
+  ENGINE = InnoDB;
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object (oid);
diff --git a/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql
@@ -0,0 +1,14 @@
+CREATE TABLE m_function_library (
+  name_norm VARCHAR2(255 CHAR),
+  name_orig VARCHAR2(255 CHAR),
+  oid       VARCHAR2(36 CHAR) NOT NULL,
+  PRIMARY KEY (oid)
+) INITRANS 30;
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm) INITRANS 30;
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
diff --git a/config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql
@@ -0,0 +1,14 @@
+CREATE TABLE m_function_library (
+  name_norm VARCHAR(255),
+  name_orig VARCHAR(255),
+  oid       VARCHAR(36) NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
diff --git a/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/sqlserver/sqlserver-upgrade-3.6-3.7.sql
@@ -0,0 +1,14 @@
+CREATE TABLE m_function_library (
+  name_norm NVARCHAR(255) COLLATE database_default,
+  name_orig NVARCHAR(255) COLLATE database_default,
+  oid       NVARCHAR(36) COLLATE database_default NOT NULL,
+  PRIMARY KEY (oid)
+);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT uc_function_library_name UNIQUE (name_norm);
+
+ALTER TABLE m_function_library
+  ADD CONSTRAINT fk_function_library
+FOREIGN KEY (oid)
+REFERENCES m_object;
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -339,6 +339,11 @@
             <artifactId>security-api</artifactId>
             <version>3.7-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>security-enforcer-api</artifactId>
+            <version>3.7-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>workflow-api</artifactId>
@@ -423,6 +428,12 @@
             <version>3.7-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>security-enforcer-impl</artifactId>
+            <version>3.7-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>model-impl</artifactId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -206,8 +206,7 @@ public boolean isVisible(){
 
                     boolean isVisible = false;
                     try {
-                        isVisible = ((PageBase) getPage()).getSecurityEnforcer().isAuthorized(ModelAuthorizationAction.IMPORT_OBJECTS.getUrl(),
-                                null, null, null, null, null)
+                        isVisible = ((PageBase) getPage()).isAuthorized(ModelAuthorizationAction.IMPORT_OBJECTS.getUrl())
                                 && WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_CONFIGURATION_ALL_URL,
                                 AuthorizationConstants.AUTZ_UI_CONFIGURATION_IMPORT_URL);
                     } catch (Exception ex){

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
@@ -201,7 +201,7 @@ private Class qnameToCompileTimeClass(QName typeName) {
 
 	private Collection<SelectorOptions<GetOperationOptions>> getOptions() {
 		if (ObjectTypes.SHADOW.getTypeQName().equals(typeModel.getObject())) {
-			return SelectorOptions.createCollection(ItemPath.EMPTY_PATH, GetOperationOptions.createRaw());
+			return SelectorOptions.createCollection(ItemPath.EMPTY_PATH, GetOperationOptions.createNoFetch());
 		}
 		return null;
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -25,6 +25,7 @@
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -247,12 +248,13 @@ protected void onUpdateCheckbox(AjaxRequestTarget target) {
             protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
                 if (type.equals(RoleType.COMPLEX_TYPE)) {
                     LOGGER.debug("Loading roles which the current user has right to assign");
-                    OperationResult result = new OperationResult(OPERATION_LOAD_ASSIGNABLE_ROLES);
+                    Task task = getPageBase().createSimpleTask(OPERATION_LOAD_ASSIGNABLE_ROLES);
+                    OperationResult result = task.getResult();
                     ObjectFilter filter = null;
                     try {
                         ModelInteractionService mis = parentPage.getModelInteractionService();
                         RoleSelectionSpecification roleSpec =
-                                mis.getAssignableRoleSpecification(SecurityUtils.getPrincipalUser().getUser().asPrismObject(), result);
+                                mis.getAssignableRoleSpecification(SecurityUtils.getPrincipalUser().getUser().asPrismObject(), task, result);
                         filter = roleSpec.getFilter();
                     } catch (Exception ex) {
                         LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load available roles", ex);