Compare commits

..

11 Commits

Author SHA1 Message Date
n1474335
0e72d78731 5.4.0 2017-05-13 16:10:26 +01:00
n1474335
768609e357 Whitespace 2017-05-13 16:09:32 +01:00
n1474335
526a157421 Merge branch 'tlwr-feature-exif' 2017-05-13 16:08:39 +01:00
n1474335
62154309fb Newlines 2017-05-13 16:08:14 +01:00
n1474335
ad74e6c475 Merge branch 'feature-exif' of https://github.com/tlwr/CyberChef into tlwr-feature-exif 2017-05-13 15:59:48 +01:00
toby
82d28242cc Add JSDoc to the runEXIF function in Image.js 2017-05-09 15:34:18 -04:00
toby
60fddf837d Change let to const in "Extract EXIF" 2017-05-08 12:49:13 -04:00
toby
ee25df0c28 Add desc and fix error message for "Extract EXIF" 2017-05-08 12:48:43 -04:00
toby
478af40359 Fix "Extract EXIF" tests 2017-05-08 12:45:42 -04:00
toby
71796e3dbf Merge remote-tracking branch 'upstream/master' into feature-exif 2017-05-06 23:38:04 -04:00
toby
1b8a25ec88 Add "Extract EXIF" operation 2017-04-29 16:06:16 -04:00
6 changed files with 160 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "cyberchef",
"version": "5.3.5",
"version": "5.4.0",
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
"author": "n1474335 <n1474335@gmail.com>",
"homepage": "https://gchq.github.io/CyberChef",
@@ -69,6 +69,7 @@
"escodegen": "^1.8.1",
"esmangle": "^1.0.1",
"esprima": "^3.1.3",
"exif-parser": "^0.1.9",
"google-code-prettify": "^1.0.5",
"jquery": "^3.1.1",
"jsbn": "^1.1.0",

View File

@@ -207,6 +207,7 @@ const Categories = [
"Regular expression",
"XPath expression",
"CSS selector",
"Extract EXIF",
]
},
{

View File

@@ -15,6 +15,7 @@ import Endian from "../operations/Endian.js";
import Entropy from "../operations/Entropy.js";
import Extract from "../operations/Extract.js";
import FileType from "../operations/FileType.js";
import Image from "../operations/Image.js";
import Hash from "../operations/Hash.js";
import Hexdump from "../operations/Hexdump.js";
import HTML from "../operations/HTML.js";
@@ -3336,6 +3337,19 @@ const OperationConfig = {
},
]
},
"Extract EXIF": {
description: [
"Extracts EXIF data from an image.",
"<br><br>",
"EXIF data is metadata embedded in images (JPEG, JPG, TIFF) and audio files.",
"<br><br>",
"EXIF data from photos usually contains information about the image file itself as well as the device used to create it.",
].join("\n"),
run: Image.runEXIF,
inputType: "byteArray",
outputType: "string",
args: [],
},
};
export default OperationConfig;

View File

@@ -0,0 +1,47 @@
import * as ExifParser from "exif-parser";
import Utils from "../Utils.js";
/**
* Image operations.
*
* @author tlwr [toby@toby.codes]
* @copyright Crown Copyright 2017
* @license Apache-2.0
*
* @namespace
*/
const Image = {
/**
* Extract EXIF operation.
*
* Extracts EXIF data from a byteArray, representing a JPG or a TIFF image.
*
* @param {byteArray} input
* @param {Object[]} args
* @returns {string}
*/
runEXIF(input, args) {
try {
const bytes = Uint8Array.from(input);
const parser = ExifParser.create(bytes.buffer);
const result = parser.parse();
let lines = [];
for (let tagName in result.tags) {
let value = result.tags[tagName];
lines.push(`${tagName}: ${value}`);
}
const numTags = lines.length;
lines.unshift(`Found ${numTags} tags.\n`);
return lines.join("\n");
} catch (err) {
throw "Could not extract EXIF data from image: " + err;
}
},
};
export default Image;

View File

@@ -16,6 +16,7 @@ import "./tests/operations/ByteRepr.js";
import "./tests/operations/Code.js";
import "./tests/operations/Compress.js";
import "./tests/operations/FlowControl.js";
import "./tests/operations/Image.js";
import "./tests/operations/MorseCode.js";
import "./tests/operations/StrUtils.js";

File diff suppressed because one or more lines are too long