Fix registry lookup response (#224)

fixes #58, check if valid value is returned
microsoft · Nov 22, 2017 · f37fe13 · f37fe13
1 parent a6b49d2
commit f37fe13
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/client/common/registry.ts b/src/client/common/registry.ts
@@ -19,11 +19,11 @@ export interface IRegistry {
 }
 
 export class RegistryImplementation implements IRegistry {
-    public getKeys(key: string, hive: Hive, arch?: Architecture) {
-        return getRegistryKeys({ hive: translateHive(hive), arch: translateArchitecture(arch), key });
+    public async getKeys(key: string, hive: Hive, arch?: Architecture) {
+        return getRegistryKeys({ hive: translateHive(hive)!, arch: translateArchitecture(arch), key });
     }
-    public getValue(key: string, hive: Hive, arch?: Architecture, name: string = '') {
-        return getRegistryValue({ hive: translateHive(hive), arch: translateArchitecture(arch), key }, name);
+    public async getValue(key: string, hive: Hive, arch?: Architecture, name: string = '') {
+        return getRegistryValue({ hive: translateHive(hive)!, arch: translateArchitecture(arch), key }, name);
     }
 }
 
@@ -38,28 +38,28 @@ export function getArchitectureDislayName(arch?: Architecture) {
     }
 }
 
-function getRegistryValue(options: Registry.Options, name: string = '') {
+async function getRegistryValue(options: Registry.Options, name: string = '') {
     return new Promise<string | undefined | null>((resolve, reject) => {
         new Registry(options).get(name, (error, result) => {
-            if (error) {
+            if (error || !result || typeof result.value !== 'string') {
                 return resolve(undefined);
             }
             resolve(result.value);
         });
     });
 }
-function getRegistryKeys(options: Registry.Options): Promise<string[]> {
+async function getRegistryKeys(options: Registry.Options): Promise<string[]> {
     // https://github.com/python/peps/blob/master/pep-0514.txt#L85
     return new Promise<string[]>((resolve, reject) => {
         new Registry(options).keys((error, result) => {
-            if (error) {
+            if (error || !Array.isArray(result)) {
                 return resolve([]);
             }
-            resolve(result.map(item => item.key));
+            resolve(result.filter(item => typeof item.key === 'string').map(item => item.key));
         });
     });
 }
-function translateArchitecture(arch?: Architecture): RegistryArchitectures | null | undefined {
+function translateArchitecture(arch?: Architecture): RegistryArchitectures | undefined {
     switch (arch) {
         case Architecture.x86:
             return RegistryArchitectures.x86;
@@ -69,7 +69,7 @@ function translateArchitecture(arch?: Architecture): RegistryArchitectures | nul
             return;
     }
 }
-function translateHive(hive: Hive): string | null | undefined {
+function translateHive(hive: Hive): string | undefined {
     switch (hive) {
         case Hive.HKCU:
             return Registry.HKCU;

diff --git a/tslint.json b/tslint.json
@@ -43,13 +43,13 @@
             "PromiseLike"
         ],
         "completed-docs": false,
+        "no-void-expression": false,
+        "no-non-null-assertion": false, 
         "no-unsafe-any": false,
         "prefer-type-cast": false,
         "function-name": false,
         "variable-name": false,
-        "no-void-expression": false,
         "no-backbone-get-set-outside-model": false,
-        "underscore-consistent-invocation": false,
-        "no-non-null-assertion": false
+        "underscore-consistent-invocation": false
     }
 }