Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Feb 28, 2022
2 parents 8e51c1d + bc8dc53 commit 5ec7c7d
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 10 deletions.
22 changes: 22 additions & 0 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,17 @@ public IModel<String> getConfirmationMessageModel() {
public CompositedIconBuilder getIconCompositedBuilder() {
return getDefaultCompositedIconBuilder(GuiStyleConstants.CLASS_ICON_NO_OBJECTS);
}

@Override
public IModel<Boolean> getVisible() {
IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel = ((ColumnMenuAction<PrismContainerValueWrapper<CaseWorkItemType>>) getAction()).getRowModel();
if (rowModel != null && rowModel.getObject() != null && rowModel.getObject().getRealValue() != null) {
CaseWorkItemType workItem = rowModel.getObject().getRealValue();
return Model.of(!CaseTypeUtil.isCorrelationCase(CaseTypeUtil.getCase(workItem)));
} else {
return super.getVisible();
}
}
});
menu.add(new ButtonInlineMenuItem(createStringResource("pageWorkItem.button.approve")) {
private static final long serialVersionUID = 1L;
Expand Down Expand Up @@ -311,6 +322,17 @@ public IModel<Boolean> getEnabled() {
public IModel<String> getConfirmationMessageModel() {
return createStringResource("CaseWorkItemsPanel.confirmWorkItemsApproveAction");
}

@Override
public IModel<Boolean> getVisible() {
IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel = ((ColumnMenuAction<PrismContainerValueWrapper<CaseWorkItemType>>) getAction()).getRowModel();
if (rowModel != null && rowModel.getObject() != null && rowModel.getObject().getRealValue() != null) {
CaseWorkItemType workItem = rowModel.getObject().getRealValue();
return Model.of(!CaseTypeUtil.isCorrelationCase(CaseTypeUtil.getCase(workItem)));
} else {
return super.getVisible();
}
}
});

return menu;
Expand Down
4 changes: 3 additions & 1 deletion infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1492,17 +1492,19 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="transport" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
<!-- TODO Hopefully in 4.6, implementation support wasn't finished in 4.5
<xsd:element name="transportConfig" type="tns:NotifierTransportConfigType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
More expressive version of `transport` element that allows also customizing
template per transport.
</xsd:documentation>
<xsd:appinfo>
<a:since>4.5</a:since>
<a:since>4.6</a:since>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
-->
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
Expand Down
66 changes: 61 additions & 5 deletions infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,11 @@
<xsd:appinfo>
<a:container/>
<a:since>4.1</a:since>
<a:schemaMigration>
<a:element>tns:network</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
Expand Down Expand Up @@ -515,6 +520,37 @@
<xsd:appinfo>
<a:container/>
<a:since>4.1</a:since>
<a:schemaMigration>
<a:element>tns:defaultDigest</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:wantAssertionsSigned</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:singleLogoutEnabled</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:nameId</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:provider</a:element>
<a:version>4.5</a:version>
<a:operation>moved</a:operation>
<a:replacement>tns:identityProvider</a:replacement>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:metadata</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down Expand Up @@ -700,6 +736,11 @@
<xsd:appinfo>
<a:container/>
<a:since>4.5</a:since>
<a:schemaMigration>
<a:element>tns:name</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down Expand Up @@ -770,6 +811,21 @@
<xsd:appinfo>
<a:container/>
<a:since>4.1</a:since>
<a:schemaMigration>
<a:element>tns:alias</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:skipSslValidation</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
<a:schemaMigration>
<a:element>tns:metadataTrustCheck</a:element>
<a:version>4.5</a:version>
<a:operation>removed</a:operation>
</a:schemaMigration>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
Expand Down Expand Up @@ -1313,7 +1369,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="updatingFocusBehavior" type="tns:UpdatingFocusBehaviorType" minOccurs="0" maxOccurs="1">
<xsd:element name="focusBehaviorUpdate" type="tns:FocusBehaviorUpdateType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:appinfo>
<a:since>4.5</a:since>
Expand All @@ -1328,7 +1384,7 @@
</xsd:sequence>
</xsd:complexType>

<xsd:simpleType name="UpdatingFocusBehaviorType">
<xsd:simpleType name="FocusBehaviorUpdateType">
<xsd:annotation>
<xsd:documentation>
Option for updating focus authentication behaviour attributes. We can enable/disable updating of focus
Expand Down Expand Up @@ -1361,15 +1417,15 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="onlyUnsuccessfulLogin">
<xsd:enumeration value="failureOnly">
<xsd:annotation>
<xsd:documentation>
Authentication behaviour attributes will be updated when login failed and when login will be success,
but previous login was unsuccessful and midPoint need update attributes as is number of login fails
but previous login was failed and midPoint need update attributes as is number of login fails
and lockout state.
</xsd:documentation>
<xsd:appinfo>
<jaxb:typesafeEnumMember name="ONLY_UNSUCCESSFUL_LOGIN"/>
<jaxb:typesafeEnumMember name="FAILURE_ONLY"/>
</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
Expand Down
8 changes: 4 additions & 4 deletions ...n-impl/src/main/java/com/evolveum/midpoint/authentication/impl/util/AuthSequenceUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,12 +590,12 @@ public static void doRemoteFilter(ServletRequest req, ServletResponse res, Filte
public static boolean isAllowUpdatingAuthBehavior(boolean isUpdatingDuringUnsuccessfulLogin){
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication instanceof MidpointAuthentication && ((MidpointAuthentication)authentication).getSequence() != null) {
UpdatingFocusBehaviorType actualOption = ((MidpointAuthentication) authentication).getSequence().getUpdatingFocusBehavior();
if (actualOption == null && UpdatingFocusBehaviorType.ENABLED.equals(actualOption)) {
FocusBehaviorUpdateType actualOption = ((MidpointAuthentication) authentication).getSequence().getFocusBehaviorUpdate();
if (actualOption == null && FocusBehaviorUpdateType.ENABLED.equals(actualOption)) {
return true;
} else if (UpdatingFocusBehaviorType.DISABLED.equals(actualOption)) {
} else if (FocusBehaviorUpdateType.DISABLED.equals(actualOption)) {
return false;
} else if (UpdatingFocusBehaviorType.ONLY_UNSUCCESSFUL_LOGIN.equals(actualOption)) {
} else if (FocusBehaviorUpdateType.FAILURE_ONLY.equals(actualOption)) {
return isUpdatingDuringUnsuccessfulLogin;
}
}
Expand Down

0 comments on commit 5ec7c7d

Please sign in to comment.