Skip to content

Commit

Permalink
Release 0.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Apr 9, 2024
2 parents 6ab39d6 + 376b421 commit e76fa87
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion api/tacticalrmm/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def mesh_user_id(self):
@property
def mesh_username(self):
# lower() needed for mesh api
return f"{self.username.lower()}___{self.pk}"
return f"{self.username.replace(' ', '').lower()}___{self.pk}"

@staticmethod
def serialize(user):
Expand Down
6 changes: 4 additions & 2 deletions api/tacticalrmm/agents/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,8 @@ def bulk(request):
debug_info={"ip": request._client_ip},
)

ht = "Check the History tab on the agent to view the results."

if request.data["mode"] == "command":
if request.data["shell"] == "custom" and request.data["custom_shell"]:
shell = request.data["custom_shell"]
Expand All @@ -1001,7 +1003,7 @@ def bulk(request):
username=request.user.username[:50],
run_as_user=request.data["run_as_user"],
)
return Response(f"Command will now be run on {len(agents)} agents")
return Response(f"Command will now be run on {len(agents)} agents. {ht}")

elif request.data["mode"] == "script":
script = get_object_or_404(Script, pk=request.data["script"])
Expand All @@ -1016,7 +1018,7 @@ def bulk(request):
env_vars=request.data["env_vars"],
)

return Response(f"{script.name} will now be run on {len(agents)} agents")
return Response(f"{script.name} will now be run on {len(agents)} agents. {ht}")

elif request.data["mode"] == "patch":
if request.data["patchMode"] == "install":
Expand Down
2 changes: 1 addition & 1 deletion api/tacticalrmm/core/mesh_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def add_users_to_node(self, *, node_id: str, user_ids: list[str]):
"action": "adddeviceuser",
"nodeid": node_id,
"usernames": [s.replace("user//", "") for s in user_ids],
"rights": 3563736,
"rights": 4088024,
"remove": False,
}
self.mesh_action(payload=payload, wait=False)
Expand Down
6 changes: 5 additions & 1 deletion api/tacticalrmm/core/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ def has_permission(self, r, view) -> bool:

class URLActionPerms(permissions.BasePermission):
def has_permission(self, r, view) -> bool:
return _has_perm(r, "can_run_urlactions")
if r.method in {"GET", "PATCH"}:
return _has_perm(r, "can_run_urlactions")

# TODO make a manage url action perm instead?
return _has_perm(r, "can_edit_core_settings")


class ServerMaintPerms(permissions.BasePermission):
Expand Down
2 changes: 1 addition & 1 deletion api/tacticalrmm/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def delete(self, request, pk):


class GetAddURLAction(APIView):
permission_classes = [IsAuthenticated, CoreSettingsPerms]
permission_classes = [IsAuthenticated, URLActionPerms]

def get(self, request):
actions = URLAction.objects.all()
Expand Down
8 changes: 4 additions & 4 deletions api/tacticalrmm/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channels_redis==4.2.0
cryptography==42.0.5
Django==4.2.11
django-cors-headers==4.3.1
django-filter==24.1
django-filter==24.2
django-rest-knox==4.2.0
djangorestframework==3.14.0
drf-spectacular==0.27.1
Expand All @@ -33,14 +33,14 @@ twilio==8.13.0
urllib3==2.2.1
uvicorn[standard]==0.29.0
uWSGI==2.0.24
validators==0.22.0
validators==0.24.0
vine==5.1.0
websockets==12.0
zipp==3.18.1
pandas==2.2.1
kaleido==0.2.1
jinja2==3.1.3
markdown==3.5.2
plotly==5.19.0
markdown==3.6
plotly==5.20.0
weasyprint==61.2
ocxsect==0.1.5
10 changes: 5 additions & 5 deletions api/tacticalrmm/tacticalrmm/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
AUTH_USER_MODEL = "accounts.User"

# latest release
TRMM_VERSION = "0.18.1"
TRMM_VERSION = "0.18.2"

# https://github.com/amidaware/tacticalrmm-web
WEB_VERSION = "0.101.43"
WEB_VERSION = "0.101.44"

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

# https://github.com/amidaware/rmmagent
LATEST_AGENT_VER = "2.7.0"
Expand All @@ -43,7 +43,7 @@
# GitHub version to download. The file will be downloaded from GitHub, extracted and installed.
# Version to download. If INSTALL_NUSHELL_URL is not provided, the file will be downloaded from GitHub,
# extracted and installed.
INSTALL_NUSHELL_VERSION = "0.91.0"
INSTALL_NUSHELL_VERSION = "0.92.1"
# URL to download directly. This is expected to be the direct URL, unauthenticated, uncompressed, ready to be installed.
# Use {OS}, {ARCH} and {VERSION} to specify the GOOS, GOARCH and INSTALL_NUSHELL_VERSION respectively.
# Windows: The ".exe" extension will be added automatically.
Expand All @@ -64,7 +64,7 @@
INSTALL_DENO = True
# Version to download. If INSTALL_DENO_URL is not provided, the file will be downloaded from GitHub,
# extracted and installed.
INSTALL_DENO_VERSION = "v1.41.3"
INSTALL_DENO_VERSION = "v1.42.1"
# URL to download directly. This is expected to be the direct URL, unauthenticated, uncompressed, ready to be installed.
# Use {OS}, {ARCH} and {VERSION} to specify the GOOS, GOARCH and INSTALL_DENO_VERSION respectively.
# Windows: The ".exe" extension will be added automatically.
Expand Down

0 comments on commit e76fa87

Please sign in to comment.