Fix UUID validation

Author: casperwardensl

lib/LoginHandler.ts

@@ -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 }));

lib/classes/EventQueueClient.ts

@@ -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, {

lib/classes/UUID.ts

@@ -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;

lib/tests/uuid.spec.ts

@@ -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');
             }