Add OS Version to Knowledge Base

A semantic version should be used for checking the condition of the client's operating system rather than evaluating the OS major AND minor version independently. See: ForensicArtifacts/artifacts/issues/274
coperni · Jul 2, 2022 · fc50a7e · fc50a7e
1 parent a16be8f
commit fc50a7e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/grr/proto/grr_response_proto/knowledge_base.proto b/grr/proto/grr_response_proto/knowledge_base.proto
@@ -247,6 +247,10 @@ message KnowledgeBase {
     description: "Linux distribution name.",
   }];
 
+  optional string os_version = 10 [(sem_type) = {
+    description: "Semantic version definition of OS major and minor version.",
+  }];
+
   //
   // Windows specific system level parameters.
   //

diff --git a/grr/server/grr_response_server/artifact.py b/grr/server/grr_response_server/artifact.py
@@ -49,8 +49,10 @@ def GetKnowledgeBase(rdf_client_obj, allow_uninitialized=False):
   kb = rdf_client_obj.knowledge_base
   try:
     kb.os_major_version = int(version[0])
+    kb.os_version = str(version[0])
     if len(version) > 1:
       kb.os_minor_version = int(version[1])
+      kb.os_version = "%s.%s" % (version[0], version[1])
   except ValueError:
     pass
 

diff --git a/grr/server/grr_response_server/gui/static/angular-components/docs/api-docs-examples.json b/grr/server/grr_response_server/gui/static/angular-components/docs/api-docs-examples.json
@@ -16316,6 +16316,7 @@
           "os_major_version",
           "os_minor_version",
           "os_release",
+          "os_version",
           "time_zone",
           "users.appdata",
           "users.cookies",

diff --git a/grr/server/grr_response_server/gui/static/angular-components/docs/api-v2-docs-examples.json b/grr/server/grr_response_server/gui/static/angular-components/docs/api-v2-docs-examples.json
@@ -4972,6 +4972,7 @@
           "os_major_version",
           "os_minor_version",
           "os_release",
+          "os_version",
           "time_zone",
           "users.appdata",
           "users.cookies",