Skip to content

fix false negative check on UUID v7 and v8 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2025
Merged

fix false negative check on UUID v7 and v8 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9468eaa
fix false negative check on UUID v7 and v8
Freezystem Apr 29, 2025
e224d41
add tests for uuid v7 and v8
Freezystem Apr 30, 2025
16458e3
update types and TypeScript tests
Freezystem Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ export interface RuleUUID extends RuleCustom {
/**
* UUID version in range 0-6
*/
version?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
version?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
}

export interface RuleObjectID extends RuleCustom {
Expand Down
6 changes: 4 additions & 2 deletions lib/rules/uuid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

const PATTERN = /^([0-9a-f]{8}-[0-9a-f]{4}-[1-6][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}|[0]{8}-[0]{4}-[0]{4}-[0]{4}-[0]{12})$/i;
const PATTERN = /^([0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}|[0]{8}-[0]{4}-[0]{4}-[0]{4}-[0]{12})$/i;

/** Signature: function(value, field, parent, errors, context)
*/
Expand All @@ -21,7 +21,7 @@ module.exports = function({ schema, messages }, path) {
const version = val.charAt(14) | 0;
`);

if(parseInt(schema.version) < 7) {
if(parseInt(schema.version) < 9) {
src.push(`
if (${schema.version} !== version) {
${this.makeError({ type: "uuidVersion", expected: schema.version, actual: "version", messages })}
Expand All @@ -40,6 +40,8 @@ module.exports = function({ schema, messages }, path) {
case 3:
case 4:
case 5:
case 7:
case 8:
if (["8", "9", "a", "b"].indexOf(val.charAt(19)) === -1) {
${this.makeError({ type: "uuid", actual: "value", messages })}
}
Expand Down
12 changes: 12 additions & 0 deletions test/rules/uuid.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe("Test rule: uuid", () => {
const check3 = v.compile({ $$root: true, type: "uuid", version: 3 });
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check7 = v.compile({ $$root: true, type: "uuid", version: 7 });
message = "The '' field must be a valid UUID version provided.";

expect(check0("00000000-0000-1000-0000-000000000000")).toEqual([{"actual": 1, "expected": 0, "type": "uuidVersion", message}]);
Expand All @@ -47,6 +48,7 @@ describe("Test rule: uuid", () => {
expect(check3("9a7b330a-a736-41e5-af7f-feaf819cdc9f")).toEqual([{"actual": 4, "expected": 3, "type": "uuidVersion", message}]);
expect(check4("9a7b330a-a736-21e5-af7f-feaf819cdc9f")).toEqual([{"actual": 2, "expected": 4, "type": "uuidVersion", message}]);
expect(check5("9a7b330a-a736-11e5-af7f-feaf819cdc9f")).toEqual([{"actual": 1, "expected": 5, "type": "uuidVersion", message}]);
expect(check7("019681ac-4f0f-86a2-866e-5408b2d861f8")).toEqual([{"actual": 8, "expected": 7, "type": "uuidVersion", message}]);
});

it("check valid version", () => {
Expand All @@ -57,6 +59,8 @@ describe("Test rule: uuid", () => {
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 });
const check7 = v.compile({ $$root: true, type: "uuid", version: 7 });
const check8 = v.compile({ $$root: true, type: "uuid", version: 8 });

expect(check0("00000000-0000-0000-0000-000000000000")).toEqual(true);
expect(check1("45745c60-7b1a-11e8-9c9c-2d42b21b1a3e")).toEqual(true);
Expand All @@ -65,6 +69,8 @@ describe("Test rule: uuid", () => {
expect(check4("10ba038e-48da-487b-96e8-8d3b99b6d18a")).toEqual(true);
expect(check5("fdda765f-fc57-5604-a269-52a7df8164ec")).toEqual(true);
expect(check6("a9030619-8514-6970-e0f9-81b9ceb08a5f")).toEqual(true);
expect(check7("01965dfe-77ac-78e2-9f69-51e5ce8bd080")).toEqual(true);
expect(check8("019681ac-4f0f-86a2-866e-5408b2d861f8")).toEqual(true);
});

it("should not be case insensitive", () => {
Expand All @@ -74,20 +80,26 @@ describe("Test rule: uuid", () => {
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 });
const check7 = v.compile({ $$root: true, type: "uuid", version: 7 });
const check8 = v.compile({ $$root: true, type: "uuid", version: 8 });

expect(check1("45745c60-7b1a-11e8-9c9c-2d42b21b1a3e")).toEqual(true);
expect(check2("9a7b330a-a736-21e5-af7f-feaf819cdc9f")).toEqual(true);
expect(check3("9125a8dc-52ee-365b-a5aa-81b0b3681cf6")).toEqual(true);
expect(check4("10ba038e-48da-487b-96e8-8d3b99b6d18a")).toEqual(true);
expect(check5("fdda765f-fc57-5604-a269-52a7df8164ec")).toEqual(true);
expect(check6("a9030619-8514-6970-e0f9-81b9ceb08a5f")).toEqual(true);
expect(check7("01965dfe-77ac-78e2-9f69-51e5ce8bd080")).toEqual(true);
expect(check8("019681ac-4f0f-86a2-866e-5408b2d861f8")).toEqual(true);

expect(check1("45745C60-7B1A-11E8-9C9C-2D42B21B1A3E")).toEqual(true);
expect(check2("9A7B330A-A736-21E5-AF7F-FEAF819CDC9F")).toEqual(true);
expect(check3("9125A8DC-52EE-365B-A5AA-81B0B3681CF6")).toEqual(true);
expect(check4("10BA038E-48DA-487B-96E8-8D3B99B6D18A")).toEqual(true);
expect(check5("FDDA765F-FC57-5604-A269-52A7DF8164EC")).toEqual(true);
expect(check6("A9030619-8514-6970-E0F9-81B9CEB08A5F")).toEqual(true);
expect(check7("01965DFE-77AC-78E2-9F69-51E5CE8BD080")).toEqual(true);
expect(check8("019681AC-4F0F-86A2-866E-5408B2D861F8")).toEqual(true);
});

it("should allow custom metas", async () => {
Expand Down
14 changes: 14 additions & 0 deletions test/typescript/rules/uuid.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ describe('TypeScript Definitions', () => {
const check3 = v.compile({ $$root: true, type: 'uuid', version: 3 } as RuleUUID);
const check4 = v.compile({ $$root: true, type: 'uuid', version: 4 } as RuleUUID);
const check5 = v.compile({ $$root: true, type: 'uuid', version: 5 } as RuleUUID);
const check7 = v.compile({ $$root: true, type: 'uuid', version: 7 } as RuleUUID);
message = 'The \'\' field must be a valid UUID version provided.';

expect(check0("00000000-0000-1000-0000-000000000000")).toEqual([{ "actual": 1, "expected": 0, "type": "uuidVersion", message }]);
Expand All @@ -45,6 +46,7 @@ describe('TypeScript Definitions', () => {
expect(check3('9a7b330a-a736-41e5-af7f-feaf819cdc9f')).toEqual([{ 'actual': 4, 'expected': 3, 'type': 'uuidVersion', message }]);
expect(check4('9a7b330a-a736-21e5-af7f-feaf819cdc9f')).toEqual([{ 'actual': 2, 'expected': 4, 'type': 'uuidVersion', message }]);
expect(check5('9a7b330a-a736-11e5-af7f-feaf819cdc9f')).toEqual([{ 'actual': 1, 'expected': 5, 'type': 'uuidVersion', message }]);
expect(check7("019681ac-4f0f-86a2-866e-5408b2d861f8")).toEqual([{"actual": 8, "expected": 7, "type": "uuidVersion", message}]);
});

it('check valid version', () => {
Expand All @@ -54,13 +56,19 @@ describe('TypeScript Definitions', () => {
const check3 = v.compile({ $$root: true, type: 'uuid', version: 3 } as RuleUUID);
const check4 = v.compile({ $$root: true, type: 'uuid', version: 4 } as RuleUUID);
const check5 = v.compile({ $$root: true, type: 'uuid', version: 5 } as RuleUUID);
const check6 = v.compile({ $$root: true, type: 'uuid', version: 6 } as RuleUUID);
const check7 = v.compile({ $$root: true, type: 'uuid', version: 7 } as RuleUUID);
const check8 = v.compile({ $$root: true, type: 'uuid', version: 8 } as RuleUUID);

expect(check0("00000000-0000-0000-0000-000000000000")).toEqual(true);
expect(check1('45745c60-7b1a-11e8-9c9c-2d42b21b1a3e')).toEqual(true);
expect(check2('9a7b330a-a736-21e5-af7f-feaf819cdc9f')).toEqual(true);
expect(check3('9125a8dc-52ee-365b-a5aa-81b0b3681cf6')).toEqual(true);
expect(check4('10ba038e-48da-487b-96e8-8d3b99b6d18a')).toEqual(true);
expect(check5('fdda765f-fc57-5604-a269-52a7df8164ec')).toEqual(true);
expect(check6('a9030619-8514-6970-e0f9-81b9ceb08a5f')).toEqual(true);
expect(check7('01965dfe-77ac-78e2-9f69-51e5ce8bd080')).toEqual(true);
expect(check8('019681ac-4f0f-86a2-866e-5408b2d861f8')).toEqual(true);
});

it("should not be case insensitive", () => {
Expand All @@ -70,20 +78,26 @@ describe('TypeScript Definitions', () => {
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 } as RuleUUID);
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 } as RuleUUID);
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 } as RuleUUID);
const check7 = v.compile({ $$root: true, type: 'uuid', version: 7 } as RuleUUID);
const check8 = v.compile({ $$root: true, type: 'uuid', version: 8 } as RuleUUID);

expect(check1("45745c60-7b1a-11e8-9c9c-2d42b21b1a3e")).toEqual(true);
expect(check2("9a7b330a-a736-21e5-af7f-feaf819cdc9f")).toEqual(true);
expect(check3("9125a8dc-52ee-365b-a5aa-81b0b3681cf6")).toEqual(true);
expect(check4("10ba038e-48da-487b-96e8-8d3b99b6d18a")).toEqual(true);
expect(check5("fdda765f-fc57-5604-a269-52a7df8164ec")).toEqual(true);
expect(check6("a9030619-8514-6970-e0f9-81b9ceb08a5f")).toEqual(true);
expect(check7("01965dfe-77ac-78e2-9f69-51e5ce8bd080")).toEqual(true);
expect(check8("019681ac-4f0f-86a2-866e-5408b2d861f8")).toEqual(true);

expect(check1("45745C60-7B1A-11E8-9C9C-2D42B21B1A3E")).toEqual(true);
expect(check2("9A7B330A-A736-21E5-AF7F-FEAF819CDC9F")).toEqual(true);
expect(check3("9125A8DC-52EE-365B-A5AA-81B0B3681CF6")).toEqual(true);
expect(check4("10BA038E-48DA-487B-96E8-8D3B99B6D18A")).toEqual(true);
expect(check5("FDDA765F-FC57-5604-A269-52A7DF8164EC")).toEqual(true);
expect(check6("A9030619-8514-6970-E0F9-81B9CEB08A5F")).toEqual(true);
expect(check7("01965DFE-77AC-78E2-9F69-51E5CE8BD080")).toEqual(true);
expect(check8("019681AC-4F0F-86A2-866E-5408B2D861F8")).toEqual(true);
});
});
});