Merge branch 'develop' of https://github.com/wh1te909/tacticalrmm into develop

2020-12-16 19:08:12 +00:00
parent c84a9d07b1 5c6ac758f7
commit 7abed47cf0
7 changed files with 137 additions and 59 deletions
--- a/api/tacticalrmm/accounts/tests.py
+++ b/api/tacticalrmm/accounts/tests.py
@@ -155,6 +155,33 @@ class GetUpdateDeleteUser(TacticalTestCase):

        self.check_not_authenticated("put", url)

+    @override_settings(ROOT_USER="john")
+    def test_put_root_user(self):
+        url = f"/accounts/{self.john.pk}/users/"
+        data = {
+            "id": self.john.pk,
+            "username": "john",
+            "email": "johndoe@xlawgaming.com",
+            "first_name": "John",
+            "last_name": "Doe",
+        }
+        r = self.client.put(url, data, format="json")
+        self.assertEqual(r.status_code, 200)
+
+    @override_settings(ROOT_USER="john")
+    def test_put_not_root_user(self):
+        url = f"/accounts/{self.john.pk}/users/"
+        data = {
+            "id": self.john.pk,
+            "username": "john",
+            "email": "johndoe@xlawgaming.com",
+            "first_name": "John",
+            "last_name": "Doe",
+        }
+        self.client.force_authenticate(user=self.alice)
+        r = self.client.put(url, data, format="json")
+        self.assertEqual(r.status_code, 400)
+
    def test_delete(self):
        url = f"/accounts/{self.john.pk}/users/"
        r = self.client.delete(url)
@@ -166,6 +193,19 @@ class GetUpdateDeleteUser(TacticalTestCase):

        self.check_not_authenticated("delete", url)

+    @override_settings(ROOT_USER="john")
+    def test_delete_root_user(self):
+        url = f"/accounts/{self.john.pk}/users/"
+        r = self.client.delete(url)
+        self.assertEqual(r.status_code, 200)
+
+    @override_settings(ROOT_USER="john")
+    def test_delete_non_root_user(self):
+        url = f"/accounts/{self.john.pk}/users/"
+        self.client.force_authenticate(user=self.alice)
+        r = self.client.delete(url)
+        self.assertEqual(r.status_code, 400)
+

 class TestUserAction(TacticalTestCase):
    def setUp(self):
@@ -184,6 +224,21 @@ class TestUserAction(TacticalTestCase):

        self.check_not_authenticated("post", url)

+    @override_settings(ROOT_USER="john")
+    def test_post_root_user(self):
+        url = "/accounts/users/reset/"
+        data = {"id": self.john.pk, "password": "3ASDjh2345kJA!@#)#@__123"}
+        r = self.client.post(url, data, format="json")
+        self.assertEqual(r.status_code, 200)
+
+    @override_settings(ROOT_USER="john")
+    def test_post_non_root_user(self):
+        url = "/accounts/users/reset/"
+        data = {"id": self.john.pk, "password": "3ASDjh2345kJA!@#)#@__123"}
+        self.client.force_authenticate(user=self.alice)
+        r = self.client.post(url, data, format="json")
+        self.assertEqual(r.status_code, 400)
+
    def test_put(self):
        url = "/accounts/users/reset/"
        data = {"id": self.john.pk}
@@ -195,12 +250,34 @@ class TestUserAction(TacticalTestCase):

        self.check_not_authenticated("put", url)

-    def test_darkmode(self):
+    @override_settings(ROOT_USER="john")
+    def test_put_root_user(self):
+        url = "/accounts/users/reset/"
+        data = {"id": self.john.pk}
+        r = self.client.put(url, data, format="json")
+        self.assertEqual(r.status_code, 200)
+
+        user = User.objects.get(pk=self.john.pk)
+        self.assertEqual(user.totp_key, "")
+
+    @override_settings(ROOT_USER="john")
+    def test_put_non_root_user(self):
+        url = "/accounts/users/reset/"
+        data = {"id": self.john.pk}
+        self.client.force_authenticate(user=self.alice)
+        r = self.client.put(url, data, format="json")
+        self.assertEqual(r.status_code, 400)
+
+    def test_user_ui(self):
        url = "/accounts/users/ui/"
        data = {"dark_mode": False}
        r = self.client.patch(url, data, format="json")
        self.assertEqual(r.status_code, 200)

+        data = {"show_community_scripts": True}
+        r = self.client.patch(url, data, format="json")
+        self.assertEqual(r.status_code, 200)
+
        self.check_not_authenticated("patch", url)


--- a/api/tacticalrmm/agents/tests.py
+++ b/api/tacticalrmm/agents/tests.py
@@ -799,7 +799,7 @@ class TestAgentTasks(TacticalTestCase):
        agent_noarch = baker.make_recipe(
            "agents.agent",
            operating_system="Error getting OS",
-            version="1.1.0",
+            version="1.1.11",
        )
        r = agent_update(agent_noarch.pk)
        self.assertEqual(r, "noarch")
@@ -813,7 +813,7 @@ class TestAgentTasks(TacticalTestCase):
        agent64_nats = baker.make_recipe(
            "agents.agent",
            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
-            version="1.1.0",
+            version="1.1.11",
        )

        r = agent_update(agent64_nats.pk)
@@ -827,6 +827,24 @@ class TestAgentTasks(TacticalTestCase):
        )
        self.assertEqual(action.details["version"], settings.LATEST_AGENT_VER)

+        agent64_nats_before16 = baker.make_recipe(
+            "agents.agent",
+            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
+            version="1.1.4",
+        )
+
+        r = agent_update(agent64_nats_before16.pk)
+        self.assertEqual(r, "created")
+        action = PendingAction.objects.get(agent__pk=agent64_nats_before16.pk)
+        self.assertEqual(action.action_type, "agentupdate")
+        self.assertEqual(action.status, "pending")
+        self.assertEqual(
+            action.details["url"],
+            "https://github.com/wh1te909/rmmagent/releases/download/v1.1.5/winagent-v1.1.5.exe",
+        )
+        self.assertEqual(action.details["inno"], "winagent-v1.1.5.exe")
+        self.assertEqual(action.details["version"], "1.1.5")
+
        agent64_salt = baker.make_recipe(
            "agents.agent",
            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
@@ -838,24 +856,12 @@ class TestAgentTasks(TacticalTestCase):
        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,
+                "inno": "winagent-v1.1.5.exe",
+                "url": "https://github.com/wh1te909/rmmagent/releases/download/v1.1.5/winagent-v1.1.5.exe",
            },
        )
        salt_api_async.reset_mock()

-        agent32_nats = baker.make_recipe(
-            "agents.agent",
-            operating_system="Windows 7 Professional, 32 bit (build 7601.23964)",
-            version="1.1.0",
-        )
-
-        agent32_salt = baker.make_recipe(
-            "agents.agent",
-            operating_system="Windows 7 Professional, 32 bit (build 7601.23964)",
-            version="1.0.0",
-        )
-
    """ @patch("agents.models.Agent.salt_api_async")
    @patch("agents.tasks.sleep", return_value=None)
    def test_auto_self_agent_update_task(self, mock_sleep, salt_api_async):
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -15,11 +15,11 @@ EXE_DIR = os.path.join(BASE_DIR, "tacticalrmm/private/exe")
 AUTH_USER_MODEL = "accounts.User"

 # latest release
-TRMM_VERSION = "0.2.16"
+TRMM_VERSION = "0.2.17"

 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser
-APP_VER = "0.0.99"
+APP_VER = "0.0.100"

 # https://github.com/wh1te909/salt
 LATEST_SALT_VER = "1.1.0"
@@ -27,13 +27,13 @@ LATEST_SALT_VER = "1.1.0"
 # https://github.com/wh1te909/rmmagent
 LATEST_AGENT_VER = "1.1.11"

-MESH_VER = "0.7.14"
+MESH_VER = "0.7.24"

 SALT_MASTER_VER = "3002.2"

 # for the update script, bump when need to recreate venv or npm install
 PIP_VER = "4"
-NPM_VER = "3"
+NPM_VER = "4"

 DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe"
 DL_32 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}-x86.exe"
--- a/api/tacticalrmm/tacticalrmm/test.py
+++ b/api/tacticalrmm/tacticalrmm/test.py
@@ -13,6 +13,9 @@ class TacticalTestCase(TestCase):
        self.john = User(username="john")
        self.john.set_password("hunter2")
        self.john.save()
+        self.alice = User(username="alice")
+        self.alice.set_password("hunter2")
+        self.alice.save()
        self.client_setup()
        self.client.force_authenticate(user=self.john)

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,13 +33,21 @@ jobs:

      - script: |
          cd /myagent/_work/1/s/api
-          git config user.email "admin@example.com"
-          git config user.name "Bob"
-          git fetch
-          git checkout develop
-          git pull
          source env/bin/activate
          cd /myagent/_work/1/s/api/tacticalrmm
          coverage run manage.py test -v 2
-          coveralls
+          if [ $? -ne 0 ]; then
+              exit 1
+          fi
        displayName: "Run django tests"
+
+      - script: |
+          cd /myagent/_work/1/s/api
+          source env/bin/activate
+          cd /myagent/_work/1/s/api/tacticalrmm
+          export CIRCLE_BRANCH=$BUILD_SOURCEBRANCH
+          coveralls
+        displayName: "coveralls"
+        env:
+          CIRCLECI: 1
+          CIRCLE_BUILD_NUM: $(Build.BuildNumber)
--- a/scripts/ClearFirefoxCache.ps1
+++ b/scripts/ClearFirefoxCache.ps1
@@ -1,17 +1,9 @@
-Write-Host “Exporting the list of users to c:\users.csv”
-# List the users in c:\users and export to csv file for calling later
-dir C:\Users | select Name | Export-Csv -Path C:\users.csv -NoTypeInformation
-$list=Test-Path C:\users.csv
-# Clear Google Chrome
-Write-Host “Clearing FireFox caches”
-Import-CSV -Path C:\users.csv -Header Name | foreach {
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache\* -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache\*.* -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache2\entries\*.* -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\thumbnails\* -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\cookies.sqlite -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\webappsstore.sqlite -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path C:\Users\$($_.Name)\AppData\Local\Mozilla\Firefox\Profiles\*.default\chromeappsstore.sqlite -Recurse -Force -EA SilentlyContinue -Verbose
-}
-Remove-Item -path c:\users.csv
-Write-Host “FireFox cache is cleared”
+Write-Host "Clearing FireFox caches"
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache\*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache\*.*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\cache2\entries\*.*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\thumbnails\*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\cookies.sqlite" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\webappsstore.sqlite" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Mozilla\Firefox\Profiles\*.default\chromeappsstore.sqlite" -Recurse -Force -EA SilentlyContinue -Verbose
+Write-Host "FireFox cache is cleared"
--- a/scripts/ClearGoogleChromeCache.ps1
+++ b/scripts/ClearGoogleChromeCache.ps1
@@ -1,15 +1,7 @@
-Write-Host “Exporting the list of users to c:\users.csv”
-# List the users in c:\users and export to csv file for calling later
-dir C:\Users | select Name | Export-Csv -Path C:\users.csv -NoTypeInformation
-$list=Test-Path C:\users.csv
-# Clear Google Chrome
-Write-Host “Clearing Google caches”
-Import-CSV -Path C:\users.csv -Header Name | foreach {
-Remove-Item -path “C:\Users\$($_.Name)\AppData\Local\Google\Chrome\User Data\Default\Cache\*” -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path “C:\Users\$($_.Name)\AppData\Local\Google\Chrome\User Data\Default\Cache2\entries\*” -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path “C:\Users\$($_.Name)\AppData\Local\Google\Chrome\User Data\Default\Cookies” -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path “C:\Users\$($_.Name)\AppData\Local\Google\Chrome\User Data\Default\Media Cache” -Recurse -Force -EA SilentlyContinue -Verbose
-Remove-Item -path “C:\Users\$($_.Name)\AppData\Local\Google\Chrome\User Data\Default\Cookies-Journal” -Recurse -Force -EA SilentlyContinue -Verbose
-}
-Remove-Item -path c:\users.csv
-Write-Host “Google Chrome cache is cleared”
+Write-Host "Clearing Google caches"
+Remove-Item -path "C:\Users\*\AppData\Local\Google\Chrome\User Data\Default\Cache\*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Google\Chrome\User Data\Default\Cache2\entries\*" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Google\Chrome\User Data\Default\Cookies" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Google\Chrome\User Data\Default\Media Cache" -Recurse -Force -EA SilentlyContinue -Verbose
+Remove-Item -path "C:\Users\*\AppData\Local\Google\Chrome\User Data\Default\Cookies-Journal" -Recurse -Force -EA SilentlyContinue -Verbose
+Write-Host "Google Chrome cache is cleared"