Resolve merge conflicts with master

Co-authored-by: bolkedebruin <4282712+bolkedebruin@users.noreply.github.com>

.github/workflows/codeql-analysis.yml

@@ -41,16 +41,16 @@ jobs:
       run: sudo apt-get -y install libpam-dev
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Install Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v7
       with:
         go-version-file: go.mod
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,4 +77,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/docker-image.yml

@@ -13,18 +13,18 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push - latest
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: ./dev/docker
           file: ./dev/docker/Dockerfile
@@ -32,7 +32,7 @@ jobs:
           push: true
           tags: ${{ github.repository_owner }}/rdpgw:latest
       - name: Build and push - latest
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v7
         with:
           context: ./dev/docker
           file: ./dev/docker/Dockerfile
@@ -40,7 +40,7 @@ jobs:
           push: true
           tags: ${{ github.repository_owner }}/rdpgw:${{ github.ref_name }}
       - name: Update Docker Hub Description
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v5
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/go.yml

@@ -13,17 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v7
+
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v7
       with:
         go-version: ^1.22
       id: go
 
     - name: Install pam-devel
-      run: sudo apt-get -y install libpam-dev
-      
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libpam-dev
 
     - name: Install golint
       run: go get -u golang.org/x/lint/golint

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/spf13/afero v1.14.0
 	github.com/stretchr/testify v1.10.0
 	github.com/thought-machine/go-flags v1.6.3
-	golang.org/x/crypto v0.51.0
+	golang.org/x/crypto v0.52.0
 	golang.org/x/oauth2 v0.34.0
 	golang.org/x/sys v0.45.0
 	google.golang.org/grpc v1.79.3