mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-08-02 18:45:21 +00:00
fix(pipeline): allow slashes in pipeline operation values (#4066)
# Description of Changes - Extended the validation regex for `operation` in the pipeline processor to allow slashes (`/`), in addition to alphanumeric characters, underscores, and hyphens. - This resolves the issue where valid operation strings (e.g., with subpaths like `/api/v1/general/remove-pages`) were incorrectly rejected. - Added an explicit log message for better debugging in case of invalid `operation` values. --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details.
This commit is contained in:
parent
6879d5fb73
commit
422af007dc
@ -108,9 +108,13 @@ public class PipelineProcessor {
|
|||||||
if (inputFileTypes == null) {
|
if (inputFileTypes == null) {
|
||||||
inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
|
inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
|
||||||
}
|
}
|
||||||
if (!operation.matches("^[a-zA-Z0-9_-]+$")) {
|
|
||||||
throw new IllegalArgumentException("Invalid operation value received.");
|
if (!apiDocService.isValidOperation(operation, parameters)) {
|
||||||
|
log.error("Invalid operation or parameters: o:{} p:{}", operation, parameters);
|
||||||
|
throw new IllegalArgumentException(
|
||||||
|
"Invalid operation: " + operation + " with parameters: " + parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
String url = getBaseUrl() + operation;
|
String url = getBaseUrl() + operation;
|
||||||
List<Resource> newOutputFiles = new ArrayList<>();
|
List<Resource> newOutputFiles = new ArrayList<>();
|
||||||
if (!isMultiInputOperation) {
|
if (!isMultiInputOperation) {
|
||||||
@ -136,7 +140,7 @@ public class PipelineProcessor {
|
|||||||
// skip
|
// skip
|
||||||
// this
|
// this
|
||||||
// file
|
// file
|
||||||
if (operation.startsWith("filter-")
|
if (operation.startsWith("/api/v1/filter/filter-")
|
||||||
&& (response.getBody() == null
|
&& (response.getBody() == null
|
||||||
|| response.getBody().length == 0)) {
|
|| response.getBody().length == 0)) {
|
||||||
filtersApplied = true;
|
filtersApplied = true;
|
||||||
|
@ -45,23 +45,26 @@ class PipelineProcessorTest {
|
|||||||
@Test
|
@Test
|
||||||
void runPipelineWithFilterSetsFlag() throws Exception {
|
void runPipelineWithFilterSetsFlag() throws Exception {
|
||||||
PipelineOperation op = new PipelineOperation();
|
PipelineOperation op = new PipelineOperation();
|
||||||
op.setOperation("filter-page-count");
|
op.setOperation("/api/v1/filter/filter-page-count");
|
||||||
op.setParameters(Map.of());
|
op.setParameters(Map.of());
|
||||||
PipelineConfig config = new PipelineConfig();
|
PipelineConfig config = new PipelineConfig();
|
||||||
config.setOperations(List.of(op));
|
config.setOperations(List.of(op));
|
||||||
|
|
||||||
Resource file = new ByteArrayResource("data".getBytes()) {
|
Resource file =
|
||||||
@Override
|
new ByteArrayResource("data".getBytes()) {
|
||||||
public String getFilename() {
|
@Override
|
||||||
return "test.pdf";
|
public String getFilename() {
|
||||||
}
|
return "test.pdf";
|
||||||
};
|
}
|
||||||
|
};
|
||||||
|
|
||||||
List<Resource> files = List.of(file);
|
List<Resource> files = List.of(file);
|
||||||
|
|
||||||
when(apiDocService.isMultiInput("filter-page-count")).thenReturn(false);
|
when(apiDocService.isMultiInput("/api/v1/filter/filter-page-count")).thenReturn(false);
|
||||||
when(apiDocService.getExtensionTypes(false, "filter-page-count"))
|
when(apiDocService.getExtensionTypes(false, "/api/v1/filter/filter-page-count"))
|
||||||
.thenReturn(List.of("pdf"));
|
.thenReturn(List.of("pdf"));
|
||||||
|
when(apiDocService.isValidOperation(eq("/api/v1/filter/filter-page-count"), anyMap()))
|
||||||
|
.thenReturn(true);
|
||||||
|
|
||||||
doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
|
doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
|
||||||
.when(pipelineProcessor)
|
.when(pipelineProcessor)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user