Miko/node-metaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UUID validation

Browse Source
This commit is contained in:
Casper Warden
2025-06-19 17:49:02 +01:00
parent 7d67d4b175
commit 3a6aaac4be
6 changed files with 4656 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/LoginHandler.ts
View File

@@ -77,7 +77,7 @@ export class LoginHandler
// Ignore any error
}
if (hardwareID === null || !validator.isUUID(String(hardwareID)))
if (hardwareID === null || !validator.isUUID(String(hardwareID), 'loose'))
{
hardwareID = UUID.random().toString();
await fs.promises.writeFile(hardwareIDFile, JSON.stringify({ id0: hardwareID }));

6
lib/classes/EventQueueClient.ts
View File

@@ -20,7 +20,7 @@ import { InventoryLibrary } from '../enums/InventoryLibrary';
import { LandStatsEvent } from '../events/LandStatsEvent';
import * as LLSD from '@caspertech/llsd';
import type { CancelableRequest, Response } from 'got';
import type { CancelableRequest, Response as GotResponse } from 'got';
import got from 'got';
import * as Long from 'long';
@@ -30,7 +30,7 @@ export class EventQueueClient
public ack?: number;
public done = false;
private currentRequest?: CancelableRequest<Response<string>> = undefined;
private currentRequest?: CancelableRequest<GotResponse<string>> = undefined;
private readonly clientEvents: ClientEvents;
private readonly agent: Agent;
@@ -578,7 +578,7 @@ export class EventQueueClient
}
public async request(url: string, data: string, contentType: string): Promise<string>
{
let req: CancelableRequest<Response<string>> | undefined = undefined;
let req: CancelableRequest<GotResponse<string>> | undefined = undefined;
try
{
req = got.post(url, {

6
lib/classes/UUID.ts
View File

@@ -76,7 +76,7 @@ export class UUID
}
if (typeof obj[param] === 'string')
{
if (validator.isUUID(obj[param]))
if (validator.isUUID(obj[param], 'loose'))
{
return new UUID(obj[param]);
}
@@ -89,7 +89,7 @@ export class UUID
const u = obj[param].UUID[0];
if (typeof u === 'string')
{
if (validator.isUUID(u))
if (validator.isUUID(u, 'loose'))
{
return new UUID(u);
}
@@ -105,7 +105,7 @@ export class UUID
public setUUID(val: string): boolean
{
const test = val.trim();
if (validator.isUUID(test))
if (validator.isUUID(test, 'loose'))
{
this.mUUID = test;
return true;

10
lib/tests/uuid.spec.ts
View File

@@ -16,7 +16,7 @@ describe('UUID', () =>
{
assert.fail('Returned UUID is not a string');
}
if (!validator.isUUID(uuid))
if (!validator.isUUID(uuid, 'loose'))
{
assert.fail('Returned string is not a valid UUID');
}
@@ -28,7 +28,7 @@ describe('UUID', () =>
{
assert.fail('Returned second UUID is not a string');
}
if (!validator.isUUID(secondUUID))
if (!validator.isUUID(secondUUID, 'loose'))
{
assert.fail('Second UUID is not a valid UUID');
}
@@ -52,7 +52,7 @@ describe('UUID', () =>
{
assert.fail('Returned UUID is not a string');
}
if (!validator.isUUID(uuid))
if (!validator.isUUID(uuid, 'loose'))
{
assert.fail('Returned string is not a valid UUID');
}
@@ -74,7 +74,7 @@ describe('UUID', () =>
{
assert.fail('Returned UUID is not a string');
}
if (!validator.isUUID(str))
if (!validator.isUUID(str, 'loose'))
{
assert.fail('Returned string is not a valid UUID');
}
@@ -99,7 +99,7 @@ describe('UUID', () =>
{
assert.fail('Returned UUID is not a string');
}
if (!validator.isUUID(result))
if (!validator.isUUID(result, 'loose'))
{
assert.fail('Returned string is not a valid UUID');
}

4641
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@caspertech/node-metaverse",
"version": "0.8.3",
"version": "0.8.5",
"description": "A node.js interface for Second Life.",
"main": "dist/lib/index.js",
"types": "dist/lib/index.d.ts",
@@ -28,7 +28,7 @@
"@types/node": "^22.4.0",
"@types/tiny-async-pool": "^2.0.2",
"@types/uuid": "^8.3.4",
"@types/validator": "^13.12.2",
"@types/validator": "^13.15.2",
"@types/xml2js": "^0.4.14",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
@@ -61,7 +61,7 @@
"rxjs": "^7.8.1",
"tiny-async-pool": "^2.1.0",
"uuid": "^8.3.2",
"validator": "^13.12.0",
"validator": "^13.15.15",
"vitest": "^2.1.6",
"winston": "^3.11.0",
"xml": "^1.0.1",