Skip to content
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

Jump to bottom

MET-6183 use new plugin parameter and sanitization method #1

Merged
merged 2 commits into from
Oct 14, 2024
Merged

MET-6183 use new plugin parameter and sanitization method #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54bbac9
MET-6183 use new plugin parameter and sanitization method
stzanakis Oct 11, 2024
bf0375b
MET-6183 Fix sonar issues
stzanakis Oct 11, 2024
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
7 changes: 3 additions & 4 deletions ...s-core-common/src/main/java/eu/europeana/metis/core/workflow/plugins/DepublishPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ public String getTopologyName() {
}

@Override
public DpsTask prepareDpsTask(String datasetId,
DpsTaskSettings dpsTaskSettings) {
public DpsTask prepareDpsTask(String datasetId, DpsTaskSettings dpsTaskSettings) {

Map<String, String> extraParameters = new HashMap<>();
extraParameters.put(PluginParameterKeys.METIS_DATASET_ID, datasetId);
Expand All @@ -63,8 +62,8 @@ public DpsTask prepareDpsTask(String datasetId,
extraParameters.put(PluginParameterKeys.RECORD_IDS_TO_DEPUBLISH, recordIdList);
}
}
//TODO: 2024-09-24 - Update below key with the PluginParameterKeys equivalent when it's available
extraParameters.put("DEPUBLICATION_REASON", getPluginMetadata().getDepublicationReason().name());

extraParameters.put(PluginParameterKeys.DEPUBLICATION_REASON, getPluginMetadata().getDepublicationReason().name());
DpsTask dpsTask = new DpsTask();
dpsTask.setParameters(extraParameters);
return dpsTask;
Expand Down
13 changes: 9 additions & 4 deletions metis-core-rest/src/main/java/eu/europeana/metis/core/rest/controller/DatasetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eu.europeana.metis.core.rest.controller;

import static eu.europeana.metis.utils.CommonStringValues.CRLF_PATTERN;
import static eu.europeana.metis.utils.CommonStringValues.sanitizeCRLF;

import com.fasterxml.jackson.annotation.JsonProperty;
import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
Expand Down Expand Up @@ -149,8 +150,9 @@ public void updateDataset(@RequestHeader("Authorization") String authorization,
@DeleteMapping(value = RestEndpoints.DATASETS_DATASETID)
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteDataset(@RequestHeader("Authorization") String authorization,
@PathVariable("datasetId") String datasetId)
throws GenericMetisException {
@PathVariable("datasetId") String datasetId) throws GenericMetisException {
authorization = sanitizeCRLF(authorization);
datasetId = sanitizeCRLF(datasetId);

MetisUserView metisUserView = authenticationClient.getUserByAccessTokenInHeader(authorization);

Expand Down Expand Up @@ -210,12 +212,15 @@ public Dataset getByDatasetId(@RequestHeader("Authorization") String authorizati
@ResponseStatus(HttpStatus.OK)
public DatasetXslt getDatasetXsltByDatasetId(@RequestHeader("Authorization") String authorization,
@PathVariable("datasetId") String datasetId) throws GenericMetisException {
authorization = sanitizeCRLF(authorization);
datasetId = sanitizeCRLF(datasetId);

MetisUserView metisUserView = authenticationClient.getUserByAccessTokenInHeader(authorization);

DatasetXslt datasetXslt = datasetService.getDatasetXsltByDatasetId(metisUserView, datasetId);
LOGGER.info("Dataset XSLT with datasetId '{}' and xsltId: '{}' found", datasetId,
datasetXslt.getId());
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Dataset XSLT with datasetId '{}' and xsltId: '{}' found", sanitizeCRLF(datasetId), datasetXslt.getId());
}
return datasetXslt;
}

Expand Down
9 changes: 7 additions & 2 deletions ...re-rest/src/main/java/eu/europeana/metis/core/rest/controller/OrchestratorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package eu.europeana.metis.core.rest.controller;

import static eu.europeana.metis.utils.CommonStringValues.sanitizeCRLF;

import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
import eu.europeana.metis.authentication.user.MetisUserView;
import eu.europeana.metis.core.common.DaoFieldNames;
Expand Down Expand Up @@ -149,8 +151,11 @@ public void updateWorkflow(
produces = {MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_XML_VALUE})
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteWorkflow(
@RequestHeader("Authorization") String authorization,
@PathVariable("datasetId") String datasetId) throws GenericMetisException {
@RequestHeader("Authorization") String authorization, @PathVariable("datasetId") String datasetId)
throws GenericMetisException {
authorization = sanitizeCRLF(authorization);
datasetId = sanitizeCRLF(datasetId);

MetisUserView metisUserView = authenticationClient.getUserByAccessTokenInHeader(authorization);
orchestratorService.deleteWorkflow(metisUserView, datasetId);
if (LOGGER.isInfoEnabled()) {
Expand Down
4 changes: 4 additions & 0 deletions ...est/src/main/java/eu/europeana/metis/core/rest/controller/ScheduleWorkflowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eu.europeana.metis.core.rest.controller;

import static eu.europeana.metis.utils.CommonStringValues.CRLF_PATTERN;
import static eu.europeana.metis.utils.CommonStringValues.sanitizeCRLF;

import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
import eu.europeana.metis.authentication.user.MetisUserView;
Expand Down Expand Up @@ -149,6 +150,9 @@ public void updateScheduledWorkflow(@RequestHeader("Authorization") String autho
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deleteScheduledWorkflowExecution(@RequestHeader("Authorization") String authorization,
@PathVariable("datasetId") String datasetId) throws GenericMetisException {
authorization = sanitizeCRLF(authorization);
datasetId = sanitizeCRLF(datasetId);

MetisUserView metisUserView = authenticationClient.getUserByAccessTokenInHeader(authorization);
scheduleWorkflowService.deleteScheduledWorkflow(metisUserView, datasetId);
if (LOGGER.isInfoEnabled()) {
Expand Down
8 changes: 8 additions & 0 deletions ...-core-service/src/main/java/eu/europeana/metis/core/service/DepublishRecordIdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package eu.europeana.metis.core.service;

import static java.lang.String.format;

import eu.europeana.metis.authentication.user.MetisUserView;
import eu.europeana.metis.core.dao.DepublishRecordIdDao;
import eu.europeana.metis.core.dataset.DatasetExecutionInformation;
import eu.europeana.metis.core.dataset.DatasetExecutionInformation.PublicationStatus;
import eu.europeana.metis.core.exceptions.NoDatasetFoundException;
import eu.europeana.metis.core.exceptions.PluginExecutionNotAllowed;
import eu.europeana.metis.core.rest.DepublishRecordIdView;
import eu.europeana.metis.core.rest.ResponseListWrapper;
import eu.europeana.metis.core.util.DepublishRecordIdSortField;
Expand Down Expand Up @@ -186,6 +189,11 @@ public WorkflowExecution createAndAddInQueueDepublishWorkflowExecution(
// Authorize.
authorizer.authorizeReadExistingDatasetById(metisUserView, datasetId);

if (depublicationReason == DepublicationReason.UNKNOWN) {
throw new PluginExecutionNotAllowed(
format("Depublication reason %s, is not allowed", depublicationReason));
}

//Prepare depublish workflow, do not save in the database. Only create workflow execution
final Workflow workflow = new Workflow();
workflow.setDatasetId(datasetId);
Expand Down