update protobuf and submit firewall definition

Author: GyulyVGC

proto/appguard.proto

@@ -5,6 +5,8 @@ package appguard;
 service AppGuard {
   // Authentication
   rpc Heartbeat (HeartbeatRequest) returns (stream HeartbeatResponse);
+  // Firewall
+  rpc UpdateFirewall (AppGuardFirewall) returns (Empty);
   // TCP
   rpc HandleTcpConnection (AppGuardTcpConnection) returns (AppGuardTcpResponse);
   // HTTP
@@ -35,6 +37,13 @@ message HeartbeatResponse {
   DeviceStatus status = 2;
 }
 
+// Firewall ------------------------------------------------------------------------------------------------------------
+
+message AppGuardFirewall {
+  string token = 1;
+  string firewall = 2;
+}
+
 // TCP -----------------------------------------------------------------------------------------------------------------
 
 message AppGuardTcpConnection {
@@ -101,6 +110,8 @@ message AppGuardSmtpResponse {
 
 // Response ------------------------------------------------------------------------------------------------------------
 
+message Empty {}
+
 message AppGuardResponse {
   FirewallPolicy policy = 2;
 }

sample/src/index.ts

@@ -8,7 +8,8 @@ const appGuardConfig: AppGuardConfig = {
     port: 50051,
     tls: false,
     defaultPolicy: FirewallPolicy.ALLOW,
-    timeout: 1_000
+    timeout: 1_000,
+    firewall: "[]",
 }
 
 const appGuardMiddleware = createAppGuardMiddleware(appGuardConfig)

src/app-guard-express.ts

@@ -12,6 +12,7 @@ import {HeartbeatRequest} from "./proto/appguard/HeartbeatRequest";
 import {HeartbeatResponse__Output} from "./proto/appguard/HeartbeatResponse";
 import {DeviceStatus} from "./proto/appguard/DeviceStatus";
 import {TOKEN_FILE} from "./auth";
+import {AppGuardFirewall, AppGuardFirewall__Output} from "./proto/appguard/AppGuardFirewall";
 
 const PROTO_FILE = __dirname + '/../proto/appguard.proto'
 const packageDef = protoLoader.loadSync(path.resolve(__dirname, PROTO_FILE))
@@ -92,7 +93,7 @@ export class AppGuardService {
             const fs = require('fs');
             fs.writeFileSync(TOKEN_FILE, heartbeat.token, {flag: 'w'});
             let status = heartbeat.status;
-            if (status == DeviceStatus.DS_ARCHIVED || status == DeviceStatus.DS_DELETED) {
+            if (status == DeviceStatus.ARCHIVED || status == DeviceStatus.DELETED) {
                 // terminate current process
                 console.log("Device is archived or deleted, terminating process");
                 process.exit(0);
@@ -107,4 +108,15 @@ export class AppGuardService {
             }, 10000);
         });
     }
+    async updateFirewall(req: AppGuardFirewall): Promise<AppGuardFirewall__Output>{
+        return new Promise((resolve, reject) => {
+            this.client.updateFirewall(req, (err, res) => {
+                if(err){
+                    reject(err)
+                } else {
+                    resolve(res as AppGuardFirewall__Output)
+                }
+            })
+        })
+    }
 }

src/express-middleware.ts

@@ -19,6 +19,7 @@ export type AppGuardConfig = {
   tls: boolean;
   timeout?: number;
   defaultPolicy: FirewallPolicy;
+  firewall: string;
 };
 
 
@@ -29,6 +30,12 @@ export const createAppGuardMiddleware = (config: AppGuardConfig) => {
   async function initialize() {
     await appGuardService.onModuleInit();
     await authHandler.init();
+    await appGuardService.updateFirewall({
+        // @ts-ignore
+        token: authHandler.token(),
+        // @ts-ignore
+        firewall: config.firewall
+    })
   }
   initialize();
 

src/proto/appguard.ts

@@ -10,6 +10,7 @@ type SubtypeConstructor<Constructor extends new (...args: any) => any, Subtype>
 export interface ProtoGrpcType {
   appguard: {
     AppGuard: SubtypeConstructor<typeof grpc.Client, _appguard_AppGuardClient> & { service: _appguard_AppGuardDefinition }
+    AppGuardFirewall: MessageTypeDefinition
     AppGuardHttpRequest: MessageTypeDefinition
     AppGuardHttpResponse: MessageTypeDefinition
     AppGuardIpInfo: MessageTypeDefinition
@@ -20,6 +21,7 @@ export interface ProtoGrpcType {
     AppGuardTcpInfo: MessageTypeDefinition
     AppGuardTcpResponse: MessageTypeDefinition
     DeviceStatus: EnumTypeDefinition
+    Empty: MessageTypeDefinition
     FirewallPolicy: EnumTypeDefinition
     HeartbeatRequest: MessageTypeDefinition
     HeartbeatResponse: MessageTypeDefinition

src/proto/appguard/AppGuard.ts

@@ -2,13 +2,15 @@
 
 import type * as grpc from '@grpc/grpc-js'
 import type { MethodDefinition } from '@grpc/proto-loader'
+import type { AppGuardFirewall as _appguard_AppGuardFirewall, AppGuardFirewall__Output as _appguard_AppGuardFirewall__Output } from '../appguard/AppGuardFirewall';
 import type { AppGuardHttpRequest as _appguard_AppGuardHttpRequest, AppGuardHttpRequest__Output as _appguard_AppGuardHttpRequest__Output } from '../appguard/AppGuardHttpRequest';
 import type { AppGuardHttpResponse as _appguard_AppGuardHttpResponse, AppGuardHttpResponse__Output as _appguard_AppGuardHttpResponse__Output } from '../appguard/AppGuardHttpResponse';
 import type { AppGuardResponse as _appguard_AppGuardResponse, AppGuardResponse__Output as _appguard_AppGuardResponse__Output } from '../appguard/AppGuardResponse';
 import type { AppGuardSmtpRequest as _appguard_AppGuardSmtpRequest, AppGuardSmtpRequest__Output as _appguard_AppGuardSmtpRequest__Output } from '../appguard/AppGuardSmtpRequest';
 import type { AppGuardSmtpResponse as _appguard_AppGuardSmtpResponse, AppGuardSmtpResponse__Output as _appguard_AppGuardSmtpResponse__Output } from '../appguard/AppGuardSmtpResponse';
 import type { AppGuardTcpConnection as _appguard_AppGuardTcpConnection, AppGuardTcpConnection__Output as _appguard_AppGuardTcpConnection__Output } from '../appguard/AppGuardTcpConnection';
 import type { AppGuardTcpResponse as _appguard_AppGuardTcpResponse, AppGuardTcpResponse__Output as _appguard_AppGuardTcpResponse__Output } from '../appguard/AppGuardTcpResponse';
+import type { Empty as _appguard_Empty, Empty__Output as _appguard_Empty__Output } from '../appguard/Empty';
 import type { HeartbeatRequest as _appguard_HeartbeatRequest, HeartbeatRequest__Output as _appguard_HeartbeatRequest__Output } from '../appguard/HeartbeatRequest';
 import type { HeartbeatResponse as _appguard_HeartbeatResponse, HeartbeatResponse__Output as _appguard_HeartbeatResponse__Output } from '../appguard/HeartbeatResponse';
 
@@ -63,6 +65,15 @@ export interface AppGuardClient extends grpc.Client {
   heartbeat(argument: _appguard_HeartbeatRequest, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_appguard_HeartbeatResponse__Output>;
   heartbeat(argument: _appguard_HeartbeatRequest, options?: grpc.CallOptions): grpc.ClientReadableStream<_appguard_HeartbeatResponse__Output>;
 
+  UpdateFirewall(argument: _appguard_AppGuardFirewall, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  UpdateFirewall(argument: _appguard_AppGuardFirewall, metadata: grpc.Metadata, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  UpdateFirewall(argument: _appguard_AppGuardFirewall, options: grpc.CallOptions, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  UpdateFirewall(argument: _appguard_AppGuardFirewall, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  updateFirewall(argument: _appguard_AppGuardFirewall, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  updateFirewall(argument: _appguard_AppGuardFirewall, metadata: grpc.Metadata, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  updateFirewall(argument: _appguard_AppGuardFirewall, options: grpc.CallOptions, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  updateFirewall(argument: _appguard_AppGuardFirewall, callback: grpc.requestCallback<_appguard_Empty__Output>): grpc.ClientUnaryCall;
+  
 }
 
 export interface AppGuardHandlers extends grpc.UntypedServiceImplementation {
@@ -78,6 +89,8 @@ export interface AppGuardHandlers extends grpc.UntypedServiceImplementation {
 
   Heartbeat: grpc.handleServerStreamingCall<_appguard_HeartbeatRequest__Output, _appguard_HeartbeatResponse>;
 
+  UpdateFirewall: grpc.handleUnaryCall<_appguard_AppGuardFirewall__Output, _appguard_Empty>;
+  
 }
 
 export interface AppGuardDefinition extends grpc.ServiceDefinition {
@@ -87,4 +100,5 @@ export interface AppGuardDefinition extends grpc.ServiceDefinition {
   HandleSmtpResponse: MethodDefinition<_appguard_AppGuardSmtpResponse, _appguard_AppGuardResponse, _appguard_AppGuardSmtpResponse__Output, _appguard_AppGuardResponse__Output>
   HandleTcpConnection: MethodDefinition<_appguard_AppGuardTcpConnection, _appguard_AppGuardTcpResponse, _appguard_AppGuardTcpConnection__Output, _appguard_AppGuardTcpResponse__Output>
   Heartbeat: MethodDefinition<_appguard_HeartbeatRequest, _appguard_HeartbeatResponse, _appguard_HeartbeatRequest__Output, _appguard_HeartbeatResponse__Output>
+  UpdateFirewall: MethodDefinition<_appguard_AppGuardFirewall, _appguard_Empty, _appguard_AppGuardFirewall__Output, _appguard_Empty__Output>
 }

src/proto/appguard/AppGuardFirewall.ts

@@ -0,0 +1,12 @@
+// Original file: proto/appguard.proto
+
+
+export interface AppGuardFirewall {
+  'token'?: (string);
+  'firewall'?: (string);
+}
+
+export interface AppGuardFirewall__Output {
+  'token'?: (string);
+  'firewall'?: (string);
+}

src/proto/appguard/Empty.ts

@@ -0,0 +1,8 @@
+// Original file: proto/appguard.proto
+
+
+export interface Empty {
+}
+
+export interface Empty__Output {
+}