Merge pull request #2 from NullNet-ai/dev

Update JavaScript clients

Author: GyulyVGC

.gitignore

@@ -4,6 +4,10 @@ node_modules
 dist
 .idea
 token.txt
+app_id.txt
+app_secret.txt
+firewall_defaults.json
+uuid.txt
 .env
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

client_common/package-lock.json

@@ -23,7 +23,8 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.3.2",
     "@grpc/proto-loader": "^0.6.2",
-    "dotenv": "^16.5.0"
+    "dotenv": "^16.5.0",
+    "uuid": "^11.1.0"
   },
   "husky": {
     "hooks": {

client_common/package.json

@@ -2,13 +2,15 @@ syntax = "proto3";
 
 package appguard;
 
+import "google/protobuf/empty.proto";
+import "commands.proto";
+
 service AppGuard {
-  // Authentication
-  rpc Heartbeat (HeartbeatRequest) returns (stream HeartbeatResponse);
-  // Firewall
-  rpc UpdateFirewall (AppGuardFirewall) returns (Empty);
+  // Control channel
+  rpc ControlChannel(stream appguard_commands.ClientMessage)
+      returns (stream appguard_commands.ServerMessage);
   // Logs
-  rpc HandleLogs (Logs) returns (Empty);
+  rpc HandleLogs (Logs) returns (google.protobuf.Empty);
   // TCP
   rpc HandleTcpConnection (AppGuardTcpConnection) returns (AppGuardTcpResponse);
   // HTTP
@@ -17,33 +19,8 @@ service AppGuard {
   // SMTP
   rpc HandleSmtpRequest (AppGuardSmtpRequest) returns (AppGuardResponse);
   rpc HandleSmtpResponse (AppGuardSmtpResponse) returns (AppGuardResponse);
-}
-
-// Authentication ------------------------------------------------------------------------------------------------------
-
-message HeartbeatRequest {
-  string app_id = 1;
-  string app_secret = 2;
-}
-
-enum DeviceStatus {
-  DRAFT = 0;
-  ACTIVE = 1;
-  ARCHIVED = 2;
-  DELETED = 3;
-  DS_UNKNOWN = 4;
-}
-
-message HeartbeatResponse {
-  string token = 1;
-  DeviceStatus status = 2;
-}
-
-// Firewall ------------------------------------------------------------------------------------------------------------
-
-message AppGuardFirewall {
-  string token = 1;
-  string firewall = 2;
+  // Other
+  rpc FirewallDefaultsRequest (Token) returns (appguard_commands.FirewallDefaults);
 }
 
 // Logs ----------------------------------------------------------------------------------------------------------------
@@ -124,18 +101,16 @@ message AppGuardSmtpResponse {
 
 // Response ------------------------------------------------------------------------------------------------------------
 
-message Empty {}
-
 message AppGuardResponse {
-  FirewallPolicy policy = 2;
+  appguard_commands.FirewallPolicy policy = 2;
 }
 
 message AppGuardTcpResponse {
   AppGuardTcpInfo tcp_info = 1;
 }
 
-enum FirewallPolicy {
-  UNKNOWN = 0;
-  ALLOW = 1;
-  DENY = 2;
-}
+// Other --------------------------------------------------------------------------------------
+
+message Token {
+  string token = 1;
+}

client_common/proto/appguard.proto

@@ -0,0 +1,55 @@
+syntax = "proto3";
+
+package appguard_commands;
+
+import "google/protobuf/empty.proto";
+
+message AuthorizationRequest {
+    string uuid = 1;
+    string code = 2;
+    string category = 3;
+    string type = 4;
+    string target_os = 5;
+}
+
+message Authentication {
+    string app_id = 1;
+    string app_secret = 2;
+}
+
+message ClientMessage {
+    oneof message {
+        AuthorizationRequest authorization_request = 1;
+        Authentication authentication = 2;
+    }
+}
+
+message AuthenticationData {
+    optional string app_id = 1;
+    optional string app_secret = 2;
+}
+
+message ServerMessage {
+    oneof message {
+        string update_token_command = 1;
+        
+        FirewallDefaults set_firewall_defaults = 2;
+
+        google.protobuf.Empty heartbeat = 3;
+
+        AuthenticationData device_authorized = 4;
+        google.protobuf.Empty device_deauthorized = 5;
+        google.protobuf.Empty authorization_rejected = 6;
+    }
+}
+
+message FirewallDefaults {
+    uint32 timeout = 1;
+    FirewallPolicy policy = 2;
+}
+
+enum FirewallPolicy {
+    UNKNOWN = 0;
+    ALLOW = 1;
+    DENY = 2;
+}