fix cache serialization and deserialization

Author: GyulyVGC

.gitignore

@@ -8,6 +8,7 @@ app_id.txt
 app_secret.txt
 firewall_defaults.json
 uuid.txt
+cache.txt
 .env
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

client_common/src/appguard.ts

@@ -12,7 +12,7 @@ import {AuthorizationRequest} from "./proto/appguard_commands/AuthorizationReque
 import {ClientMessage} from "./proto/appguard_commands/ClientMessage";
 import {ServerMessage__Output} from "./proto/appguard_commands/ServerMessage";
 import {FirewallDefaults, FirewallDefaults__Output} from "./proto/appguard_commands/FirewallDefaults";
-import {Cache, CacheKey} from "./cache";
+import {CacheKey} from "./cache";
 import {FirewallPolicy} from "./proto/appguard_commands/FirewallPolicy";
 
 const opts = {includeDirs: [
@@ -189,8 +189,8 @@ export class AppGuardService {
                 console.log("Received firewall defaults from server:", firewallDefaults);
                 fs.writeFileSync(FIREWALL_DEFAULTS_FILE, JSON.stringify(firewallDefaults), {flag: 'w'});
                 // empty and update cache
-                let cache = new Cache(firewallDefaults.cache);
-                fs.writeFileSync(CACHE_FILE, JSON.stringify(cache), {flag: 'w'});
+                let cache: Map<string, FirewallPolicy> = new Map([]);
+                writeCache(cache);
             }
             if (server_msg.deviceDeauthorized) {
                 // delete saved app secret and app id
@@ -213,28 +213,47 @@ export class AppGuardService {
     }
 
     getFromCache(key: CacheKey) : FirewallPolicy | undefined {
-        let cache = readCache();
-        return cache.get(key);
+        let defaults = readFirewallDefaults();
+        if (defaults.cache) {
+            let cache = readCache();
+            return cache.get(JSON.stringify(key));
+        }
     }
 
     insertToCache(key: CacheKey, policy: FirewallPolicy) {
-        let cache = readCache();
-        cache.insert(key, policy);
-        fs.writeFileSync(CACHE_FILE, JSON.stringify(cache), {flag: 'w'});
+        let defaults = readFirewallDefaults();
+        if (defaults.cache) {
+            let cache = readCache();
+            cache.set(JSON.stringify(key), policy);
+            writeCache(cache);
+        }
     }
 }
 
 function readFirewallDefaults(): FirewallDefaults {
     let text = fs.readFileSync(FIREWALL_DEFAULTS_FILE, 'utf8');
-    return JSON.parse(text);
+    if (text.trim() === '') {
+        return {
+            policy: FirewallPolicy.ALLOW,
+            timeout: 1000,
+            cache: true,
+        };
+    } else {
+        return JSON.parse(text);
+    }
 }
 
-function readCache(): Cache {
+function readCache(): Map<string, FirewallPolicy> {
     let text = fs.readFileSync(CACHE_FILE, 'utf8');
     if (text.trim() === '') {
-        let firewallDefaults = readFirewallDefaults();
-        return new Cache(firewallDefaults.cache);
+        return new Map([]);
     } else {
-        return JSON.parse(text);
+        let map: Map<string, FirewallPolicy> = new Map(JSON.parse(text))
+        return map;
     }
 }
+
+function writeCache(cache: Map<string, FirewallPolicy>) {
+    let mySerialMap = JSON.stringify(Array.from(cache.entries()));
+    fs.writeFileSync(CACHE_FILE, mySerialMap, {flag: 'w'});
+}

client_common/src/auth.ts

@@ -3,12 +3,12 @@ import {AuthorizationRequest} from "./proto/appguard_commands/AuthorizationReque
 import {FirewallDefaults} from "./proto/appguard_commands/FirewallDefaults";
 import { v4 as uuidv4 } from 'uuid';
 
-export const TOKEN_FILE = process.cwd() + '/../token.txt'
-export const APP_ID_FILE = process.cwd() + '/../app_id.txt'
-export const APP_SECRET_FILE = process.cwd() + '/../app_secret.txt'
-export const FIREWALL_DEFAULTS_FILE = process.cwd() + '/../firewall_defaults.json'
-export const UUID_FILE = process.cwd() + '/../uuid.txt'
-export const CACHE_FILE = process.cwd() + '/../cache.txt'
+export const TOKEN_FILE = process.cwd() + '/token.txt'
+export const APP_ID_FILE = process.cwd() + '/app_id.txt'
+export const APP_SECRET_FILE = process.cwd() + '/app_secret.txt'
+export const FIREWALL_DEFAULTS_FILE = process.cwd() + '/firewall_defaults.json'
+export const UUID_FILE = process.cwd() + '/uuid.txt'
+export const CACHE_FILE = process.cwd() + '/cache.txt'
 
 const fs = require('fs');
 
@@ -33,6 +33,10 @@ export class AuthHandler {
 
         // empty token file content
         fs.writeFileSync(TOKEN_FILE, '', {flag: 'w'});
+        // empty cache file content
+        fs.writeFileSync(CACHE_FILE, '', {flag: 'w'});
+        // empty firewall defaults file content
+        fs.writeFileSync(FIREWALL_DEFAULTS_FILE, '', {flag: 'w'});
     }
 
     async init(type: string){

client_common/src/cache.ts

@@ -7,28 +7,4 @@ export class CacheKey {
     sourceIp: string;
     userAgent: string;
     query: Record<string, string>;
-}
-
-export class Cache {
-    private active: boolean;
-    private cache: Map<CacheKey, FirewallPolicy>;
-
-    constructor(active: boolean) {
-        this.active = active;
-        this.cache = new Map<CacheKey, FirewallPolicy>();
-    }
-
-    get(key: CacheKey): FirewallPolicy | undefined {
-        if (this.active) {
-            return this.cache.get(key);
-        } else {
-            return undefined;
-        }
-    }
-
-    insert(key: CacheKey, policy: FirewallPolicy) {
-        if (this.active) {
-            this.cache.set(key, policy);
-        }
-    }
 }