Merge pull request #94 from BC-SECURITY/release/2.7.3

v2.7.3 into main
BC-SECURITY · Feb 22, 2024 · 67e8f91 · 67e8f91
2 parents 15668ce + 86ac16b
commit 67e8f91
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 20 deletions.
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -27,4 +27,4 @@ jobs:
       - name: Run ESLint
         run: yarn lint
       - name: Run Prettier
-        run: yarn format --check
+        run: yarn format:check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.7.3] - 2024-02-22
+
+### Added
+
+-   Added buttons to reload sysinfo to agents pages
+-   Add info button on View tab to clarify what options do
+
+### Changed
+
+-   Removed extra space being added in front of Task Input and Output by append/prepend new line
+-   Changed default sort on agents page to be "first seen" instead of "last seen"
+
 ## [2.7.2] - 2024-01-31
 
 ### Fixed
@@ -349,7 +361,9 @@ Including but not limited to:
 
 -   Initial Release
 
-[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.2...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.3...HEAD
+
+[2.7.3]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.2...v2.7.3
 
 [2.7.2]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.1...v2.7.2
 

diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "starkiller",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": true,
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "serve": "vite preview",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
-    "format": "prettier .  --write"
+    "format": "prettier .  --write",
+    "format:check": "prettier .  --check"
   },
   "main": "background.js",
   "dependencies": {

diff --git a/src/components/ClickToEdit.vue b/src/components/ClickToEdit.vue
@@ -1,7 +1,15 @@
 <template>
   <v-row class="pb-5">
-    <v-col cols="4">
+    <v-col cols="4" class="d-flex align-center justify-start">
       <span class="text--bold">{{ label }}</span>
+      <v-tooltip v-if="infoText" bottom>
+        <template #activator="{ on, attrs }">
+          <v-icon small class="ml-2" v-bind="attrs" v-on="on">
+            mdi-information-outline
+          </v-icon>
+        </template>
+        <span>{{ infoText }}</span>
+      </v-tooltip>
     </v-col>
     <v-col cols="6" :class="getColClass()" @click="clicked">
       <template v-if="editing && editable">
@@ -116,6 +124,10 @@ export default {
       type: [String, Number],
       default: "",
     },
+    infoText: {
+      type: String,
+      default: "",
+    },
     dataType: {
       type: String,
       default: "string",

diff --git a/src/components/agents/AgentForm.vue b/src/components/agents/AgentForm.vue
@@ -42,6 +42,7 @@
       <click-to-edit
         v-model="form.listener"
         label="Listener"
+        info-text="The listener to task the agent to use"
         data-type="string"
         :suggested-values="listeners.map((l) => l.name)"
         :strict="true"
@@ -52,12 +53,14 @@
         v-model="form.kill_date"
         label="Kill Date"
         data-type="date"
+        info-text="Date format: YYYY-MM-DD"
         :editable="!readOnly"
         @update="updateKillDate"
       />
       <click-to-edit
         v-model="form.working_hours"
         label="Working Hours"
+        info-text="Format: 00:00-24:00"
         :rules="workingHoursRules"
         :editable="!readOnly"
         @update="updateWorkingHours"
@@ -75,6 +78,7 @@
       <click-to-edit
         v-model="form.delay"
         label="Delay"
+        info-text="Delay in seconds before the agent checks in"
         data-type="number"
         :rules="delayRules"
         :editable="!readOnly"
@@ -83,6 +87,7 @@
       <click-to-edit
         v-model="form.jitter"
         label="Jitter"
+        info-text="Randomness in delay as a decimal between 0 and 1"
         data-type="number"
         :rules="jitterRules"
         :editable="!readOnly"

diff --git a/src/components/agents/AgentTasksTable.vue b/src/components/agents/AgentTasksTable.vue
@@ -62,9 +62,11 @@
               "
             >
               {{
-                item.expandedInput
-                  ? expandedTasks[item.uniqueId].full_input
-                  : item.input
+                addBlankLines(
+                  item.expandedInput
+                    ? expandedTasks[item.uniqueId].full_input
+                    : item.input,
+                )
               }}
             </p>
             <p><b>Task Output:</b></p>
@@ -109,7 +111,7 @@
                 v-html="expandedTasks[item.uniqueId].htmlOutput"
               />
               <div v-else>
-                {{ item.output }}
+                {{ addBlankLines(item.output) }}
               </div>
             </div>
           </div>
@@ -386,6 +388,9 @@ export default {
         })
         .catch((err) => this.$snack.error(`Error: ${err}`));
     },
+    addBlankLines(text) {
+      return `\n${text}\n`;
+    },
     addTag(task, tag) {
       agentTaskApi
         .addTag(task.agent_id, task.id, tag)

diff --git a/src/components/agents/AgentTerminal.vue b/src/components/agents/AgentTerminal.vue
@@ -621,7 +621,10 @@ export default {
       config = { print: true, attempts: 30, delay: 5000 },
     ) {
       if (!config.attempts) config.attempts = 30;
-      if (!config.delay) config.delay = 5000;
+      if (!config.delay)
+        config.delay =
+          this.agent.delay != null ? this.agent.delay * 1000 : 5000;
+
       let res = null;
       let hasPrintedJobStarted = false;
       let i = 0;
@@ -670,7 +673,7 @@ export default {
         this.getDirectoryCommand(),
       );
 
-      const complete = await this.pollForResult(response.id);
+      const complete = await this.pollForResult(response.id, { print: false });
 
       if (complete) {
         // eslint-disable-next-line prefer-destructuring
@@ -697,6 +700,7 @@ export default {
 
       if (["cd", "set-location"].includes(stdin.toLowerCase().split(" ")[0])) {
         this.updateCurrentDirectory();
+        return;
       }
 
       if (complete) {

diff --git a/src/components/agents/AgentsTable.vue b/src/components/agents/AgentsTable.vue
@@ -114,6 +114,13 @@
               </v-list-item-title>
             </v-list-item>
             <v-divider class="pb-4" />
+            <v-list-item @click="reloadSysInfo(item)">
+              <v-list-item-title>
+                <v-icon>fa-sync</v-icon>
+                Reload SysInfo
+              </v-list-item-title>
+            </v-list-item>
+            <v-divider class="pb-4" />
             <v-list-item key="delete" link @click="killAgent(item)">
               <v-list-item-title>
                 <v-icon>fa-trash-alt</v-icon>
@@ -134,6 +141,7 @@ import TagViewer from "@/components/TagViewer.vue";
 import * as agentApi from "@/api/agent-api";
 import { useAgentStore } from "@/stores/agent-module";
 import { useApplicationStore } from "@/stores/application-module";
+import * as agentTaskApi from "@/api/agent-task-api";
 
 export default {
   name: "AgentsTable",
@@ -298,7 +306,7 @@ export default {
     },
     sortedAgents() {
       let sorted = this.agents.slice();
-      sorted.sort((a, b) => -a.lastseen_time.localeCompare(b.lastseen_time));
+      sorted.sort((a, b) => a.checkin_time.localeCompare(b.checkin_time));
       if (this.hideStaleAgents) {
         sorted = sorted.filter((agent) => !agent.stale);
       }
@@ -388,6 +396,16 @@ export default {
     getAgents() {
       this.agentStore.getAgents();
     },
+    async reloadSysInfo(agent) {
+      try {
+        await agentTaskApi.sysinfo(agent.session_id);
+        this.$snack.success(`SysInfo reload queued for ${agent.name}`);
+      } catch (error) {
+        this.$snack.error(
+          `Error reloading SysInfo for ${agent.name}: ${error.message}`,
+        );
+      }
+    },
     async killAgent(item) {
       this.$emit("kill-agent", item);
     },

diff --git a/src/components/plugins/PluginTasksTable.vue b/src/components/plugins/PluginTasksTable.vue
@@ -62,9 +62,11 @@
               "
             >
               {{
-                item.expandedInput
-                  ? expandedTasks[item.uniqueId].full_input
-                  : item.input
+                addBlankLines(
+                  item.expandedInput
+                    ? expandedTasks[item.uniqueId].full_input
+                    : item.input,
+                )
               }}
             </p>
             <p><b>Task Output:</b></p>
@@ -108,9 +110,7 @@
                 v-if="expandedTasks[item.uniqueId].htmlOutput"
                 v-html="expandedTasks[item.uniqueId].htmlOutput"
               />
-              <div v-else>
-                {{ item.output }}
-              </div>
+              <div v-else>addBlankLines(item.output)</div>
             </div>
           </div>
         </td>
@@ -349,6 +349,9 @@ export default {
     ansiToHtml(output) {
       return new AnsiUp().ansi_to_html(output);
     },
+    addBlankLines(text) {
+      return `\n${text}\n`;
+    },
     deleteTag(task, tag) {
       pluginApi
         .deleteTag(task.plugin_id, task.id, tag.id)

diff --git a/src/views/AgentEdit.vue b/src/views/AgentEdit.vue
@@ -67,7 +67,7 @@
               v-model="isRefreshTasks"
               icon="fa-redo"
               :button-text="isRefreshTasks ? 'On' : 'Off'"
-              text="Auto-refresh tasks"
+              text="Auto-refresh Tasks"
             />
             <tooltip-button
               icon="fa-calendar-times"
@@ -107,6 +107,11 @@
               text="Unsubscribe from Notifications"
               @click="unsubscribe"
             />
+            <tooltip-button
+              icon="fa-sync"
+              text="Reload SysInfo"
+              @click="reloadSysInfo"
+            />
             <tooltip-button
               v-if="initialized && !archived"
               icon="fa-trash-alt"
@@ -372,6 +377,16 @@ export default {
     unsubscribe() {
       this.agentStore.unsubscribe({ sessionId: this.id });
     },
+    async reloadSysInfo() {
+      try {
+        await agentTaskApi.sysinfo(this.agent.session_id);
+        this.$snack.success(`SysInfo reload queued for ${this.agent.name}`);
+      } catch (error) {
+        this.$snack.error(
+          `Error reloading SysInfo for ${this.agent.name}: ${error.message}`,
+        );
+      }
+    },
     toggleCollapsePane() {
       if (this.paneSize > 95) {
         this.paneSize = 50;

diff --git a/src/views/PluginEdit.vue b/src/views/PluginEdit.vue
@@ -27,7 +27,7 @@
           v-model="isRefreshTasks"
           icon="fa-redo"
           :button-text="isRefreshTasks ? 'On' : 'Off'"
-          text="Auto-refresh tasks"
+          text="Auto-refresh Tasks"
         />
       </template>
     </edit-page-top>