mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
MNT-16381 Transformers must validate the content stream mimetype
- Addition of AbstractContentTransformer2.strictMimeTypeCheck(...) to check that the declared mimetype is the same as the Tika derived mimetype. Controlled by a new alfresco global property content.transformer.strict.mimetype.check (set to true by default). - Added the UnsupportedTransformationException to a number of transformation callers as they should have been handling it already. - Modified DifferrentMimeTypeTest to test the new strictMimeTypeCheck. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -2675,45 +2675,14 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
|
||||
final NodeRef sourceNodeRef = nodeRef;
|
||||
|
||||
// the delegate definition for transforming a document
|
||||
Transformer transformer = new Transformer()
|
||||
Transformer transformer = new AbstractTransformer()
|
||||
{
|
||||
public ScriptNode transform(ContentService contentService, NodeRef nodeRef, ContentReader reader,
|
||||
ContentWriter writer)
|
||||
protected void doTransform(ContentService contentService,
|
||||
ContentReader reader, ContentWriter writer)
|
||||
{
|
||||
ScriptNode transformedNode = null;
|
||||
TransformationOptions options = new TransformationOptions();
|
||||
options.setSourceNodeRef(sourceNodeRef);
|
||||
|
||||
try
|
||||
{
|
||||
contentService.transform(reader, writer, options);
|
||||
transformedNode = newInstance(nodeRef, services, scope);
|
||||
}
|
||||
catch (NoTransformerException e)
|
||||
{
|
||||
// ignore
|
||||
}
|
||||
catch (AlfrescoRuntimeException e)
|
||||
{
|
||||
Throwable rootCause = ((AlfrescoRuntimeException)e).getRootCause();
|
||||
String message = rootCause.getMessage();
|
||||
message = message == null ? "" : message;
|
||||
if (rootCause instanceof UnimportantTransformException)
|
||||
{
|
||||
logger.debug(message);
|
||||
// ignore
|
||||
}
|
||||
else if (rootCause instanceof UnsupportedTransformationException)
|
||||
{
|
||||
logger.error(message);
|
||||
// ignore
|
||||
}
|
||||
else
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
return transformedNode;
|
||||
contentService.transform(reader, writer, options);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -2828,10 +2797,10 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
|
||||
final NodeRef sourceNodeRef = nodeRef;
|
||||
|
||||
// the delegate definition for transforming an image
|
||||
Transformer transformer = new Transformer()
|
||||
Transformer transformer = new AbstractTransformer()
|
||||
{
|
||||
public ScriptNode transform(ContentService contentService, NodeRef nodeRef, ContentReader reader,
|
||||
ContentWriter writer)
|
||||
protected void doTransform(ContentService contentService,
|
||||
ContentReader reader, ContentWriter writer)
|
||||
{
|
||||
ImageTransformationOptions imageOptions = new ImageTransformationOptions();
|
||||
imageOptions.setSourceNodeRef(sourceNodeRef);
|
||||
@@ -2841,8 +2810,6 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
|
||||
imageOptions.setCommandOptions(options);
|
||||
}
|
||||
contentService.getImageTransformer().transform(reader, writer, imageOptions);
|
||||
|
||||
return newInstance(nodeRef, services, scope);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -4114,10 +4081,53 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
|
||||
*
|
||||
* @return Node representing the transformed entity
|
||||
*/
|
||||
ScriptNode transform(ContentService contentService, NodeRef noderef, ContentReader reader, ContentWriter writer);
|
||||
ScriptNode transform(ContentService contentService, NodeRef noderef,
|
||||
ContentReader reader, ContentWriter writer);
|
||||
}
|
||||
|
||||
|
||||
private abstract class AbstractTransformer implements Transformer
|
||||
{
|
||||
public ScriptNode transform(ContentService contentService, NodeRef nodeRef,
|
||||
ContentReader reader, ContentWriter writer)
|
||||
{
|
||||
ScriptNode transformedNode = null;
|
||||
|
||||
try
|
||||
{
|
||||
doTransform(contentService, reader, writer);
|
||||
transformedNode = newInstance(nodeRef, services, scope);
|
||||
}
|
||||
catch (NoTransformerException e)
|
||||
{
|
||||
// ignore
|
||||
}
|
||||
catch (AlfrescoRuntimeException e)
|
||||
{
|
||||
Throwable rootCause = ((AlfrescoRuntimeException)e).getRootCause();
|
||||
String message = rootCause.getMessage();
|
||||
message = message == null ? "" : message;
|
||||
if (rootCause instanceof UnimportantTransformException)
|
||||
{
|
||||
logger.debug(message);
|
||||
// ignore
|
||||
}
|
||||
else if (rootCause instanceof UnsupportedTransformationException)
|
||||
{
|
||||
logger.error(message);
|
||||
// ignore
|
||||
}
|
||||
else
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
return transformedNode;
|
||||
}
|
||||
|
||||
protected abstract void doTransform(ContentService contentService,
|
||||
ContentReader reader, ContentWriter writer);
|
||||
};
|
||||
|
||||
/**
|
||||
* NamespacePrefixResolverProvider getter implementation
|
||||
*/
|
||||
|
Reference in New Issue
Block a user