Skip to content

Commit

Permalink
Release 0.17.2
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Dec 4, 2023
2 parents 9970911 + be847ba commit dd1d15f
Show file tree
Hide file tree
Showing 37 changed files with 1,659 additions and 361 deletions.
1 change: 1 addition & 0 deletions .devcontainer/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ MESH_TOKEN_KEY = '${MESH_TOKEN}'
REDIS_HOST = '${REDIS_HOST}'
MESH_WS_URL = '${MESH_WS_URL}'
ADMIN_ENABLED = True
TRMM_INSECURE = True
EOF
)"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
python-version: ["3.11.6"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: harmon758/postgresql-action@v1
with:
Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/docker-build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Get Github Tag
id: prep
run: |
echo ::set-output name=version::${GITHUB_REF#refs/tags/v}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and Push Tactical Image
uses: docker/build-push-action@v2
with:
Expand All @@ -36,7 +36,7 @@ jobs:
file: ./docker/containers/tactical/dockerfile
platforms: linux/amd64
tags: tacticalrmm/tactical:${{ steps.prep.outputs.version }},tacticalrmm/tactical:latest

- name: Build and Push Tactical MeshCentral Image
uses: docker/build-push-action@v2
with:
Expand All @@ -46,7 +46,7 @@ jobs:
file: ./docker/containers/tactical-meshcentral/dockerfile
platforms: linux/amd64
tags: tacticalrmm/tactical-meshcentral:${{ steps.prep.outputs.version }},tacticalrmm/tactical-meshcentral:latest

- name: Build and Push Tactical NATS Image
uses: docker/build-push-action@v2
with:
Expand All @@ -56,7 +56,7 @@ jobs:
file: ./docker/containers/tactical-nats/dockerfile
platforms: linux/amd64
tags: tacticalrmm/tactical-nats:${{ steps.prep.outputs.version }},tacticalrmm/tactical-nats:latest

- name: Build and Push Tactical Frontend Image
uses: docker/build-push-action@v2
with:
Expand All @@ -66,7 +66,7 @@ jobs:
file: ./docker/containers/tactical-frontend/dockerfile
platforms: linux/amd64
tags: tacticalrmm/tactical-frontend:${{ steps.prep.outputs.version }},tacticalrmm/tactical-frontend:latest

- name: Build and Push Tactical Nginx Image
uses: docker/build-push-action@v2
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Django 4.2.7 on 2023-11-09 19:57

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("accounts", "0035_role_can_manage_reports_role_can_view_reports"),
]

operations = [
migrations.RemoveField(
model_name="role",
name="can_ping_agents",
),
]
1 change: 0 additions & 1 deletion api/tacticalrmm/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ class Role(BaseAuditModel):

# agents
can_list_agents = models.BooleanField(default=False)
can_ping_agents = models.BooleanField(default=False)
can_use_mesh = models.BooleanField(default=False)
can_uninstall_agents = models.BooleanField(default=False)
can_update_agents = models.BooleanField(default=False)
Expand Down
12 changes: 7 additions & 5 deletions api/tacticalrmm/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
from django.contrib.auth import login
from django.db import IntegrityError
from django.shortcuts import get_object_or_404
from ipware import get_client_ip
from knox.views import LoginView as KnoxLoginView
from python_ipware import IpWare
from rest_framework.authtoken.serializers import AuthTokenSerializer
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView

from accounts.utils import is_root_user
from logs.models import AuditLog
from tacticalrmm.helpers import notify_error

Expand All @@ -22,7 +23,6 @@
UserSerializer,
UserUISerializer,
)
from accounts.utils import is_root_user


class CheckCreds(KnoxLoginView):
Expand Down Expand Up @@ -79,9 +79,11 @@ def post(self, request, format=None):
login(request, user)

# save ip information
client_ip, _ = get_client_ip(request)
user.last_login_ip = client_ip
user.save()
ipw = IpWare()
client_ip, _ = ipw.get_client_ip(request.META)
if client_ip:
user.last_login_ip = str(client_ip)
user.save()

AuditLog.audit_user_login_successful(
request.data["username"], debug_info={"ip": request._client_ip}
Expand Down
Loading

0 comments on commit dd1d15f

Please sign in to comment.