-
-
-
-
-
-
-
diff --git a/source/demo-ui/scripts.js b/source/demo-ui/scripts.js
deleted file mode 100644
index 00437a669..000000000
--- a/source/demo-ui/scripts.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*********************************************************************************************************************
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
- * *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance *
- * with the License. A copy of the License is located at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES *
- * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions *
- * and limitations under the License. *
- *********************************************************************************************************************/
-
-function importOriginalImage() {
- // Gather the bucket name and image key
- const bucketName = $(`#txt-bucket-name`).first().val();
- const keyName = $(`#txt-key-name`).first().val();
- // Assemble the image request
- const request = {
- bucket: bucketName,
- key: keyName
- }
- const strRequest = JSON.stringify(request);
- const encRequest = btoa(strRequest);
- // Import the image data into the element
- $(`#img-original`)
- .attr(`src`, `${appVariables.apiEndpoint}/${encRequest}`)
- .attr(`data-bucket`, bucketName)
- .attr(`data-key`, keyName);
-}
-
-function getPreviewImage() {
- // Gather the editor inputs
- const _width = $(`#editor-width`).first().val();
- const _height = $(`#editor-height`).first().val();
- const _resize = $(`#editor-resize-mode`).first().val();
- const _fillColor = $(`#editor-fill-color`).first().val();
- const _backgroundColor = $(`#editor-background-color`).first().val();
- const _grayscale = $(`#editor-grayscale`).first().prop("checked");
- const _flip = $(`#editor-flip`).first().prop("checked");
- const _flop = $(`#editor-flop`).first().prop("checked");
- const _negative = $(`#editor-negative`).first().prop("checked");
- const _flatten = $(`#editor-flatten`).first().prop("checked");
- const _normalize = $(`#editor-normalize`).first().prop("checked");
- const _rgb = $(`#editor-rgb`).first().val();
- const _smartCrop = $(`#editor-smart-crop`).first().prop("checked");
- const _smartCropIndex = $(`#editor-smart-crop-index`).first().val();
- const _smartCropPadding = $(`#editor-smart-crop-padding`).first().val();
- // Setup the edits object
- const _edits = {}
- _edits.resize = {};
- if (_resize !== "Disabled") {
- if (_width !== "") { _edits.resize.width = Number(_width) }
- if (_height !== "") { _edits.resize.height = Number(_height) }
- _edits.resize.fit = _resize;
- }
- if (_fillColor !== "") { _edits.resize.background = hexToRgbA(_fillColor, 1) }
- if (_backgroundColor !== "") { _edits.flatten = { background: hexToRgbA(_backgroundColor, undefined) }}
- if (_grayscale) { _edits.grayscale = _grayscale }
- if (_flip) { _edits.flip = _flip }
- if (_flop) { _edits.flop = _flop }
- if (_negative) { _edits.negate = _negative }
- if (_flatten) { _edits.flatten = _flatten }
- if (_normalize) { _edits.normalise = _normalize }
- if (_rgb !== "") {
- const input = _rgb.replace(/\s+/g, '');
- const arr = input.split(',');
- const rgb = { r: Number(arr[0]), g: Number(arr[1]), b: Number(arr[2]) };
- _edits.tint = rgb
- }
- if (_smartCrop) {
- _edits.smartCrop = {};
- if (_smartCropIndex !== "") { _edits.smartCrop.faceIndex = Number(_smartCropIndex) }
- if (_smartCropPadding !== "") { _edits.smartCrop.padding = Number(_smartCropPadding) }
- }
- if (Object.keys(_edits.resize).length === 0) { delete _edits.resize };
- // Gather the bucket and key names
- const bucketName = $(`#img-original`).first().attr(`data-bucket`);
- const keyName = $(`#img-original`).first().attr(`data-key`);
- // Set up the request body
- const request = {
- bucket: bucketName,
- key: keyName,
- edits: _edits
- }
- if (Object.keys(request.edits).length === 0) { delete request.edits };
- console.log(request);
- // Setup encoded request
- const str = JSON.stringify(request);
- const enc = btoa(str);
- // Fill the preview image
- $(`#img-preview`).attr(`src`, `${appVariables.apiEndpoint}/${enc}`);
- // Fill the request body field
- $(`#preview-request-body`).html(JSON.stringify(request, undefined, 2));
- // Fill the encoded URL field
- $(`#preview-encoded-url`).val(`${appVariables.apiEndpoint}/${enc}`);
-}
-
-function hexToRgbA(hex, _alpha) {
- var c;
- if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){
- c= hex.substring(1).split('');
- if(c.length== 3){
- c= [c[0], c[0], c[1], c[1], c[2], c[2]];
- }
- c= '0x'+c.join('');
- return { r: ((c>>16)&255), g: ((c>>8)&255), b: (c&255), alpha: Number(_alpha)};
- }
- throw new Error('Bad Hex');
-}
-
-function resetEdits() {
- $('.form-control').val('');
- document.getElementById('editor-resize-mode').selectedIndex = 0;
- $(".form-check-input").prop('checked', false);
-}
\ No newline at end of file
diff --git a/source/demo-ui/style.css b/source/demo-ui/style.css
deleted file mode 100644
index 6b993ace1..000000000
--- a/source/demo-ui/style.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.header {
- background: #37474f !important;
- color: #fff !important;
- padding: 10px 10px 10px 20px !important;
- font-size: 1.2em !important;
-}
-.header-italics {
- color: #b0bec5 !important;
-}
-.content {
- margin-top: 25px !important;
-}
-.card-original-image {
- margin-top: 20px !important;
-}
-#img-original {
- max-height: 100% !important;
- max-width: 100% !important;
-}
-#img-preview {
- max-height: 100% !important;
- max-width: 100% !important;
-}
-
-
-
-.gallery-item {
- width: 30%;
- margin: 1%;
- max-height: auto;
- border: 1px solid gray;
- border-radius: 4px;
- cursor: pointer;
-}
-.gallery-item-selected {
- border: 4px solid #ffa726;
-}
-.preview-code-block {
- background: #cfd8dc !important;
- padding: 8px;
- border-radius: 4px;
-}
-.preview-code-block code {
- color: black !important;
-}
\ No newline at end of file
diff --git a/source/image-handler/image-handler.js b/source/image-handler/image-handler.js
deleted file mode 100644
index e71e2598e..000000000
--- a/source/image-handler/image-handler.js
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-const sharp = require('sharp');
-
-class ImageHandler {
- constructor(s3, rekognition) {
- this.s3 = s3;
- this.rekognition = rekognition;
- }
-
- /**
- * Main method for processing image requests and outputting modified images.
- * @param {ImageRequest} request - An ImageRequest object.
- */
- async process(request) {
- let returnImage = '';
- const originalImage = request.originalImage;
- const edits = request.edits;
-
- if (edits !== undefined && Object.keys(edits).length > 0) {
- let image = null;
- const keys = Object.keys(edits);
-
- if (keys.includes('rotate') && edits.rotate === null) {
- image = sharp(originalImage, { failOnError: false });
- } else {
- const metadata = await sharp(originalImage, { failOnError: false }).metadata();
- if (metadata.orientation) {
- image = sharp(originalImage, { failOnError: false }).withMetadata({ orientation: metadata.orientation });
- } else {
- image = sharp(originalImage, { failOnError: false }).withMetadata();
- }
- }
-
- const modifiedImage = await this.applyEdits(image, edits);
- if (request.outputFormat !== undefined) {
- modifiedImage.toFormat(request.outputFormat);
- }
- const bufferImage = await modifiedImage.toBuffer();
- returnImage = bufferImage.toString('base64');
- } else {
- returnImage = originalImage.toString('base64');
- }
-
- // If the converted image is larger than Lambda's payload hard limit, throw an error.
- const lambdaPayloadLimit = 6 * 1024 * 1024;
- if (returnImage.length > lambdaPayloadLimit) {
- throw {
- status: '413',
- code: 'TooLargeImageException',
- message: 'The converted image is too large to return.'
- };
- }
-
- return returnImage;
- }
-
- /**
- * Applies image modifications to the original image based on edits
- * specified in the ImageRequest.
- * @param {Sharp} image - The original sharp image.
- * @param {object} edits - The edits to be made to the original image.
- */
- async applyEdits(image, edits) {
- if (edits.resize === undefined) {
- edits.resize = {};
- edits.resize.fit = 'inside';
- } else {
- if (edits.resize.width) edits.resize.width = Number(edits.resize.width);
- if (edits.resize.height) edits.resize.height = Number(edits.resize.height);
- }
-
- // Apply the image edits
- for (const editKey in edits) {
- const value = edits[editKey];
- if (editKey === 'overlayWith') {
- const metadata = await image.metadata();
- let imageMetadata = metadata;
- if (edits.resize) {
- let imageBuffer = await image.toBuffer();
- imageMetadata = await sharp(imageBuffer).resize({ edits: { resize: edits.resize }}).metadata();
- }
-
- const { bucket, key, wRatio, hRatio, alpha } = value;
- const overlay = await this.getOverlayImage(bucket, key, wRatio, hRatio, alpha, imageMetadata);
- const overlayMetadata = await sharp(overlay).metadata();
-
- let { options } = value;
- if (options) {
- if (options.left !== undefined) {
- let left = options.left;
- if (isNaN(left) && left.endsWith('p')) {
- left = parseInt(left.replace('p', ''));
- if (left < 0) {
- left = imageMetadata.width + (imageMetadata.width * left / 100) - overlayMetadata.width;
- } else {
- left = imageMetadata.width * left / 100;
- }
- } else {
- left = parseInt(left);
- if (left < 0) {
- left = imageMetadata.width + left - overlayMetadata.width;
- }
- }
- isNaN(left) ? delete options.left : options.left = left;
- }
- if (options.top !== undefined) {
- let top = options.top;
- if (isNaN(top) && top.endsWith('p')) {
- top = parseInt(top.replace('p', ''));
- if (top < 0) {
- top = imageMetadata.height + (imageMetadata.height * top / 100) - overlayMetadata.height;
- } else {
- top = imageMetadata.height * top / 100;
- }
- } else {
- top = parseInt(top);
- if (top < 0) {
- top = imageMetadata.height + top - overlayMetadata.height;
- }
- }
- isNaN(top) ? delete options.top : options.top = top;
- }
- }
-
- const params = [{ ...options, input: overlay }];
- image.composite(params);
- } else if (editKey === 'smartCrop') {
- const options = value;
- const metadata = await image.metadata();
- const imageBuffer = await image.toBuffer();
- const boundingBox = await this.getBoundingBox(imageBuffer, options.faceIndex);
- const cropArea = this.getCropArea(boundingBox, options, metadata);
- try {
- image.extract(cropArea);
- } catch (err) {
- throw {
- status: 400,
- code: 'SmartCrop::PaddingOutOfBounds',
- message: 'The padding value you provided exceeds the boundaries of the original image. Please try choosing a smaller value or applying padding via Sharp for greater specificity.'
- };
- }
- } else {
- image[editKey](value);
- }
- }
- // Return the modified image
- return image;
- }
-
- /**
- * Gets an image to be used as an overlay to the primary image from an
- * Amazon S3 bucket.
- * @param {string} bucket - The name of the bucket containing the overlay.
- * @param {string} key - The object keyname corresponding to the overlay.
- * @param {number} wRatio - The width rate of the overlay image.
- * @param {number} hRatio - The height rate of the overlay image.
- * @param {number} alpha - The transparency alpha to the overlay.
- * @param {object} sourceImageMetadata - The metadata of the source image.
- */
- async getOverlayImage(bucket, key, wRatio, hRatio, alpha, sourceImageMetadata) {
- const params = { Bucket: bucket, Key: key };
- try {
- const { width, height } = sourceImageMetadata;
- const overlayImage = await this.s3.getObject(params).promise();
- let resize = {
- fit: 'inside'
- }
-
- // Set width and height of the watermark image based on the ratio
- const zeroToHundred = /^(100|[1-9]?[0-9])$/;
- if (zeroToHundred.test(wRatio)) {
- resize['width'] = parseInt(width * wRatio / 100);
- }
- if (zeroToHundred.test(hRatio)) {
- resize['height'] = parseInt(height * hRatio / 100);
- }
-
- // If alpha is not within 0-100, the default alpha is 0 (fully opaque).
- if (zeroToHundred.test(alpha)) {
- alpha = parseInt(alpha);
- } else {
- alpha = 0;
- }
-
- const convertedImage = await sharp(overlayImage.Body)
- .resize(resize)
- .composite([{
- input: Buffer.from([255, 255, 255, 255 * (1 - alpha / 100)]),
- raw: {
- width: 1,
- height: 1,
- channels: 4
- },
- tile: true,
- blend: 'dest-in'
- }]).toBuffer();
- return convertedImage;
- } catch (err) {
- throw {
- status: err.statusCode ? err.statusCode : 500,
- code: err.code,
- message: err.message
- };
- }
- }
-
- /**
- * Calculates the crop area for a smart-cropped image based on the bounding
- * box data returned by Amazon Rekognition, as well as padding options and
- * the image metadata.
- * @param {Object} boundingBox - The boudning box of the detected face.
- * @param {Object} options - Set of options for smart cropping.
- * @param {Object} metadata - Sharp image metadata.
- */
- getCropArea(boundingBox, options, metadata) {
- const padding = (options.padding !== undefined) ? parseFloat(options.padding) : 0;
- // Calculate the smart crop area
- const cropArea = {
- left : parseInt((boundingBox.Left * metadata.width) - padding),
- top : parseInt((boundingBox.Top * metadata.height) - padding),
- width : parseInt((boundingBox.Width * metadata.width) + (padding * 2)),
- height : parseInt((boundingBox.Height * metadata.height) + (padding * 2)),
- }
- // Return the crop area
- return cropArea;
- }
-
- /**
- * Gets the bounding box of the specified face index within an image, if specified.
- * @param {Sharp} imageBuffer - The original image.
- * @param {Integer} faceIndex - The zero-based face index value, moving from 0 and up as
- * confidence decreases for detected faces within the image.
- */
- async getBoundingBox(imageBuffer, faceIndex) {
- const params = { Image: { Bytes: imageBuffer }};
- const faceIdx = (faceIndex !== undefined) ? faceIndex : 0;
- try {
- const response = await this.rekognition.detectFaces(params).promise();
- return response.FaceDetails[faceIdx].BoundingBox;
- } catch (err) {
- console.error(err);
- if (err.message === "Cannot read property 'BoundingBox' of undefined") {
- throw {
- status: 400,
- code: 'SmartCrop::FaceIndexOutOfRange',
- message: 'You have provided a FaceIndex value that exceeds the length of the zero-based detectedFaces array. Please specify a value that is in-range.'
- };
- } else {
- throw {
- status: 500,
- code: err.code,
- message: err.message
- };
- }
- }
- }
-}
-
-// Exports
-module.exports = ImageHandler;
diff --git a/source/image-handler/image-request.js b/source/image-handler/image-request.js
deleted file mode 100644
index 8b250fc52..000000000
--- a/source/image-handler/image-request.js
+++ /dev/null
@@ -1,382 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-const ThumborMapping = require('./thumbor-mapping');
-
-class ImageRequest {
- constructor(s3, secretsManager) {
- this.s3 = s3;
- this.secretsManager = secretsManager;
- }
-
- /**
- * Initializer function for creating a new image request, used by the image
- * handler to perform image modifications.
- * @param {object} event - Lambda request body.
- */
- async setup(event) {
- try {
- // Checks signature enabled
- if (process.env.ENABLE_SIGNATURE === 'Yes') {
- const crypto = require('crypto');
- const { path, queryStringParameters } = event;
- if (!queryStringParameters || !queryStringParameters.signature) {
- throw {
- status: 400,
- message: 'Query-string requires the signature parameter.',
- code: 'AuthorizationQueryParametersError'
- };
- }
-
- const { signature } = queryStringParameters;
- try {
- const response = await this.secretsManager.getSecretValue({ SecretId: process.env.SECRETS_MANAGER }).promise();
- const secretString = JSON.parse(response.SecretString);
- const hash = crypto.createHmac('sha256', secretString[process.env.SECRET_KEY]).update(path).digest('hex');
-
- // Signature should be made with the full path.
- if (signature !== hash) {
- throw {
- status: 403,
- message: 'Signature does not match.',
- code: 'SignatureDoesNotMatch'
- };
- }
- } catch (error) {
- if (error.code === 'SignatureDoesNotMatch') {
- throw error;
- }
-
- console.error('Error occurred while checking signature.', error);
- throw {
- status: 500,
- message: 'Signature validation failed.',
- code: 'SignatureValidationFailure'
- };
- }
- }
-
- this.requestType = this.parseRequestType(event);
- this.bucket = this.parseImageBucket(event, this.requestType);
- this.key = this.parseImageKey(event, this.requestType);
- this.edits = this.parseImageEdits(event, this.requestType);
- this.originalImage = await this.getOriginalImage(this.bucket, this.key);
- this.headers = this.parseImageHeaders(event, this.requestType);
-
- if (!this.headers) {
- delete this.headers;
- }
-
- // If the original image is SVG file and it has any edits but no output format, change the format to WebP.
- if (this.ContentType === 'image/svg+xml'
- && this.edits && Object.keys(this.edits).length > 0
- && !this.edits.toFormat) {
- this.outputFormat = 'png'
- }
-
- /* Decide the output format of the image.
- * 1) If the format is provided, the output format is the provided format.
- * 2) If headers contain "Accept: image/webp", the output format is webp.
- * 3) Use the default image format for the rest of cases.
- */
- let outputFormat = this.getOutputFormat(event);
- if (this.edits && this.edits.toFormat) {
- this.outputFormat = this.edits.toFormat;
- } else if (outputFormat) {
- this.outputFormat = outputFormat;
- }
-
- // Fix quality for Thumbor and Custom request type if outputFormat is different from quality type.
- if (this.outputFormat) {
- const requestType = ['Custom', 'Thumbor'];
- const acceptedValues = ['jpeg', 'png', 'webp', 'tiff', 'heif'];
-
- this.ContentType = `image/${this.outputFormat}`;
- if (requestType.includes(this.requestType) && acceptedValues.includes(this.outputFormat)) {
- let qualityKey = Object.keys(this.edits).filter(key => acceptedValues.includes(key))[0];
- if (qualityKey && (qualityKey !== this.outputFormat)) {
- const qualityValue = this.edits[qualityKey];
- this.edits[this.outputFormat] = qualityValue;
- delete this.edits[qualityKey];
- }
- }
- }
-
- delete this.s3;
- delete this.secretsManager;
-
- return this;
- } catch (err) {
- console.error(err);
- throw err;
- }
- }
-
- /**
- * Gets the original image from an Amazon S3 bucket.
- * @param {string} bucket - The name of the bucket containing the image.
- * @param {string} key - The key name corresponding to the image.
- * @return {Promise} - The original image or an error.
- */
- async getOriginalImage(bucket, key) {
- const imageLocation = { Bucket: bucket, Key: key };
- try {
- const originalImage = await this.s3.getObject(imageLocation).promise();
-
- if (originalImage.ContentType) {
- this.ContentType = originalImage.ContentType;
- } else {
- this.ContentType = "image";
- }
-
- if (originalImage.Expires) {
- this.Expires = new Date(originalImage.Expires).toUTCString();
- }
-
- if (originalImage.LastModified) {
- this.LastModified = new Date(originalImage.LastModified).toUTCString();
- }
-
- if (originalImage.CacheControl) {
- this.CacheControl = originalImage.CacheControl;
- } else {
- this.CacheControl = "max-age=31536000,public";
- }
-
- return originalImage.Body;
- } catch(err) {
- throw {
- status: ('NoSuchKey' === err.code) ? 404 : 500,
- code: err.code,
- message: err.message
- };
- }
- }
-
- /**
- * Parses the name of the appropriate Amazon S3 bucket to source the
- * original image from.
- * @param {string} event - Lambda request body.
- * @param {string} requestType - Image handler request type.
- */
- parseImageBucket(event, requestType) {
- if (requestType === "Default") {
- // Decode the image request
- const decoded = this.decodeRequest(event);
- if (decoded.bucket !== undefined) {
- // Check the provided bucket against the allowed list
- const sourceBuckets = this.getAllowedSourceBuckets();
- if (sourceBuckets.includes(decoded.bucket) || decoded.bucket.match(new RegExp('^' + sourceBuckets[0] + '$'))) {
- return decoded.bucket;
- } else {
- throw ({
- status: 403,
- code: 'ImageBucket::CannotAccessBucket',
- message: 'The bucket you specified could not be accessed. Please check that the bucket is specified in your SOURCE_BUCKETS.'
- });
- }
- } else {
- // Try to use the default image source bucket env var
- const sourceBuckets = this.getAllowedSourceBuckets();
- return sourceBuckets[0];
- }
- } else if (requestType === "Thumbor" || requestType === "Custom") {
- // Use the default image source bucket env var
- const sourceBuckets = this.getAllowedSourceBuckets();
- return sourceBuckets[0];
- } else {
- throw ({
- status: 404,
- code: 'ImageBucket::CannotFindBucket',
- message: 'The bucket you specified could not be found. Please check the spelling of the bucket name in your request.'
- });
- }
- }
-
- /**
- * Parses the edits to be made to the original image.
- * @param {string} event - Lambda request body.
- * @param {string} requestType - Image handler request type.
- */
- parseImageEdits(event, requestType) {
- if (requestType === "Default") {
- const decoded = this.decodeRequest(event);
- return decoded.edits;
- } else if (requestType === "Thumbor") {
- const thumborMapping = new ThumborMapping();
- thumborMapping.process(event);
- return thumborMapping.edits;
- } else if (requestType === "Custom") {
- const thumborMapping = new ThumborMapping();
- const parsedPath = thumborMapping.parseCustomPath(event.path);
- thumborMapping.process(parsedPath);
- return thumborMapping.edits;
- } else {
- throw ({
- status: 400,
- code: 'ImageEdits::CannotParseEdits',
- message: 'The edits you provided could not be parsed. Please check the syntax of your request and refer to the documentation for additional guidance.'
- });
- }
- }
-
- /**
- * Parses the name of the appropriate Amazon S3 key corresponding to the
- * original image.
- * @param {String} event - Lambda request body.
- * @param {String} requestType - Type, either "Default", "Thumbor", or "Custom".
- */
- parseImageKey(event, requestType) {
- if (requestType === "Default") {
- // Decode the image request and return the image key
- const decoded = this.decodeRequest(event);
- return decoded.key;
- }
-
- if (requestType === "Thumbor" || requestType === "Custom") {
- let { path } = event;
-
- if (requestType === "Custom") {
- const matchPattern = process.env.REWRITE_MATCH_PATTERN;
- const substitution = process.env.REWRITE_SUBSTITUTION;
-
- if (typeof(matchPattern) === 'string') {
- const patternStrings = matchPattern.split('/');
- const flags = patternStrings.pop();
- const parsedPatternString = matchPattern.slice(1, matchPattern.length - 1 - flags.length);
- const regExp = new RegExp(parsedPatternString, flags);
- path = path.replace(regExp, substitution);
- } else {
- path = path.replace(matchPattern, substitution);
- }
- }
- return decodeURIComponent(path.replace(/\/(\d+x\d+)\/|filters:[^\)]+|\/fit-in+|^\/+/g, '').replace(/\)/g, '').replace(/^\/+/, ''));
- }
-
- // Return an error for all other conditions
- throw ({
- status: 404,
- code: 'ImageEdits::CannotFindImage',
- message: 'The image you specified could not be found. Please check your request syntax as well as the bucket you specified to ensure it exists.'
- });
- }
-
- /**
- * Determines how to handle the request being made based on the URL path
- * prefix to the image request. Categorizes a request as either "image"
- * (uses the Sharp library), "thumbor" (uses Thumbor mapping), or "custom"
- * (uses the rewrite function).
- * @param {object} event - Lambda request body.
- */
- parseRequestType(event) {
- const path = event["path"];
- const matchDefault = new RegExp(/^(\/?)([0-9a-zA-Z+\/]{4})*(([0-9a-zA-Z+\/]{2}==)|([0-9a-zA-Z+\/]{3}=))?$/);
- const matchThumbor = new RegExp(/^(\/?)((fit-in)?|(filters:.+\(.?\))?|(unsafe)?).*(.+jpg|.+png|.+webp|.+tiff|.+jpeg|.+svg)$/i);
- const matchCustom = new RegExp(/(\/?)(.*)(jpg|png|webp|tiff|jpeg|svg)/i);
- const definedEnvironmentVariables = (
- (process.env.REWRITE_MATCH_PATTERN !== "") &&
- (process.env.REWRITE_SUBSTITUTION !== "") &&
- (process.env.REWRITE_MATCH_PATTERN !== undefined) &&
- (process.env.REWRITE_SUBSTITUTION !== undefined)
- );
-
- if (matchDefault.test(path)) { // use sharp
- return 'Default';
- } else if (matchCustom.test(path) && definedEnvironmentVariables) { // use rewrite function then thumbor mappings
- return 'Custom';
- } else if (matchThumbor.test(path)) { // use thumbor mappings
- return 'Thumbor';
- } else {
- throw {
- status: 400,
- code: 'RequestTypeError',
- message: 'The type of request you are making could not be processed. Please ensure that your original image is of a supported file type (jpg, png, tiff, webp, svg) and that your image request is provided in the correct syntax. Refer to the documentation for additional guidance on forming image requests.'
- };
- }
- }
-
- /**
- * Parses the headers to be sent with the response.
- * @param {object} event - Lambda request body.
- * @param {string} requestType - Image handler request type.
- * @return {object} Custom headers
- */
- parseImageHeaders(event, requestType) {
- if (requestType === 'Default') {
- const decoded = this.decodeRequest(event);
- if (decoded.headers) {
- return decoded.headers;
- }
- }
-
- return undefined;
- }
-
- /**
- * Decodes the base64-encoded image request path associated with default
- * image requests. Provides error handling for invalid or undefined path values.
- * @param {object} event - The proxied request object.
- */
- decodeRequest(event) {
- const path = event["path"];
- if (path !== undefined) {
- const encoded = path.charAt(0) === '/' ? path.slice(1) : path;
- const toBuffer = Buffer.from(encoded, 'base64');
- try {
- // To support European characters, 'ascii' was removed.
- return JSON.parse(toBuffer.toString());
- } catch (e) {
- throw ({
- status: 400,
- code: 'DecodeRequest::CannotDecodeRequest',
- message: 'The image request you provided could not be decoded. Please check that your request is base64 encoded properly and refer to the documentation for additional guidance.'
- });
- }
- } else {
- throw ({
- status: 400,
- code: 'DecodeRequest::CannotReadPath',
- message: 'The URL path you provided could not be read. Please ensure that it is properly formed according to the solution documentation.'
- });
- }
- }
-
- /**
- * Returns a formatted image source bucket whitelist as specified in the
- * SOURCE_BUCKETS environment variable of the image handler Lambda
- * function. Provides error handling for missing/invalid values.
- */
- getAllowedSourceBuckets() {
- const sourceBuckets = process.env.SOURCE_BUCKETS;
- if (sourceBuckets === undefined) {
- throw ({
- status: 400,
- code: 'GetAllowedSourceBuckets::NoSourceBuckets',
- message: 'The SOURCE_BUCKETS variable could not be read. Please check that it is not empty and contains at least one source bucket, or multiple buckets separated by commas. Spaces can be provided between commas and bucket names, these will be automatically parsed out when decoding.'
- });
- } else {
- const formatted = sourceBuckets.replace(/\s+/g, '');
- const buckets = formatted.split(',');
- return buckets;
- }
- }
-
- /**
- * Return the output format depending on the accepts headers and request type
- * @param {Object} event - The request body.
- */
- getOutputFormat(event) {
- const autoWebP = process.env.AUTO_WEBP;
- if (autoWebP === 'Yes' && event.headers.Accept && event.headers.Accept.includes('image/webp')) {
- return 'webp';
- } else if (this.requestType === 'Default') {
- const decoded = this.decodeRequest(event);
- return decoded.outputFormat;
- }
-
- return null;
- }
-}
-
-// Exports
-module.exports = ImageRequest;
\ No newline at end of file
diff --git a/source/image-handler/index.js b/source/image-handler/index.js
deleted file mode 100755
index f17b87809..000000000
--- a/source/image-handler/index.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-const AWS = require('aws-sdk');
-const s3 = new AWS.S3();
-const rekognition = new AWS.Rekognition();
-const secretsManager = new AWS.SecretsManager();
-
-const ImageRequest = require('./image-request.js');
-const ImageHandler = require('./image-handler.js');
-
-exports.handler = async (event) => {
- console.log(event);
- const imageRequest = new ImageRequest(s3, secretsManager);
- const imageHandler = new ImageHandler(s3, rekognition);
- const isAlb = event.requestContext && event.requestContext.hasOwnProperty('elb');
-
- try {
- const request = await imageRequest.setup(event);
- console.log(request);
-
- const processedRequest = await imageHandler.process(request);
- const headers = getResponseHeaders(false, isAlb);
- headers["Content-Type"] = request.ContentType;
- headers["Expires"] = request.Expires;
- headers["Last-Modified"] = request.LastModified;
- headers["Cache-Control"] = request.CacheControl;
-
- if (request.headers) {
- // Apply the custom headers overwritting any that may need overwriting
- for (let key in request.headers) {
- headers[key] = request.headers[key];
- }
- }
-
- return {
- statusCode: 200,
- isBase64Encoded: true,
- headers : headers,
- body: processedRequest
- };
- } catch (err) {
- console.error(err);
-
- // Default fallback image
- if (process.env.ENABLE_DEFAULT_FALLBACK_IMAGE === 'Yes'
- && process.env.DEFAULT_FALLBACK_IMAGE_BUCKET
- && process.env.DEFAULT_FALLBACK_IMAGE_BUCKET.replace(/\s/, '') !== ''
- && process.env.DEFAULT_FALLBACK_IMAGE_KEY
- && process.env.DEFAULT_FALLBACK_IMAGE_KEY.replace(/\s/, '') !== '') {
- try {
- const bucket = process.env.DEFAULT_FALLBACK_IMAGE_BUCKET;
- const objectKey = process.env.DEFAULT_FALLBACK_IMAGE_KEY;
- const defaultFallbackImage = await s3.getObject({ Bucket: bucket, Key: objectKey }).promise();
- const headers = getResponseHeaders(false, isAlb);
- headers['Content-Type'] = defaultFallbackImage.ContentType;
- headers['Last-Modified'] = defaultFallbackImage.LastModified;
- headers['Cache-Control'] = 'max-age=31536000,public';
-
- return {
- statusCode: err.status ? err.status : 500,
- isBase64Encoded: true,
- headers: headers,
- body: defaultFallbackImage.Body.toString('base64')
- };
- } catch (error) {
- console.error('Error occurred while getting the default fallback image.', error);
- }
- }
-
- if (err.status) {
- return {
- statusCode: err.status,
- isBase64Encoded: false,
- headers : getResponseHeaders(true, isAlb),
- body: JSON.stringify(err)
- };
- } else {
- return {
- statusCode: 500,
- isBase64Encoded: false,
- headers : getResponseHeaders(true, isAlb),
- body: JSON.stringify({ message: 'Internal error. Please contact the system administrator.', code: 'InternalError', status: 500 })
- };
- }
- }
-}
-
-/**
- * Generates the appropriate set of response headers based on a success
- * or error condition.
- * @param {boolean} isErr - has an error been thrown?
- * @param {boolean} isAlb - is the request from ALB?
- * @return {object} - Headers object
- */
-const getResponseHeaders = (isErr = false, isAlb = false) => {
- const corsEnabled = (process.env.CORS_ENABLED === "Yes");
- const headers = {
- "Access-Control-Allow-Methods": "GET",
- "Access-Control-Allow-Headers": "Content-Type, Authorization"
- }
- if (!isAlb) {
- headers["Access-Control-Allow-Credentials"] = true;
- }
- if (corsEnabled) {
- headers["Access-Control-Allow-Origin"] = process.env.CORS_ORIGIN;
- }
- if (isErr) {
- headers["Content-Type"] = "application/json"
- }
- return headers;
-}
\ No newline at end of file
diff --git a/source/image-handler/jest.config.js b/source/image-handler/jest.config.js
new file mode 100644
index 000000000..d68066734
--- /dev/null
+++ b/source/image-handler/jest.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+ roots: ['
-
-
- Serverless Image Handler Demo
-
-
-
-
-
-
-
-
-
- Image Source
- -
-
-
-
-
-
-
-
-
- Editor
- -
-
-
-
-
-