update reqs

api/tacticalrmm/requirements.txt

@@ -1,11 +1,11 @@
 adrf==0.1.6
 asgiref==3.8.1
 celery==5.4.0
-certifi==2024.2.2
+certifi==2024.6.2
 cffi==1.16.0
 channels==4.1.0
 channels_redis==4.2.0
-cryptography==42.0.7
+cryptography==42.0.8
 Django==4.2.13
 django-cors-headers==4.3.1
 django-filter==24.2
@@ -20,28 +20,28 @@ nats-py==2.7.2
 packaging==24.0
 psutil==5.9.8
 psycopg[binary]==3.1.19
-pycparser==2.21
+pycparser==2.22
 pycryptodome==3.20.0
 pyotp==2.9.0
 pyparsing==3.1.2
 python-ipware==2.0.2
 qrcode==7.4.2
-redis==5.0.4
-requests==2.31.0
+redis==5.0.5
+requests==2.32.3
 six==1.16.0
 sqlparse==0.5.0
 twilio==8.13.0
 urllib3==2.2.1
-uvicorn[standard]==0.29.0
-uWSGI==2.0.25.1
+uvicorn[standard]==0.30.1
+uWSGI==2.0.26
 validators==0.24.0
 vine==5.1.0
 websockets==12.0
-zipp==3.18.1
+zipp==3.19.2
 pandas==2.2.2
 kaleido==0.2.1
 jinja2==3.1.4
 markdown==3.6
 plotly==5.22.0
-weasyprint==62.1
+weasyprint==62.2
 ocxsect==0.1.5

api/tacticalrmm/tacticalrmm/settings.py

@@ -35,7 +35,7 @@
 
 MESH_VER = "1.1.21"
 
-NATS_SERVER_VER = "2.10.14"
+NATS_SERVER_VER = "2.10.16"
 
 # Install Nushell on the agent
 # https://github.com/nushell/nushell
@@ -83,7 +83,7 @@
 # for the update script, bump when need to recreate venv
 PIP_VER = "43"
 
-SETUPTOOLS_VER = "69.2.0"
+SETUPTOOLS_VER = "70.0.0"
 WHEEL_VER = "0.43.0"
 
 AGENT_BASE_URL = "https://agents.tacticalrmm.com"

docker/containers/tactical-nats/dockerfile

@@ -1,4 +1,4 @@
-FROM nats:2.10.14-alpine
+FROM nats:2.10.16-alpine
 
 ENV TACTICAL_DIR /opt/tactical
 ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready

go.mod

@@ -1,11 +1,11 @@
 module github.com/amidaware/tacticalrmm
 
-go 1.21.8
+go 1.21.11
 
 require (
- github.com/jmoiron/sqlx v1.3.5
+ github.com/jmoiron/sqlx v1.4.0
  github.com/lib/pq v1.10.9
- github.com/nats-io/nats.go v1.34.0
+ github.com/nats-io/nats.go v1.35.0
  github.com/ugorji/go/codec v1.2.12
  github.com/wh1te909/trmm-shared v0.0.0-20220227075846-f9f757361139
 )

go.sum

@@ -1,19 +1,20 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/nats-io/nats.go v1.34.0 h1:fnxnPCNiwIG5w08rlMcEKTUw4AV/nKyGCOJE8TdhSPk=
-github.com/nats-io/nats.go v1.34.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/nats-io/nats.go v1.35.0 h1:XFNqNM7v5B+MQMKqVGAyHwYhyKb48jrenXNxIU20ULk=
+github.com/nats-io/nats.go v1.35.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
 github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=

main.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
- version = "3.5.4"
+ version = "3.5.5"
  log = logrus.New()
 )