Skip to content

Commit

Permalink
Release 0.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@wh1te909
wh1te909 committed Feb 1, 2021
2 parents 7254378 + 5f529e2 commit d82f0cd
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 111 deletions.
9 changes: 2 additions & 7 deletions api/tacticalrmm/agents/tasks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,8 @@ def agent_update(pk: int) -> str:


@app.task
def send_agent_update_task(pks: List[int], version: str) -> None:
q = Agent.objects.filter(pk__in=pks)
agents = [i.pk for i in q]
""" agents: List[int] = [
i.pk for i in q if pyver.parse(i.version) < pyver.parse(version)
] """
chunks = (agents[i : i + 30] for i in range(0, len(agents), 30))
def send_agent_update_task(pks: List[int]) -> None:
chunks = (pks[i : i + 30] for i in range(0, len(pks), 30))
for chunk in chunks:
for pk in chunk:
agent_update(pk)
Expand Down
138 changes: 43 additions & 95 deletions api/tacticalrmm/agents/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@

from model_bakery import baker
from itertools import cycle
from typing import List
from packaging import version as pyver


from django.test import TestCase, override_settings
from django.conf import settings
from django.utils import timezone as djangotime

from logs.models import PendingAction

from tacticalrmm.test import TacticalTestCase
from .serializers import AgentSerializer
from winupdate.serializers import WinUpdatePolicySerializer
from .models import Agent
from .tasks import auto_self_agent_update_task
from winupdate.models import WinUpdatePolicy


Expand Down Expand Up @@ -64,12 +67,34 @@ def test_get_agent_versions(self):
@patch("agents.tasks.send_agent_update_task.delay")
def test_update_agents(self, mock_task):
url = "/agents/updateagents/"
data = {"pks": [1, 2, 3, 5, 10], "version": "0.11.1"}
baker.make_recipe(
"agents.agent",
operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
version=settings.LATEST_AGENT_VER,
_quantity=15,
)
baker.make_recipe(
"agents.agent",
operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
version="1.3.0",
_quantity=15,
)

pks: List[int] = list(
Agent.objects.only("pk", "version").values_list("pk", flat=True)
)

data = {"pks": pks}
expected: List[int] = [
i.pk
for i in Agent.objects.only("pk", "version")
if pyver.parse(i.version) < pyver.parse(settings.LATEST_AGENT_VER)
]

r = self.client.post(url, data, format="json")
self.assertEqual(r.status_code, 200)

mock_task.assert_called_with(pks=data["pks"], version=data["version"])
mock_task.assert_called_with(pks=expected)

self.check_not_authenticated("post", url)

Expand Down Expand Up @@ -827,107 +852,30 @@ def test_agent_update(self, nats_cmd):
self.assertEqual(action.action_type, "agentupdate")
self.assertEqual(action.status, "pending")

""" @patch("agents.models.Agent.salt_api_async")
@patch("agents.tasks.agent_update")
@patch("agents.tasks.sleep", return_value=None)
def test_auto_self_agent_update_task(self, mock_sleep, salt_api_async):
# test 64bit golang agent
self.agent64 = baker.make_recipe(
def test_auto_self_agent_update_task(self, mock_sleep, agent_update):
baker.make_recipe(
"agents.agent",
operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
version="1.0.0",
)
salt_api_async.return_value = True
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_called_with(
func="win_agent.do_agent_update_v2",
kwargs={
"inno": f"winagent-v{settings.LATEST_AGENT_VER}.exe",
"url": settings.DL_64,
},
)
self.assertEqual(ret.status, "SUCCESS")
self.agent64.delete()
salt_api_async.reset_mock()
# test 32bit golang agent
self.agent32 = baker.make_recipe(
"agents.agent",
operating_system="Windows 7 Professional, 32 bit (build 7601.24544)",
version="1.0.0",
)
salt_api_async.return_value = True
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_called_with(
func="win_agent.do_agent_update_v2",
kwargs={
"inno": f"winagent-v{settings.LATEST_AGENT_VER}-x86.exe",
"url": settings.DL_32,
},
)
self.assertEqual(ret.status, "SUCCESS")
self.agent32.delete()
salt_api_async.reset_mock()
# test agent that has a null os field
self.agentNone = baker.make_recipe(
"agents.agent",
operating_system=None,
version="1.0.0",
version=settings.LATEST_AGENT_VER,
_quantity=23,
)
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_not_called()
self.agentNone.delete()
salt_api_async.reset_mock()
# test auto update disabled in global settings
self.agent64 = baker.make_recipe(
baker.make_recipe(
"agents.agent",
operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
version="1.0.0",
version="1.3.0",
_quantity=33,
)

self.coresettings.agent_auto_update = False
self.coresettings.save(update_fields=["agent_auto_update"])
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_not_called()

# reset core settings
self.agent64.delete()
salt_api_async.reset_mock()
r = auto_self_agent_update_task.s().apply()
self.assertEqual(agent_update.call_count, 0)

self.coresettings.agent_auto_update = True
self.coresettings.save(update_fields=["agent_auto_update"])

# test 64bit python agent
self.agent64py = baker.make_recipe(
"agents.agent",
operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
version="0.11.1",
)
salt_api_async.return_value = True
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_called_with(
func="win_agent.do_agent_update_v2",
kwargs={
"inno": "winagent-v0.11.2.exe",
"url": OLD_64_PY_AGENT,
},
)
self.assertEqual(ret.status, "SUCCESS")
self.agent64py.delete()
salt_api_async.reset_mock()
# test 32bit python agent
self.agent32py = baker.make_recipe(
"agents.agent",
operating_system="Windows 7 Professional, 32 bit (build 7601.24544)",
version="0.11.1",
)
salt_api_async.return_value = True
ret = auto_self_agent_update_task.s().apply()
salt_api_async.assert_called_with(
func="win_agent.do_agent_update_v2",
kwargs={
"inno": "winagent-v0.11.2-x86.exe",
"url": OLD_32_PY_AGENT,
},
)
self.assertEqual(ret.status, "SUCCESS") """
r = auto_self_agent_update_task.s().apply()
self.assertEqual(agent_update.call_count, 33)
10 changes: 7 additions & 3 deletions api/tacticalrmm/agents/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@ def get_agent_versions(request):

@api_view(["POST"])
def update_agents(request):
pks = request.data["pks"]
version = request.data["version"]
send_agent_update_task.delay(pks=pks, version=version)
q = Agent.objects.filter(pk__in=request.data["pks"]).only("pk", "version")
pks: List[int] = [
i.pk
for i in q
if pyver.parse(i.version) < pyver.parse(settings.LATEST_AGENT_VER)
]
send_agent_update_task.delay(pks=pks)
return Response("ok")


Expand Down
4 changes: 2 additions & 2 deletions api/tacticalrmm/tacticalrmm/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
AUTH_USER_MODEL = "accounts.User"

# latest release
TRMM_VERSION = "0.4.4"
TRMM_VERSION = "0.4.5"

# bump this version everytime vue code is changed
# to alert user they need to manually refresh their browser
APP_VER = "0.0.109"
APP_VER = "0.0.110"

# https://github.com/wh1te909/rmmagent
LATEST_AGENT_VER = "1.4.2"
Expand Down
7 changes: 3 additions & 4 deletions web/src/components/modals/agents/UpdateAgents.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
</template>

<script>
import axios from "axios";
import mixins from "@/mixins/mixins";
export default {
name: "UpdateAgents",
Expand All @@ -58,7 +57,7 @@ export default {
},
getVersions() {
this.$q.loading.show();
axios
this.$axios
.get("/agents/getagentversions/")
.then(r => {
this.versions = r.data.versions;
Expand All @@ -72,8 +71,8 @@ export default {
});
},
update() {
const data = { version: this.version, pks: this.group };
axios
const data = { pks: this.group };
this.$axios
.post("/agents/updateagents/", data)
.then(r => {
this.$emit("close");
Expand Down

0 comments on commit d82f0cd

Please sign in to comment.