Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
Kateryna Honchar committed Aug 19, 2022
2 parents 47e1fe4 + cac8e51 commit 1f7cd2d
Show file tree
Hide file tree
Showing 11 changed files with 258 additions and 216 deletions.
25 changes: 7 additions & 18 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
import com.evolveum.midpoint.schema.internals.InternalsConfig;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
import com.evolveum.midpoint.schema.util.SubscriptionUtil;
import com.evolveum.midpoint.schema.util.SubscriptionUtil.SubscriptionType;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.security.api.MidPointPrincipal;
import com.evolveum.midpoint.security.api.OwnerResolver;
Expand Down Expand Up @@ -328,13 +328,11 @@ public String getDescribe() {

@Override
public String getObject() {
String subscriptionId = getSubscriptionId();
if (!SubscriptionUtil.isSubscriptionIdCorrect(subscriptionId)) {
SubscriptionType subscriptionType = MidPointApplication.get().getSubscriptionType();
if (!subscriptionType.isCorrect()) {
return " " + createStringResource("PageBase.nonActiveSubscriptionMessage").getString();
}
assert subscriptionId != null;
if (SubscriptionUtil.SubscriptionType.DEMO_SUBSCRIPTION.getSubscriptionType()
.equals(subscriptionId.substring(0, 2))) {
if (subscriptionType == SubscriptionType.DEMO_SUBSCRIPTION) {
return " " + createStringResource("PageBase.demoSubscriptionMessage").getString();
}
return "";
Expand All @@ -357,18 +355,9 @@ public boolean isVisible() {
}

private boolean isFooterVisible() {
String subscriptionId = getSubscriptionId();
if (StringUtils.isEmpty(subscriptionId)) {
return true;
}
return !SubscriptionUtil.isSubscriptionIdCorrect(subscriptionId) ||
(SubscriptionUtil.SubscriptionType.DEMO_SUBSCRIPTION.getSubscriptionType().equals(subscriptionId.substring(0, 2))
&& SubscriptionUtil.isSubscriptionIdCorrect(subscriptionId));
}

private String getSubscriptionId() {
DeploymentInformationType info = MidPointApplication.get().getDeploymentInfo();
return info != null ? info.getSubscriptionIdentifier() : null;
SubscriptionType subscriptionType = MidPointApplication.get().getSubscriptionType();
return !subscriptionType.isCorrect()
|| subscriptionType == SubscriptionType.DEMO_SUBSCRIPTION;
}

/**
Expand Down
45 changes: 4 additions & 41 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
import java.util.*;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.api.component.wizard.WizardModel;
import com.evolveum.midpoint.gui.api.component.wizard.WizardPanel;
import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;

import com.evolveum.midpoint.gui.impl.page.self.requestAccess.ShoppingCartPanel;
import com.evolveum.midpoint.web.component.util.EnableBehaviour;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
Expand Down Expand Up @@ -44,11 +37,14 @@
import com.evolveum.midpoint.common.validator.EventResult;
import com.evolveum.midpoint.common.validator.LegacyValidator;
import com.evolveum.midpoint.gui.api.GuiStyleConstants;
import com.evolveum.midpoint.gui.api.component.wizard.WizardModel;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuPanel;
import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;
import com.evolveum.midpoint.gui.impl.page.self.requestAccess.ShoppingCartPanel;
import com.evolveum.midpoint.gui.impl.prism.panel.ItemPanelSettings;
import com.evolveum.midpoint.gui.impl.prism.panel.PrismContainerValuePanel;
import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
Expand All @@ -67,8 +63,6 @@
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.Holder;
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AsyncWebProcessManager;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.AjaxIconButton;
Expand All @@ -80,6 +74,7 @@
import com.evolveum.midpoint.web.component.menu.SideBarMenuItem;
import com.evolveum.midpoint.web.component.menu.top.LocalePanel;
import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
import com.evolveum.midpoint.web.component.util.EnableBehaviour;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.page.error.PageError404;
import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
Expand Down Expand Up @@ -130,8 +125,6 @@ public abstract class PageBase extends PageAdminLTE {
public static final String PARAMETER_DASHBOARD_WIDGET_NAME = "dashboardWidgetName";
public static final String PARAMETER_SEARCH_BY_NAME = "name";

private static final Trace LOGGER = TraceManager.getTrace(PageBase.class);

private List<Breadcrumb> breadcrumbs;

private boolean initialized = false;
Expand Down Expand Up @@ -181,36 +174,6 @@ public PageBase() {
this(null);
}

// public <O extends ObjectType> boolean isAuthorized(ModelAuthorizationAction action, PrismObject<O> object) {
// try {
// return isAuthorized(AuthorizationConstants.AUTZ_ALL_URL, null, null, null, null, null)
// || isAuthorized(action.getUrl(), null, object, null, null, null);
// } catch (SchemaException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException |
// ConfigurationException | SecurityViolationException e) {
// LoggingUtils.logUnexpectedException(LOGGER, "Couldn't determine authorization for {}", e, action);
// return true; // it is only GUI thing
// }
// }
//
// public boolean isAuthorized(String operationUrl) throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException {
// return isAuthorized(operationUrl, null, null, null, null, null);
// }
//
// public <O extends ObjectType, T extends ObjectType> boolean isAuthorized(String operationUrl, AuthorizationPhaseType phase,
// PrismObject<O> object, ObjectDelta<O> delta, PrismObject<T> target, OwnerResolver ownerResolver) throws SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException {
// Task task = getPageTask();
// AuthorizationParameters<O, T> params = new AuthorizationParameters.Builder<O, T>()
// .oldObject(object)
// .delta(delta)
// .target(target)
// .build();
// boolean isAuthorized = getSecurityEnforcer().isAuthorized(operationUrl, phase, params, ownerResolver, task, task.getResult());
// if (!isAuthorized && (ModelAuthorizationAction.GET.getUrl().equals(operationUrl) || ModelAuthorizationAction.SEARCH.getUrl().equals(operationUrl))) {
// isAuthorized = getSecurityEnforcer().isAuthorized(ModelAuthorizationAction.READ.getUrl(), phase, params, ownerResolver, task, task.getResult());
// }
// return isAuthorized;
// }

public <O extends ObjectType, T extends ObjectType> void authorize(String operationUrl, AuthorizationPhaseType phase,
PrismObject<O> object, ObjectDelta<O> delta, PrismObject<T> target, OwnerResolver ownerResolver, OperationResult result)
throws SecurityViolationException, SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
Expand Down
33 changes: 4 additions & 29 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,31 +612,6 @@ public static CompiledObjectCollectionView getDefaultGuiObjectListType(PageBase
return pageBase.getCompiledGuiProfile().getDefaultObjectCollectionView();
}

// public enum Channel {
// // TODO: move this to schema component
// LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),
// RECONCILIATION(SchemaConstants.CHANGE_CHANNEL_RECON_URI),
// RECOMPUTATION(SchemaConstants.CHANGE_CHANNEL_RECOMPUTE_URI),
// DISCOVERY(SchemaConstants.CHANGE_CHANNEL_DISCOVERY_URI),
// WEB_SERVICE(SchemaConstants.CHANNEL_WEB_SERVICE_URI),
// IMPORT(SchemaConstants.CHANNEL_OBJECT_IMPORT_URI),
// REST(SchemaConstants.CHANNEL_REST_URI),
// INIT(SchemaConstants.CHANNEL_GUI_INIT_URI),
// USER(SchemaConstants.CHANNEL_USER_URI),
// SELF_REGISTRATION(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI),
// RESET_PASSWORD(SchemaConstants.CHANNEL_GUI_RESET_PASSWORD_URI);
//
// private String channel;
//
// Channel(String channel) {
// this.channel = channel;
// }
//
// public String getChannel() {
// return channel;
// }
// }

public static DateValidator getRangeValidator(Form<?> form, ItemPath path) {
DateValidator validator = null;
List<DateValidator> validators = form.getBehaviors(DateValidator.class);
Expand Down Expand Up @@ -4902,12 +4877,12 @@ private static SceneDto createTaskChangesDto(String titleKey, String boxClassOve
}

public static String getMidpointCustomSystemName(PageAdminLTE pageBase, String defaultSystemNameKey) {
DeploymentInformationType deploymentInfo = MidPointApplication.get().getDeploymentInfo();
String subscriptionId = deploymentInfo != null ? deploymentInfo.getSubscriptionIdentifier() : null;
if (!SubscriptionUtil.isSubscriptionIdCorrect(subscriptionId)
|| SubscriptionType.DEMO_SUBSCRIPTION.getSubscriptionType().equals(subscriptionId.substring(0, 2))) {
SubscriptionType subscriptionType = MidPointApplication.get().getSubscriptionType();
if (!subscriptionType.isCorrect() || subscriptionType == SubscriptionType.DEMO_SUBSCRIPTION) {
return pageBase.createStringResource(defaultSystemNameKey).getString();
}

DeploymentInformationType deploymentInfo = MidPointApplication.get().getDeploymentInfo();
return deploymentInfo != null && StringUtils.isNotEmpty(deploymentInfo.getSystemName()) ?
deploymentInfo.getSystemName() : pageBase.createStringResource(defaultSystemNameKey).getString();
}
Expand Down
21 changes: 16 additions & 5 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import com.evolveum.midpoint.schema.SchemaService;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.SchemaDebugUtil;
import com.evolveum.midpoint.schema.util.SubscriptionUtil;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.security.api.MidPointPrincipal;
import com.evolveum.midpoint.security.api.SecurityContextManager;
Expand Down Expand Up @@ -195,6 +196,7 @@ public class MidPointApplication extends AuthenticatedWebApplication implements
private WebApplicationConfiguration webApplicationConfiguration;

private DeploymentInformationType deploymentInfo;
private SubscriptionUtil.SubscriptionType subscriptionType;

public static final String MOUNT_INTERNAL_SERVER_ERROR = "/error";
public static final String MOUNT_UNAUTHORIZED_ERROR = "/error/401";
Expand Down Expand Up @@ -230,10 +232,7 @@ public void init() {
getComponentInstantiationListeners().add(new SpringComponentInjector(this, applicationContext, true));

systemConfigurationChangeDispatcher.registerListener(new DeploymentInformationChangeListener(this));
SystemConfigurationType config = getSystemConfigurationIfAvailable();
if (config != null) {
deploymentInfo = config.getDeploymentInformation();
}
updateDeploymentInfo(getSystemConfigurationIfAvailable());

ResourceSettings resourceSettings = getResourceSettings();
resourceSettings.setParentFolderPlaceholder("$-$");
Expand Down Expand Up @@ -338,6 +337,12 @@ public DeploymentInformationType getDeploymentInfo() {
return deploymentInfo;
}

@NotNull
public SubscriptionUtil.SubscriptionType getSubscriptionType() {
// should not be null, unless called before initialization, in which case we provide default NONE
return Objects.requireNonNullElse(subscriptionType, SubscriptionUtil.SubscriptionType.NONE);
}

private void initializeSchrodinger() {
if (applicationContext == null) {
return;
Expand Down Expand Up @@ -627,10 +632,16 @@ public DeploymentInformationChangeListener(MidPointApplication application) {

@Override
public void update(@Nullable SystemConfigurationType value) {
application.deploymentInfo = value != null ? value.getDeploymentInformation() : null;
application.updateDeploymentInfo(value);
}
}

private void updateDeploymentInfo(@Nullable SystemConfigurationType value) {
deploymentInfo = value != null ? value.getDeploymentInformation() : null;
String subscriptionId = deploymentInfo != null ? deploymentInfo.getSubscriptionIdentifier() : null;
subscriptionType = SubscriptionUtil.getSubscriptionType(subscriptionId);
}

/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
Expand Down
80 changes: 59 additions & 21 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SubscriptionUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,66 @@
package com.evolveum.midpoint.schema.util;

import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.validator.routines.checkdigit.VerhoeffCheckDigit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import com.evolveum.midpoint.xml.ns._public.common.common_3.DeploymentInformationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;

public class SubscriptionUtil {

public static boolean isSubscriptionIdCorrect(String subscriptionId) {
@NotNull
public static SubscriptionType getSubscriptionType(@Nullable SystemConfigurationType systemConfigurationType) {
if (systemConfigurationType == null) {
return SubscriptionType.NONE;
}

DeploymentInformationType deploymentInformation = systemConfigurationType.getDeploymentInformation();
if (deploymentInformation == null) {
return SubscriptionType.NONE;
}

return getSubscriptionType(deploymentInformation.getSubscriptionIdentifier());
}

@NotNull
public static SubscriptionType getSubscriptionType(String subscriptionId) {
if (StringUtils.isEmpty(subscriptionId)) {
return false;
return SubscriptionType.NONE;
}
if (!NumberUtils.isDigits(subscriptionId)) {
return false;
return SubscriptionType.INVALID;
}
if (subscriptionId.length() < 11) {
return false;
}
String subscriptionType = subscriptionId.substring(0, 2);
boolean isTypeCorrect = false;
for (SubscriptionType type : SubscriptionType.values()) {
if (type.getSubscriptionType().equals(subscriptionType)) {
isTypeCorrect = true;
break;
}
return SubscriptionType.INVALID;
}
if (!isTypeCorrect) {
return false;

SubscriptionType type = SubscriptionType.resolveType(subscriptionId.substring(0, 2));
if (type == null || !type.isCorrect()) {
return SubscriptionType.INVALID;
}

String substring1 = subscriptionId.substring(2, 4);
String substring2 = subscriptionId.substring(4, 6);
try {
if (Integer.parseInt(substring1) < 1 || Integer.parseInt(substring1) > 12) {
return false;
return SubscriptionType.INVALID;
}

SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
String currentYear = dateFormat.format(Calendar.getInstance().getTime());
if (Integer.parseInt(substring2) < Integer.parseInt(currentYear)) {
return false;
return SubscriptionType.INVALID;
}

String expDateStr = subscriptionId.substring(2, 6);
Expand All @@ -58,20 +77,26 @@ public static boolean isSubscriptionIdCorrect(String subscriptionId) {
expireCalendarValue.add(Calendar.MONTH, 1);
Date currentDate = new Date(System.currentTimeMillis());
if (expireCalendarValue.getTime().before(currentDate) || expireCalendarValue.getTime().equals(currentDate)) {
return false;
return SubscriptionType.INVALID;
}
} catch (Exception ex) {
return false;
return SubscriptionType.INVALID;
}
VerhoeffCheckDigit checkDigit = new VerhoeffCheckDigit();
return checkDigit.isValid(subscriptionId);
if (!checkDigit.isValid(subscriptionId)) {
return SubscriptionType.INVALID;
}

return type;
}

/**
* Enumeration for the type of subscription.
*/
public enum SubscriptionType {

NONE(null),
INVALID(null),
ANNUAL_SUBSCRIPTION("01"),
PLATFORM_SUBSCRIPTION("02"),
DEPLOYMENT_SUBSCRIPTION("03"),
Expand All @@ -84,8 +109,21 @@ public enum SubscriptionType {
this.subscriptionType = subscriptionType;
}

public String getSubscriptionType() {
return subscriptionType;
public boolean isCorrect() {
return subscriptionType != null;
}

private static final Map<String, SubscriptionType> CODE_TO_TYPE;

static {
CODE_TO_TYPE = Arrays.stream(values())
.filter(v -> v.subscriptionType != null)
.collect(Collectors.toUnmodifiableMap(v -> v.subscriptionType, Function.identity()));
}

@Nullable
public static SubscriptionType resolveType(String code) {
return CODE_TO_TYPE.get(code);
}
}
}

0 comments on commit 1f7cd2d

Please sign in to comment.