Merge branch 'ATS-158' into 'master'

ATS-158 : T-Engine - ImageMagick: security fix - remove commandOptions (from JSON-based interface)

See merge request Repository/alfresco-docker-transformers!21
This commit is contained in:
Denis Ungureanu 2018-10-25 10:09:31 +01:00
commit 022683eb71

View File

@ -201,10 +201,9 @@ public class ImageMagickController extends AbstractTransformerController
Boolean resizePercentage = stringToBoolean(transformOptions.get("resizePercentage"));
Boolean allowEnlargement = stringToBoolean(transformOptions.get("allowEnlargement"));
Boolean maintainAspectRatio = stringToBoolean(transformOptions.get("maintainAspectRatio"));
String commandOptions = transformOptions.get("commandOptions");
String options = buildTransformOptions(startPage, endPage , alphaRemove, autoOrient, cropGravity, cropWidth, cropHeight, cropPercentage,
cropXOffset, cropYOffset, thumbnail, resizeWidth, resizeHeight, resizePercentage, allowEnlargement, maintainAspectRatio, commandOptions);
cropXOffset, cropYOffset, thumbnail, resizeWidth, resizeHeight, resizePercentage, allowEnlargement, maintainAspectRatio, null);
String pageRange = calculatePageRange(startPage, endPage);
executeTransformCommand(options, sourceFile, pageRange, targetFile, timeout);