Skip to content

Commit

Permalink
Merge branch 'master' into feature/password-hash-lifecycle
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Mar 16, 2017
2 parents d3e14ab + 036fb77 commit 2c4629a
Show file tree
Hide file tree
Showing 19 changed files with 676 additions and 312 deletions.
44 changes: 22 additions & 22 deletions config/rest/index.html
View file
Expand Up @@ -18778,9 +18778,9 @@ <h3>Usage and SDK Samples</h3>
m_basic.setPassword("YOUR PASSWORD");

DefaultApi apiInstance = new DefaultApi();
String type = type_example; // String | type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String id = id_example; // String | oid of the object for which the value will be generated
Object body = ; // Object | path to the property which will be generated
String type = type_example; // String | type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String id = id_example; // String | oid of the object for which the value will be validated
Object body = ; // Object | It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.
try {
Object result = apiInstance.validateValue(type, id, body);
System.out.println(result);
Expand All @@ -18803,9 +18803,9 @@ <h3>Usage and SDK Samples</h3>

public static void main(String[] args) {
DefaultApi apiInstance = new DefaultApi();
String type = type_example; // String | type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String id = id_example; // String | oid of the object for which the value will be generated
Object body = ; // Object | path to the property which will be generated
String type = type_example; // String | type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String id = id_example; // String | oid of the object for which the value will be validated
Object body = ; // Object | It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.
try {
Object result = apiInstance.validateValue(type, id, body);
System.out.println(result);
Expand Down Expand Up @@ -18833,9 +18833,9 @@ <h3>Usage and SDK Samples</h3>
[apiConfig setPassword:@"YOUR_PASSWORD"];


String *type = type_example; // type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String *id = id_example; // oid of the object for which the value will be generated
Object *body = ; // path to the property which will be generated
String *type = type_example; // type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
String *id = id_example; // oid of the object for which the value will be validated
Object *body = ; // It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.

DefaultApi *apiInstance = [[DefaultApi alloc] init];

Expand Down Expand Up @@ -18866,11 +18866,11 @@ <h3>Usage and SDK Samples</h3>

var api = new .DefaultApi()

var type = type_example; // {String} type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
var type = type_example; // {String} type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services

var id = id_example; // {String} oid of the object for which the value will be generated
var id = id_example; // {String} oid of the object for which the value will be validated

var body = ; // {Object} path to the property which will be generated
var body = ; // {Object} It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.


var callback = function(error, data, response) {
Expand Down Expand Up @@ -18909,9 +18909,9 @@ <h3>Usage and SDK Samples</h3>
Configuration.Default.Password = "YOUR_PASSWORD";

var apiInstance = new DefaultApi();
var type = type_example; // String | type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
var id = id_example; // String | oid of the object for which the value will be generated
var body = new Object(); // Object | path to the property which will be generated
var type = type_example; // String | type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
var id = id_example; // String | oid of the object for which the value will be validated
var body = new Object(); // Object | It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.

try
{
Expand Down Expand Up @@ -18941,9 +18941,9 @@ <h3>Usage and SDK Samples</h3>
io.swagger.client\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');

$api_instance = new io.swagger.client\Api\DefaultApi();
$type = type_example; // String | type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
$id = id_example; // String | oid of the object for which the value will be generated
$body = ; // Object | path to the property which will be generated
$type = type_example; // String | type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services
$id = id_example; // String | oid of the object for which the value will be validated
$body = ; // Object | It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.

try {
$result = $api_instance->validateValue($type, $id, $body);
Expand Down Expand Up @@ -18981,7 +18981,7 @@ <h2>Parameters</h2>
var schemaWrapper = {
"name" : "type",
"in" : "path",
"description" : "type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services",
"description" : "type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services",
"required" : true,
"type" : "string"
};
Expand Down Expand Up @@ -19014,7 +19014,7 @@ <h2>Parameters</h2>
var schemaWrapper = {
"name" : "id",
"in" : "path",
"description" : "oid of the object for which the value will be generated",
"description" : "oid of the object for which the value will be validated",
"required" : true,
"type" : "string"
};
Expand Down Expand Up @@ -19058,7 +19058,7 @@ <h2>Parameters</h2>
var schemaWrapper = {
"in" : "body",
"name" : "body",
"description" : "path to the property which will be generated",
"description" : "It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate.",
"required" : true,
"schema" : {
"type" : "object",
Expand Down Expand Up @@ -19784,7 +19784,7 @@ <h3> Status: 503 - Communication problem while provisioning </h3>
</div>
<div id="generator">
<div class="content">
Generated 2017-03-02T14:25:03.802+01:00
Generated 2017-03-16T13:50:39.152+01:00
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions config/rest/swagger.yml
View file
Expand Up @@ -233,20 +233,20 @@ paths:
- name: "type"
in: "path"
required: true
description: "type of the object for which the value will be generated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services"
description: "type of the object for which the value will be validated. Possible values are connectors, connectorHosts, genericObjects, resources, users, objectTemplates, systemConfigurations, tasks, shadows, roles, valuePolicies, orgs, services"
type: "string"
- name: "id"
in: "path"
required: true
type: "string"
description: "oid of the object for which the value will be generated"
description: "oid of the object for which the value will be validated"
- in: "body"
name: "body"
required: true
schema:
type: "object"
description: "see PolicyItemsDefinitionType"
description: "path to the property which will be generated"
description: "It can contain either path to the existing property which should be validated (e.g. policy for generating/validating employeeNumber changed and we need to check if the existing employeeNumber still satisfy constraints or it should be generated again) or value which will be set to the target object if it satisfy policy constraints. Definition of path to the existing property is used only if no value is provided to validate."
responses:
200:
description: "Successful operation"
Expand Down
2 changes: 1 addition & 1 deletion ...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
View file
Expand Up @@ -30,7 +30,7 @@

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyGenerator;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyProcessor;
import com.evolveum.midpoint.prism.Item;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismProperty;
Expand Down
2 changes: 1 addition & 1 deletion ...ui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
View file
Expand Up @@ -45,7 +45,7 @@
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.model.api.ModelService;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyGenerator;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyProcessor;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.crypto.EncryptionException;
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
View file
Expand Up @@ -37,7 +37,7 @@
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyGenerator;
import com.evolveum.midpoint.model.common.stringpolicy.ValuePolicyProcessor;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
Expand Down
33 changes: 33 additions & 0 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
View file
Expand Up @@ -65,6 +65,11 @@ public abstract class SchemaConstants {
public static final String NS_MATCHING_RULE = NS_MIDPOINT_PUBLIC + "/common/matching-rule-3";
public static final String NS_FAULT = "http://midpoint.evolveum.com/xml/ns/public/common/fault-3";
public static final String NS_SAMPLES_EXTENSION = "http://midpoint.evolveum.com/xml/ns/samples/extension-3";

/**
* Namespace for default (bult-in) object collections, such as "all objects", "all roles", ...
*/
public static final String NS_OBJECT_COLLECTIONS = NS_MIDPOINT_PUBLIC + "/common/object-collections-3";

// COMMON NAMESPACE

Expand Down Expand Up @@ -399,6 +404,34 @@ public abstract class SchemaConstants {
public static final String LIFECYCLE_FAILED = "failed";


// Object collections

/**
* All objects in role catalog. It means all the objects in all the categories that are placed under the
* primary role catalog defined in the system. If used in a context where the role catalog can be displayed
* as a tree then this collection will be displayed as a tree.
*/
public static final QName OBJECT_COLLECTION_ROLE_CATALOG_QNAME = new QName(NS_OBJECT_COLLECTIONS, "roleCatalog");
public static final String OBJECT_COLLECTION_ROLE_CATALOG_URI = QNameUtil.qNameToUri(OBJECT_COLLECTION_ROLE_CATALOG_QNAME);

/**
* Collection that contains all roles.
*/
public static final QName OBJECT_COLLECTION_ALL_ROLES_QNAME = new QName(NS_OBJECT_COLLECTIONS, "allRoles");
public static final String OBJECT_COLLECTION_ALL_ROLES_URI = QNameUtil.qNameToUri(OBJECT_COLLECTION_ALL_ROLES_QNAME);

/**
* Collection that contains all orgs.
*/
public static final QName OBJECT_COLLECTION_ALL_ORGS_QNAME = new QName(NS_OBJECT_COLLECTIONS, "allOrgs");
public static final String OBJECT_COLLECTION_ALL_ORGS_URI = QNameUtil.qNameToUri(OBJECT_COLLECTION_ALL_ORGS_QNAME);

/**
* Collection that contains all services.
*/
public static final QName OBJECT_COLLECTION_ALL_SERVICES_QNAME = new QName(NS_OBJECT_COLLECTIONS, "allServices");
public static final String OBJECT_COLLECTION_ALL_SERVICES_URI = QNameUtil.qNameToUri(OBJECT_COLLECTION_ALL_SERVICES_QNAME);

// Samples

public static final QName SAMPLES_SSN = new QName(SchemaConstants.NS_SAMPLES_EXTENSION, "ssn");
Expand Down
68 changes: 68 additions & 0 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Expand Up @@ -11117,6 +11117,19 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="roleCatalogCollections" type="tns:ObjectCollectionsUseType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Specifies the set of object collections ("role catalog views") to display in role
catalog. If this element is not specified then the default (hardcoded) collections
will be displayed. If this element is specified then only those collections specified
in this element are displayed.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.6</a:since>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="defaultAssignmentMultiplicity" type="tns:AssignmentMultiplicityType" minOccurs="0" default="single">
<xsd:annotation>
<xsd:documentation>
Expand Down Expand Up @@ -11182,6 +11195,61 @@
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="ObjectCollectionsUseType">
<xsd:annotation>
<xsd:documentation>
Specifies a set of object collections ("views") to be displayed (used) at
a specific location in the system.
This is generic type that can be used to specify collections to display
in role catalog, menu, dashboard and so on.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.6</a:since>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="collection" type="tns:ObjectCollectionUseType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
Reference to the colleciot, its visibility, etc.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.6</a:since>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<!-- TODO: other elements that influence the way how the whole collection set
is displayed or how the collection sets configuration is merged. -->
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="ObjectCollectionUseType">
<xsd:annotation>
<xsd:documentation>
Specifies how a specific collection ("view") is to be displayed (used) at
a specific location in the system.
This is generic type that can be used to specify collection to display
in role catalog, menu, dashboard and so on.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.6</a:since>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="collectionUri" type="xsd:anyURI" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Reference to the built-in collection.
</xsd:documentation>
<xsd:appinfo>
<a:since>3.6</a:since>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<!-- TODO: visibility, ordering, etc. -->
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="PolicyRuleType">
<xsd:annotation>
<xsd:documentation>
Expand Down

0 comments on commit 2c4629a

Please sign in to comment.