refactor: update multiform-validator to version 2.2.7

- Updated the CDN links in the README.md file to use the latest version (2.2.7) of multiform-validator.
- Updated the version number in the package.json file to 2.2.7.
- Refactored the type definitions and error messages in the validateEmail.ts file.
- Updated the module code generation in the tsconfig.json file to use CommonJS instead of ES6.
- Added new test cases for invalid PNG, JPEG, and GIF images in the tests folder.
- Generated fake PNG, JPEG, and GIF images for testing purposes.

Author: gabriel-logan

.yarn/install-state.gz

@@ -20,12 +20,12 @@ Feel free to find bugs and report them to me. Your feedback is highly appreciate
 jsDelivr:
 
 ```bash
-https://cdn.jsdelivr.net/npm/multiform-validator@2.2.3/+esm
+https://cdn.jsdelivr.net/npm/multiform-validator@2.2.7/+esm
 ```
 
 ```html
 <script type="module">
-	import multiform-validator from "https://cdn.jsdelivr.net/npm/multiform-validator@2.2.3/+esm"
+	import multiform-validator from "https://cdn.jsdelivr.net/npm/multiform-validator@2.2.7/+esm"
 </script>
 ```
 
@@ -71,7 +71,7 @@ using esm:
 
 ```html
 <script type="module">
-	import multiformValidator from "https://cdn.jsdelivr.net/npm/multiform-validator@2.2.3/+esm";
+	import multiformValidator from "https://cdn.jsdelivr.net/npm/multiform-validator@2.2.7/+esm";
 	const emailResult = multiformValidator.isEmail("123456");
 	const cpfResult = multiformValidator.cpfIsValid("123456");
 

README.md

@@ -1,6 +1,6 @@
 {
 	"name": "multiform-validator",
-	"version": "2.2.6",
+	"version": "2.2.7",
 	"description": "Javascript library made to validate, several form fields, such as: email, images, phone, password, cpf etc.",
 	"main": "./dist/cjs/index.cjs",
 	"module": "./dist/esm/index.mjs",

package.json

@@ -1,9 +1,23 @@
 export default function validateGif(fileBuffer: Buffer): boolean {
-	const isGif: boolean =
-		fileBuffer[0] == 0x47 &&
-		fileBuffer[1] == 0x49 &&
-		fileBuffer[2] == 0x46 &&
-		fileBuffer[3] == 0x38;
+	const isGifSignature: boolean =
+		fileBuffer[0] === 0x47 && // 'G'
+		fileBuffer[1] === 0x49 && // 'I'
+		fileBuffer[2] === 0x46 && // 'F'
+		fileBuffer[3] === 0x38 && // '8'
+		(fileBuffer[4] === 0x39 || fileBuffer[4] === 0x37) && // '9' ou '7'
+		fileBuffer[5] === 0x61; // 'a'
 
-	return isGif;
+	if (isGifSignature) {
+		const fileSize: number = fileBuffer.length;
+		// The GIF ends with 0x00 0x3B (end marker)
+		if (
+			fileBuffer[fileSize - 2] === 0x00 &&
+			fileBuffer[fileSize - 1] === 0x3b
+		) {
+			return true;
+		}
+		return false; // Corrupted or invalid GIF file
+	}
+
+	return isGifSignature;
 }

src/isValidImage/validateGif.ts

@@ -1,6 +1,9 @@
 export default function validateIco(fileBuffer: Buffer): boolean {
 	const isIco: boolean =
-		fileBuffer[0] === 0x00 && fileBuffer[1] === 0x00 && fileBuffer[2] === 0x01;
+		fileBuffer[0] === 0x00 &&
+		fileBuffer[1] === 0x00 &&
+		fileBuffer[2] === 0x01 &&
+		fileBuffer[3] === 0x00;
 
 	return isIco;
 }

src/isValidImage/validateIco.ts

@@ -1,6 +1,21 @@
 export default function validateJpeg(fileBuffer: Buffer): boolean {
-	const isJpeg: boolean =
+	const jpegSignature: boolean =
 		fileBuffer[0] === 0xff && fileBuffer[1] === 0xd8 && fileBuffer[2] === 0xff;
 
-	return isJpeg;
+	if (jpegSignature) {
+		const fileSize: number = fileBuffer.length;
+		// Valid JPEG ends with marker 0xFF, 0xD9
+
+		// Check if the last two bytes are 0xFF, 0xD9
+		if (
+			fileBuffer[fileSize - 2] !== 0xff ||
+			fileBuffer[fileSize - 1] !== 0xd9
+		) {
+			return false;
+		}
+
+		return true;
+	}
+
+	return jpegSignature;
 }

src/isValidImage/validateJpeg.ts

@@ -1,9 +1,26 @@
 export default function validatePng(fileBuffer: Buffer): boolean {
-	const isPng: boolean =
+	const pngSignature: boolean =
 		fileBuffer[0] === 0x89 &&
 		fileBuffer[1] === 0x50 &&
 		fileBuffer[2] === 0x4e &&
-		fileBuffer[3] === 0x47;
+		fileBuffer[3] === 0x47 &&
+		fileBuffer[4] === 0x0d &&
+		fileBuffer[5] === 0x0a &&
+		fileBuffer[6] === 0x1a &&
+		fileBuffer[7] === 0x0a;
 
-	return isPng;
+	if (pngSignature) {
+		const fileSize: number = fileBuffer.length;
+		// A valid PNG structure has a specific byte sequence at the end
+		const pngEndSignature: number[] = [
+			0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+		];
+		for (let i: number = 0; i < pngEndSignature.length; i++) {
+			if (fileBuffer[fileSize - 8 + i] !== pngEndSignature[i]) {
+				return false; // PNG file is corrupt or invalid
+			}
+		}
+	}
+
+	return pngSignature;
 }

src/isValidImage/validatePng.ts

@@ -0,0 +1,21 @@
+const fs = require('fs');
+
+// Assinatura PNG: [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]
+const pngSignature = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
+const fakePNG = new Uint8Array([...pngSignature, ...new Array(100).fill(0)]); // 100 bytes extras vazios
+fs.writeFileSync('fake.png', fakePNG);
+
+// Assinatura GIF: [0x47, 0x49, 0x46, 0x38, 0x37, 0x61] (GIF89a) ou [0x47, 0x49, 0x46, 0x38, 0x37, 0x61] (GIF87a)
+const gifSignature = [0x47, 0x49, 0x46, 0x38, 0x37, 0x61];
+const fakeGIF = new Uint8Array([...gifSignature, ...new Array(100).fill(0)]); // 100 bytes extras vazios
+fs.writeFileSync('fake87a.gif', fakeGIF);
+
+// Assinatura GIF89a: [0x47, 0x49, 0x46, 0x38, 0x39, 0x61]
+const gif89aSignature = [0x47, 0x49, 0x46, 0x38, 0x39, 0x61];
+const fakeGIF89a = new Uint8Array([...gif89aSignature, ...new Array(100).fill(0)]); // 100 bytes extras vazios
+fs.writeFileSync('fake89a.gif', fakeGIF89a);
+
+// Assinatura JPEG: [0xFF, 0xD8, 0xFF]
+const jpegSignature = [0xFF, 0xD8, 0xFF];
+const fakeJPEG = new Uint8Array([...jpegSignature, ...new Array(100).fill(0)]); // 100 bytes extras vazios
+fs.writeFileSync('fake.jpeg', fakeJPEG);

tests/assets/isValidImage/invalid/fake.jpeg

@@ -10,7 +10,11 @@ describe("isValidImage", () => {
 		fileBuffer5: Buffer,
 		fileBuffer6: Buffer,
 		fileBuffer7: Buffer,
-		fileBuffer8: Buffer;
+		fileBuffer8: Buffer,
+		fileBuffer9: Buffer,
+		fileBuffer10: Buffer,
+		fileBuffer11: Buffer,
+		fileBuffer12: Buffer;
 
 	beforeAll(() => {
 		fileBuffer1 = fs.readFileSync(
@@ -93,6 +97,47 @@ describe("isValidImage", () => {
 				"valid.gif",
 			),
 		); // Valid GIF image
+		fileBuffer9 = fs.readFileSync(
+			path.join(
+				__dirname,
+				"..",
+				"assets",
+				"isValidImage",
+				"invalid",
+				"fake.png",
+			),
+		); // Invalid Png image
+		fileBuffer10 = fs.readFileSync(
+			path.join(
+				__dirname,
+				"..",
+				"assets",
+				"isValidImage",
+				"invalid",
+				"fake.jpeg",
+			),
+		); // Invalid JPEG image
+		fileBuffer11 = fs.readFileSync(
+			path.join(
+				__dirname,
+				"..",
+				"assets",
+				"isValidImage",
+				"invalid",
+				"fake87a.gif",
+			),
+		); // Invalid GIF 87a image
+
+		fileBuffer12 = fs.readFileSync(
+			path.join(
+				__dirname,
+				"..",
+				"assets",
+				"isValidImage",
+				"invalid",
+				"fake89a.gif",
+			),
+		); // Invalid GIF 89a image
 	});
 
 	it("should return false for an empty buffer", () => {
@@ -202,5 +247,29 @@ describe("isValidImage", () => {
 		const result = isValidImage(fileBuffer8, { exclude: ["ico"] });
 		expect(result).toBe(true);
 	});
+
+	it("should return false for an invalid PNG image with headers corrects", () => {
+		const result = isValidImage(fileBuffer9, { exclude: ["gif", "ico", "jpeg"]});
+		expect(result).toBe(false);
+	});
+
+	it("should return false if validations break in png image", () => {
+		expect(isValidImage("null" as any)).toBe(false);
+	});
+
+	it("should return false for an invalid JPEG image with headers corrects", () => {
+		const result = isValidImage(fileBuffer10, { exclude: ["gif", "ico", "png"]});
+		expect(result).toBe(false);
+	});
+
+	it("should return false for an invalid GIF image with headers corrects", () => {
+		const result = isValidImage(fileBuffer11, { exclude: ["jpeg", "ico", "png"]});
+		expect(result).toBe(false);
+	});
+
+	it("should return false for an invalid GIF image with headers corrects", () => {
+		const result = isValidImage(fileBuffer12, { exclude: ["jpeg", "ico", "png"]});
+		expect(result).toBe(false);
+	});
 });
 export default isValidImage;

tests/assets/isValidImage/invalid/fake.png

@@ -25,7 +25,7 @@
 		// "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
 		/* Modules */
-		"module": "ES6" /* Specify what module code is generated. */,
+		"module": "CommonJS" /* Specify what module code is generated. */,
 		// "rootDir": "./src",                                  /* Specify the root folder within your source files. */
 		// "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
 		// "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */