Skip to content

Commit

Permalink
blacked
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Jun 21, 2024
1 parent deb758e commit e5b8a51
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
15 changes: 7 additions & 8 deletions api/tacticalrmm/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,23 @@
from django.utils import timezone as djangotime
from django.views.decorators.csrf import csrf_exempt
from redis import from_url
from rest_framework import serializers
from rest_framework import status as drf_status
from rest_framework.decorators import api_view, permission_classes
from rest_framework.exceptions import PermissionDenied
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.request import Request
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework import serializers, status as drf_status

from core.decorators import monitoring_view
from core.tasks import sync_mesh_perms_task
from core.utils import (
get_core_settings,
sysd_svc_is_running,
token_is_valid,
run_server_script,
run_test_url_rest_action,
sysd_svc_is_running,
token_is_valid,
)
from logs.models import AuditLog
from tacticalrmm.constants import AuditActionType, PAStatus
Expand All @@ -38,14 +39,13 @@
)

from .models import CodeSignToken, CoreSettings, CustomField, GlobalKVStore, URLAction

from .permissions import (
CodeSignPerms,
CoreSettingsPerms,
CustomFieldPerms,
RunServerScriptPerms,
ServerMaintPerms,
URLActionPerms,
RunServerScriptPerms,
WebTerminalPerms,
)
from .serializers import (
Expand Down Expand Up @@ -383,7 +383,7 @@ def patch(self, request):

from agents.models import Agent
from clients.models import Client, Site
from tacticalrmm.utils import get_db_value, RE_DB_VALUE
from tacticalrmm.utils import RE_DB_VALUE, get_db_value

if "agent_id" in request.data.keys():
if not _has_perm_on_agent(request.user, request.data["agent_id"]):
Expand Down Expand Up @@ -456,7 +456,7 @@ def post(self, request):
elif instance_type == "site":
if not _has_perm_on_site(request.user, instance_id):
raise PermissionDenied()

elif instance_type == "client":
if not _has_perm_on_client(request.user, instance_id):
raise PermissionDenied()
Expand All @@ -480,7 +480,6 @@ def post(self, request):
debug_info={"ip": request._client_ip},
)


return Response({"url": replaced_url, "result": result, "body": replaced_body})


Expand Down
10 changes: 5 additions & 5 deletions api/tacticalrmm/logs/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from abc import abstractmethod
from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, Union, cast, Literal
from typing import TYPE_CHECKING, Any, Dict, Literal, Optional, Tuple, Union, cast

from django.db import models

Expand Down Expand Up @@ -166,9 +166,9 @@ def audit_test_script_run(
agent: Optional["Agent"],
debug_info: Dict[Any, Any] = {},
) -> None:

debug_info["script_body"] = script_body

AuditLog.objects.create(
agent=agent.hostname if agent else "Tactical RMM Server",
agent_id=agent.agent_id if agent else "N/A",
Expand Down Expand Up @@ -254,10 +254,10 @@ def audit_url_action_test(

elif instance_type == "site":
instance = Site.objects.get(pk=instance_id)

elif instance_type == "client":
instance = Client.objects.get(pk=instance_id)

name = instance.hostname if isinstance(instance, Agent) else instance.name
classname = type(instance).__name__
AuditLog.objects.create(
Expand Down
6 changes: 3 additions & 3 deletions api/tacticalrmm/scripts/views.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import asyncio

from django.conf import settings
from django.shortcuts import get_object_or_404
from rest_framework.decorators import api_view, permission_classes
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
from django.conf import settings

from agents.permissions import RunScriptPerms
from core.utils import clear_entire_cache
from logs.models import AuditLog
from tacticalrmm.constants import ScriptShell, ScriptType
from tacticalrmm.helpers import notify_error

from .models import Script, ScriptSnippet
from logs.models import AuditLog
from .permissions import ScriptsPerms
from .serializers import (
ScriptSerializer,
ScriptSnippetSerializer,
ScriptTableSerializer,
)
from core.utils import clear_entire_cache


class GetAddScripts(APIView):
Expand Down

0 comments on commit e5b8a51

Please sign in to comment.