Extensions are now string:string, not string:bool.

So registry values for special objects can be both numeric and strings. Signed-off-by: Eric Promislow <[email protected]>
rancher-sandbox · May 4, 2023 · fe879d4 · fe879d4
1 parent 0f5c049
commit fe879d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/pkg/rancher-desktop/main/__tests__/deploymentProfiles.spec.ts b/pkg/rancher-desktop/main/__tests__/deploymentProfiles.spec.ts
@@ -107,10 +107,10 @@ const defaultsUserRegFile = `Windows Registry Editor Version 5.00
 "magog"=dword:0
 
 [HKEY_CURRENT_USER\\SOFTWARE\\Rancher Desktop\\Profile\\${ testingDefaultsHiveName }\\extensions]
-"bellingham"=dword:1
-"seattle"=dword:1
-"olympia"=dword:0
-"winthrop"=dword:1
+"bellingham"="WA"
+"portland"="OR"
+"shasta"="CA"
+"elko"="NV"
 `;
 
 const lockedUserRegFile = `Windows Registry Editor Version 5.00
@@ -198,7 +198,7 @@ const arrayFromSingleStringDefaultsUserRegFile = `Windows Registry Editor Versio
 `;
 
 describeWindows('windows deployment profiles', () => {
-  /** Mocked console.log() to check messages. */
+  /* Mock console.error() to capture error messages. */
   let consoleMock: jest.SpyInstance<void, [message?: any, ...optionalArgs: any[]]>;
 
   beforeEach(async() => {
@@ -237,8 +237,7 @@ describeWindows('windows deployment profiles', () => {
             showMuted:   true,
             mutedChecks: { montreal: true, 'riviere du loup': false, magog: false },
           },
-          // @ts-ignore
-          extensions: { bellingham: true, seattle: true, olympia: false, winthrop: true },
+          extensions: { bellingham: 'WA', portland: 'OR', shasta: 'CA', elko: 'NV' },
         };
         const lockedUserProfile = {
           containerEngine: {

diff --git a/pkg/rancher-desktop/main/deploymentProfiles.ts b/pkg/rancher-desktop/main/deploymentProfiles.ts
@@ -315,7 +315,7 @@ function readRegistryObject(regKey: nativeReg.HKEY, pathParts: string[], isSpeci
   const newObject: Record<string, string[]|string|boolean|number> = {};
 
   for (const k of nativeReg.enumValueNames(regKey)) {
-    let newValue = readRegistryValue(undefined, regKey, pathParts, k);
+    let newValue = readRegistryValue(undefined, regKey, pathParts, k, isSpecialObject);
 
     if (newValue !== null) {
       if (isSpecialObject) {
@@ -334,7 +334,7 @@ function readRegistryObject(regKey: nativeReg.HKEY, pathParts: string[], isSpeci
   return newObject;
 }
 
-function readRegistryValue(schemaVal: any, regKey: nativeReg.HKEY, pathParts: string[], valueName: string): string[]|string|boolean|number|null {
+function readRegistryValue(schemaVal: any, regKey: nativeReg.HKEY, pathParts: string[], valueName: string, isSpecialObject=false): string[]|string|boolean|number|null {
   const fullPath = `\\${ pathParts.join('\\') }\\${ valueName }`;
   const valueTypeNames = [
     'NONE', // 0
@@ -356,7 +356,7 @@ function readRegistryValue(schemaVal: any, regKey: nativeReg.HKEY, pathParts: st
   if (rawValue === null) {
     // This shouldn't happen
     return null;
-  } else if (schemaVal && typeof schemaVal === 'object' && !Array.isArray(schemaVal)) {
+  } else if (!isSpecialObject && schemaVal && typeof schemaVal === 'object' && !Array.isArray(schemaVal)) {
     console.error(`Expecting registry entry ${ fullPath } to be a registry object, but it's a ${ valueTypeNames[rawValue.type] }, value: ${ parsedValueForErrorMessage }`);
 
     return null;
@@ -366,7 +366,7 @@ function readRegistryValue(schemaVal: any, regKey: nativeReg.HKEY, pathParts: st
 
   switch (rawValue.type) {
   case nativeReg.ValueType.SZ:
-    if (typeof schemaVal === 'string') {
+    if (isSpecialObject || (typeof schemaVal) === 'string') {
       return nativeReg.parseValue(rawValue) as string;
     } else if (expectingArray) {
       return [nativeReg.parseValue(rawValue) as string];