Skip to content

[UNIONVMS-4876] Authorization rule for incoming messages applied only… #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Georgemanif wants to merge 1 commit into
base: subscriptions-2020
Choose a base branch
from
Open

[UNIONVMS-4876] Authorization rule for incoming messages applied only… #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...rc/main/java/eu/europa/ec/fisheries/uvms/rules/model/mapper/RulesModuleRequestMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ public static String createSetMovementReportRequest(PluginType type, RawMovement

public static String createSetFLUXMovementReportRequest(PluginType type, String fluxFAReportMessage, String username,
String logId, String fluxDataFlow, String senderOrReceiver, String onValue,
String registeredClassName, String ad, String to, String todt) throws RulesModelMapperException {
String registeredClassName, String ad, String to, String todt, Date date) throws RulesModelMapperException {
SetFLUXMovementReportRequest request = new SetFLUXMovementReportRequest();
request.setMethod(RulesModuleMethod.RECEIVE_MOVEMENT_BATCH);
request.setRequest(fluxFAReportMessage);
request.setType(type);
request.setDate(date);
populateCommonProperties(request, username, logId, fluxDataFlow, senderOrReceiver, onValue, registeredClassName, ad, to, todt);
return JAXBMarshaller.marshallJaxBObjectToString(request);
}
Expand All @@ -50,11 +51,12 @@ public static String createGetTicketsAndRulesByMovementsRequest(List<String> mov
}

public static String createSetFLUXFAReportMessageRequest(PluginType type, String fluxFAReportMessage, String username,
String logId, String fluxDataFlow, String senderOrReceiver, String onValue) throws RulesModelMapperException {
String logId, String fluxDataFlow, String senderOrReceiver, String onValue, Date date) throws RulesModelMapperException {
SetFLUXFAReportMessageRequest request = new SetFLUXFAReportMessageRequest();
request.setMethod(RulesModuleMethod.SET_FLUX_FA_REPORT);
request.setRequest(fluxFAReportMessage);
request.setPluginType(type);
request.setDate(date);
populateCommonProperties(request, username, logId, fluxDataFlow, senderOrReceiver, onValue);
return JAXBMarshaller.marshallJaxBObjectToString(request);
}
Expand All @@ -70,11 +72,12 @@ public static String createSendFLUXFAReportMessageRequest(String fluxFAReportMes
}

public static String createSetFaQueryMessageRequest(PluginType type, String faQueryMessageStr, String username,
String logId, String fluxDataFlow, String senderOrReceiver, String onValue) throws RulesModelMapperException {
String logId, String fluxDataFlow, String senderOrReceiver, String onValue, Date date) throws RulesModelMapperException {
SetFaQueryMessageRequest request = new SetFaQueryMessageRequest();
request.setMethod(RulesModuleMethod.SET_FLUX_FA_QUERY);
request.setRequest(faQueryMessageStr);
request.setPluginType(type);
request.setDate(date);
populateCommonProperties(request, username, logId, fluxDataFlow, senderOrReceiver, onValue);
return JAXBMarshaller.marshallJaxBObjectToString(request);
}
Expand Down
17 changes: 16 additions & 1 deletion ...java/eu/europa/ec/fisheries/uvms/rules/service/bean/activity/RulesFaQueryServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,23 @@
import eu.europa.ec.fisheries.uvms.rules.message.consumer.bean.ActivityOutQueueConsumer;
import eu.europa.ec.fisheries.uvms.rules.message.producer.bean.RulesActivityProducerBean;
import eu.europa.ec.fisheries.uvms.rules.message.producer.bean.RulesExchangeProducerBean;
import eu.europa.ec.fisheries.uvms.rules.service.MDRCacheRuleService;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulePostProcessBean;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesConfigurationCache;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesEngineBean;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesExchangeServiceBean;
import eu.europa.ec.fisheries.uvms.rules.service.business.AbstractFact;
import eu.europa.ec.fisheries.uvms.rules.service.business.RuleFromMDR;
import eu.europa.ec.fisheries.uvms.rules.service.business.ValidationResult;
import eu.europa.ec.fisheries.uvms.rules.service.business.helper.RuleApplicabilityChecker;
import eu.europa.ec.fisheries.uvms.rules.service.config.ExtraValueType;
import eu.europa.ec.fisheries.uvms.rules.service.constants.Rule9998Or9999ErrorType;
import eu.europa.ec.fisheries.uvms.rules.service.exception.RulesServiceException;
import eu.europa.ec.fisheries.uvms.rules.service.exception.RulesValidationException;
import eu.europa.ec.fisheries.uvms.rules.service.mapper.RulesFLUXMessageHelper;
import eu.europa.ec.fisheries.uvms.rules.service.mapper.xpath.util.XPathRepository;
import lombok.extern.slf4j.Slf4j;
import org.joda.time.DateTime;
import org.slf4j.MDC;
import un.unece.uncefact.data.standard.fluxfaquerymessage._3.FLUXFAQueryMessage;
import un.unece.uncefact.data.standard.fluxresponsemessage._6.FLUXResponseMessage;
Expand All @@ -43,6 +47,7 @@
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.inject.Inject;
import javax.jms.JMSException;
import javax.jms.TextMessage;
import javax.xml.bind.JAXBException;
Expand Down Expand Up @@ -97,6 +102,12 @@ public class RulesFaQueryServiceBean {
@EJB
private RulesFaReportServiceBean faReportRulesMessageBean;

@Inject
private MDRCacheRuleService mdrCacheRuleService;

@Inject
private RuleApplicabilityChecker appliChecker;

private RulesFLUXMessageHelper fluxMessageHelper;

@PostConstruct
Expand Down Expand Up @@ -130,14 +141,18 @@ public void evaluateIncomingFAQuery(SetFaQueryMessageRequest request) {

idsFromIncomingMessage.removeAll(faQueryIdsFromDb);

List<RuleFromMDR> authRules = mdrCacheRuleService.getFaBrsForBrId("FA-L00-00-9999");
RuleFromMDR authRule = authRules.get(0);
boolean rule9999IsActivated = appliChecker.isApplicable("FA-L00-00-9999", authRule.getContext(), request.getFluxDataFlow(), new DateTime(request.getDate()), mdrCacheRuleService);

ValidationResult faQueryValidationReport = rulePostProcessBean.checkAndUpdateValidationResult(faQueryFacts, requestStr, exchangeLogGuid, RawMsgType.FA_QUERY);
// exchangeServiceBean.updateExchangeMessage(exchangeLogGuid, fluxMessageHelper.calculateMessageValidationStatus(faQueryValidationReport));
rulesDaoBean.createFaDocumentIdEntity(idsFromIncomingMessage);
SetFLUXFAReportMessageRequest setFLUXFAReportMessageRequest = null;
if (faQueryValidationReport != null && !faQueryValidationReport.isError()) {
log.debug("The Validation of FaQueryMessage is successful, going to check permissions (Subscriptions)..");
setFLUXFAReportMessageRequest = sendSyncQueryRequestToActivity(requestStr, request.getUsername(), request.getPluginType(), exchangeLogGuid);
if (setFLUXFAReportMessageRequest.isIsPermitted()) { // Send query to activity.
if (setFLUXFAReportMessageRequest.isIsPermitted() || !rule9999IsActivated) { // Send query to activity.
log.debug("Request has permissions. Going to send FaQuery to Activity Module...");
if (setFLUXFAReportMessageRequest.isIsEmptyReport()) {
log.info("[WARN] The report generated from Activity doesn't contain data (Empty report)!");
Expand Down
17 changes: 16 additions & 1 deletion ...ava/eu/europa/ec/fisheries/uvms/rules/service/bean/activity/RulesFaReportServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,17 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
import eu.europa.ec.fisheries.uvms.rules.message.consumer.RulesResponseConsumer;
import eu.europa.ec.fisheries.uvms.rules.message.producer.bean.RulesActivityProducerBean;
import eu.europa.ec.fisheries.uvms.rules.message.producer.bean.RulesExchangeProducerBean;
import eu.europa.ec.fisheries.uvms.rules.service.MDRCacheRuleService;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulePostProcessBean;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesConfigurationCache;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesEngineBean;
import eu.europa.ec.fisheries.uvms.rules.service.bean.RulesExchangeServiceBean;
import eu.europa.ec.fisheries.uvms.rules.service.bean.permission.PermissionData;
import eu.europa.ec.fisheries.uvms.rules.service.bean.asset.client.impl.AssetClientBean;
import eu.europa.ec.fisheries.uvms.rules.service.business.AbstractFact;
import eu.europa.ec.fisheries.uvms.rules.service.business.RuleFromMDR;
import eu.europa.ec.fisheries.uvms.rules.service.business.ValidationResult;
import eu.europa.ec.fisheries.uvms.rules.service.business.helper.RuleApplicabilityChecker;
import eu.europa.ec.fisheries.uvms.rules.service.config.ExtraValueType;
import eu.europa.ec.fisheries.uvms.rules.service.exception.RulesServiceException;
import eu.europa.ec.fisheries.uvms.rules.service.exception.RulesValidationException;
Expand All @@ -47,6 +50,7 @@ This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The
import eu.europa.ec.fisheries.uvms.rules.service.mapper.xpath.util.XPathRepository;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.joda.time.DateTime;
import org.slf4j.MDC;
import un.unece.uncefact.data.standard.fluxfareportmessage._3.FLUXFAReportMessage;
import un.unece.uncefact.data.standard.fluxresponsemessage._6.FLUXResponseMessage;
Expand Down Expand Up @@ -107,6 +111,12 @@ public class RulesFaReportServiceBean {
@EJB
private RulesDao rulesDaoBean;

@Inject
private MDRCacheRuleService mdrCacheRuleService;

@Inject
private RuleApplicabilityChecker appliChecker;

private RulesFLUXMessageHelper fluxMessageHelper;

@PostConstruct
Expand Down Expand Up @@ -166,7 +176,12 @@ public void evaluateIncomingFLUXFAReport(SetFLUXFAReportMessageRequest request)
}

public void completeIncomingFLUXFAReportEvaluation(PermissionData permissionData) {
if (permissionData.isRequestPermitted()) {
SetFLUXFAReportMessageRequest request = permissionData.getRequest();
List<RuleFromMDR> authRules = mdrCacheRuleService.getFaBrsForBrId("FA-L00-00-9999");
RuleFromMDR authRule = authRules.get(0);
boolean rule9999IsActivated = appliChecker.isApplicable("FA-L00-00-9999", authRule.getContext(), request.getFluxDataFlow(), new DateTime(request.getDate()), mdrCacheRuleService);

if (permissionData.isRequestPermitted() || !rule9999IsActivated) {
log.debug(" Request has permissions. Going to send FaReportMessage to Activity Module...");
rulesDaoBean.saveFaIdsPerTripList(permissionData.getFaIdsPerTripsFromMessage());
Set<FADocumentID> result = permissionData.getIdsFromIncomingMessage().stream().filter(faDocumentID -> !FAUUIDType.FA_REPORT_REF_ID.equals(faDocumentID.getType())).collect(Collectors.toSet());
Expand Down
Loading