Update dependency ramsey/uuid to v4.7.3 (#165 )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update dependency jumbojett/openid-connect-php to v0.9.10 (#164 )
2023-03-16 18:30:41 +00:00 · 2023-03-16 18:24:59 +00:00 · 2023-02-18 19:07:36 +00:00 · 2023-02-01 19:40:19 +00:00 · 2022-12-22 22:24:13 +00:00 · 2022-12-17 20:33:54 +00:00
9 changed files with 370 additions and 202 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,64 @@
+name: Deploy
+on:
+  push:
+    branches: main
+
+jobs:
+  tests:
+      name: Tests
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+        - name: Setup PHP with Xdebug
+          uses: shivammathur/setup-php@v2
+          with:
+            php-version: '8.1'
+            coverage: xdebug 
+        - name: Install dependencies with composer
+          run: composer update --no-ansi --no-interaction --no-progress
+        - name: Run tests with phpunit/phpunit
+          run: vendor/bin/phpunit --coverage-clover=coverage.xml
+        - name: Fix code coverage paths
+          run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
+        - name: SonarCloud Scan
+          uses: SonarSource/sonarcloud-github-action@master
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+  release-on-push:
+    runs-on: ubuntu-latest
+    outputs: 
+      ver: ${{ steps.release.outputs.version }}
+      tag: ${{ steps.release.outputs.tag_name }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Get Release
+        id: release
+        uses: rymndhng/release-on-push-action@master
+        with:
+          bump_version_scheme: patch
+      - name: Check Release Output
+        id: rop-check
+        run: |
+          echo "Got tag name ${{ steps.release.outputs.tag_name }}"
+          echo "Got release version ${{ steps.release.outputs.version }}"
+
+  build:
+    name: GitHub Container Registry
+    runs-on: ubuntu-latest
+    needs: [tests, release-on-push]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Login to GitHub Container Registry
+      run: echo ${{ secrets.PAT }} | docker login ghcr.io -u luketainton --password-stdin
+    - name: Build image for GitHub Container Registry
+      run: docker build . --file Dockerfile --tag ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }} --tag ghcr.io/luketainton/fhed:latest
+    - name: Push image to GitHub Container Registry
+      run: |
+        docker push ghcr.io/luketainton/fhed:latest
+        docker push ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }}
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,67 +0,0 @@
-name: Deploy
-on:
-  push:
-    branches: main
-
-jobs:
-  release-on-push:
-    runs-on: ubuntu-latest
-    outputs: 
-      ver: ${{ steps.release.outputs.version }}
-      tag: ${{ steps.release.outputs.tag_name }}
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - id: release
-        uses: rymndhng/release-on-push-action@master
-        with:
-          bump_version_scheme: patch
-          
-      - name: Check Output Parameters
-        run: |
-          echo "Got tag name ${{ steps.release.outputs.tag_name }}"
-          echo "Got release version ${{ steps.release.outputs.version }}"
-
-  docker-dh:
-    name: Push to Docker Hub
-    needs: [release-on-push]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Login to DockerHub Registry
-      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-    - name: Build image for Docker Hub
-      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag luketainton/fhed:${{ needs.release-on-push.outputs.tag }} --tag luketainton/fhed:latest
-    - name: Push image to Docker Hub
-      run: |
-        docker push luketainton/fhed:${{ needs.release-on-push.outputs.tag }} &&
-        docker push luketainton/fhed:latest
-      
-  docker-ghr:
-    name: Push to GitHub Package Registry
-    needs: [release-on-push]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Login to DockerHub Registry
-      run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
-    - name: Build image for GitHub Package Registry
-      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }}
-    - name: Push image to GitHub Package Registry
-      run: |
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }} &&
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:latest
-
-  deploy:
-    name: Update Docker image on server
-    runs-on: ubuntu-latest
-    needs: [docker-dh]
-    steps:
-    - name: Update image on server
-      uses: garygrossgarten/github-action-ssh@release
-      with:
-        command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
-        host: ${{ secrets.SSH_HOST }}
-        port: ${{ secrets.SSH_PORT }}
-        username: ${{ secrets.SSH_USERNAME }}
-        privateKey: ${{ secrets.SSH_SSHKEY }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v7
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'
--- a/.gitlab-archive/.gitlab-ci.yml
+++ b/.gitlab-archive/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+stages:
+- build
+
+build:
+  stage: build
+  only:
+  - tags
+  image: docker:23.0.1
+  services:
+  - docker:23.0.1-dind
+  variables:
+    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+  script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  - docker build -t $CI_REGISTRY_IMAGE:latest -t $IMAGE_TAG .
+  - docker build -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest .
+  - docker push $IMAGE_TAG
+  - docker push $CI_REGISTRY_IMAGE:latest
--- a/1
+++ b/1
@@ -4,6 +4,7 @@ RUN composer --working-dir=/srv install

 FROM php:apache
 LABEL maintainer="Luke Tainton <luke@tainton.uk>"
+LABEL org.opencontainers.image.source="https://github.com/luketainton/fhed"
 ARG VERSION
 RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip
 COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf
--- a/app/composer.lock
+++ b/app/composer.lock
@@ -8,26 +8,26 @@
    "packages": [
        {
            "name": "brick/math",
-            "version": "0.8.15",
+            "version": "0.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "9b08d412b9da9455b210459ff71414de7e6241cd"
+                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/9b08d412b9da9455b210459ff71414de7e6241cd",
-                "reference": "9b08d412b9da9455b210459ff71414de7e6241cd",
+                "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f",
+                "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "php": "^7.1|^8.0"
+                "php": "^7.4 || ^8.0"
            },
            "require-dev": {
                "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^7.5.15|^8.5",
-                "vimeo/psalm": "^3.5"
+                "phpunit/phpunit": "^9.0",
+                "vimeo/psalm": "4.25.0"
            },
            "type": "library",
            "autoload": {
@@ -52,23 +52,23 @@
            ],
            "funding": [
                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
+                    "url": "https://github.com/BenMorel",
+                    "type": "github"
                }
            ],
-            "time": "2020-04-15T15:59:35+00:00"
+            "time": "2022-08-10T22:54:19+00:00"
        },
        {
            "name": "clue/stream-filter",
            "version": "v1.4.1",
            "source": {
                "type": "git",
-                "url": "https://github.com/clue/php-stream-filter.git",
+                "url": "https://github.com/clue/stream-filter.git",
                "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
+                "url": "https://api.github.com/repos/clue/stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
                "reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
                "shasum": ""
            },
@@ -80,12 +80,12 @@
            },
            "type": "library",
            "autoload": {
-                "psr-4": {
-                    "Clue\\StreamFilter\\": "src/"
-                },
                "files": [
                    "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "Clue\\StreamFilter\\": "src/"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -108,6 +108,16 @@
                "stream_filter_append",
                "stream_filter_register"
            ],
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
            "time": "2019-04-09T12:31:48+00:00"
        },
        {
@@ -268,12 +278,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                "files": [
                    "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -294,16 +304,16 @@
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
+            "version": "1.8.5",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
                "shasum": ""
            },
            "require": {
@@ -316,37 +326,58 @@
            },
            "require-dev": {
                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
            },
            "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                }
            },
            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
                "files": [
                    "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                {
                    "name": "Michael Dowling",
                    "email": "mtdowling@gmail.com",
                    "homepage": "https://github.com/mtdowling"
                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
                {
                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
                    "homepage": "https://github.com/Tobion"
                }
            ],
@@ -361,7 +392,21 @@
                "uri",
                "url"
            ],
-            "time": "2019-07-01T23:21:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-20T21:51:18+00:00"
        },
        {
            "name": "http-interop/http-factory-guzzle",
@@ -466,27 +511,28 @@
        },
        {
            "name": "jumbojett/openid-connect-php",
-            "version": "v0.9.0",
+            "version": "v0.9.10",
            "source": {
                "type": "git",
                "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git",
-                "reference": "87eefea40abd9cea0290aa9b6cdb314fd0037fe2"
+                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/87eefea40abd9cea0290aa9b6cdb314fd0037fe2",
-                "reference": "87eefea40abd9cea0290aa9b6cdb314fd0037fe2",
+                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/45aac47b525f0483dd4db3324bb1f1cab4666061",
+                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061",
                "shasum": ""
            },
            "require": {
                "ext-curl": "*",
                "ext-json": "*",
+                "paragonie/random_compat": ">=2",
                "php": ">=5.4",
-                "phpseclib/phpseclib": "~2.0"
+                "phpseclib/phpseclib": "~2.0 || ^3.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "roave/security-advisories": "dev-master"
+                "roave/security-advisories": "dev-master",
+                "yoast/phpunit-polyfills": "^1.0"
            },
            "type": "library",
            "autoload": {
@@ -499,7 +545,69 @@
                "Apache-2.0"
            ],
            "description": "Bare-bones OpenID Connect client",
-            "time": "2020-03-09T13:26:39+00:00"
+            "time": "2022-09-30T12:34:46+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v2.6.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
+                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6|^7|^8|^9",
+                "vimeo/psalm": "^1|^2|^3|^4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "time": "2022-06-14T06:56:20+00:00"
        },
        {
            "name": "paragonie/random_compat",
@@ -787,12 +895,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Http\\Message\\": "src/"
-                },
                "files": [
                    "src/filters.php"
-                ]
+                ],
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -983,28 +1091,28 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "2.0.28",
+            "version": "3.0.19",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
+                "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
+                "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "paragonie/constant_time_encoding": "^1|^2",
+                "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
+                "php": ">=5.6.1"
            },
            "require-dev": {
-                "phing/phing": "~2.7",
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-                "sami/sami": "~2.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpunit/phpunit": "*"
            },
            "suggest": {
+                "ext-dom": "Install the DOM extension to load XML formatted public keys.",
                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
@@ -1016,7 +1124,7 @@
                    "phpseclib/bootstrap.php"
                ],
                "psr-4": {
-                    "phpseclib\\": "phpseclib/"
+                    "phpseclib3\\": "phpseclib/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -1085,7 +1193,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2020-07-08T09:08:33+00:00"
+            "time": "2023-03-05T17:13:09+00:00"
        },
        {
            "name": "psr/container",
@@ -1376,37 +1484,52 @@
        },
        {
            "name": "ramsey/collection",
-            "version": "1.0.1",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/collection.git",
-                "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca"
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca",
-                "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2"
+                "php": "^8.1"
            },
            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-                "fzaninotto/faker": "^1.5",
-                "jakub-onderka/php-parallel-lint": "^1",
-                "jangregor/phpstan-prophecy": "^0.6",
-                "mockery/mockery": "^1.3",
-                "phpstan/extension-installer": "^1",
-                "phpstan/phpdoc-parser": "0.4.1",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-mockery": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^8.5",
-                "slevomat/coding-standard": "^6.0",
-                "squizlabs/php_codesniffer": "^3.5"
+                "captainhook/plugin-composer": "^5.3",
+                "ergebnis/composer-normalize": "^2.28.3",
+                "fakerphp/faker": "^1.21",
+                "hamcrest/hamcrest-php": "^2.0",
+                "jangregor/phpstan-prophecy": "^1.0",
+                "mockery/mockery": "^1.5",
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-mockery": "^1.1",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "ramsey/coding-standard": "^2.0.3",
+                "ramsey/conventional-commits": "^1.3",
+                "vimeo/psalm": "^5.4"
            },
            "type": "library",
+            "extra": {
+                "captainhook": {
+                    "force-install": true
+                },
+                "ramsey/conventional-commits": {
+                    "configFile": "conventional-commits.json"
+                }
+            },
            "autoload": {
                "psr-4": {
                    "Ramsey\\Collection\\": "src/"
@@ -1423,8 +1546,7 @@
                    "homepage": "https://benramsey.com"
                }
            ],
-            "description": "A PHP 7.2+ library for representing and manipulating collections.",
-            "homepage": "https://github.com/ramsey/collection",
+            "description": "A PHP library for representing and manipulating collections.",
            "keywords": [
                "array",
                "collection",
@@ -1433,57 +1555,65 @@
                "queue",
                "set"
            ],
-            "time": "2020-01-05T00:22:59+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-31T21:50:55+00:00"
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.0.1",
+            "version": "4.7.3",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d"
+                "reference": "433b2014e3979047db08a17a205f410ba3869cf2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d",
-                "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2",
+                "reference": "433b2014e3979047db08a17a205f410ba3869cf2",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.8",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10",
                "ext-json": "*",
-                "php": "^7.2 || ^8",
-                "ramsey/collection": "^1.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "php": "^8.0",
+                "ramsey/collection": "^1.2 || ^2.0"
            },
            "replace": {
                "rhumsaa/uuid": "self.version"
            },
            "require-dev": {
-                "codeception/aspect-mock": "^3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2",
+                "captainhook/captainhook": "^5.10",
+                "captainhook/plugin-composer": "^5.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                "doctrine/annotations": "^1.8",
-                "goaop/framework": "^2",
+                "ergebnis/composer-normalize": "^2.15",
                "mockery/mockery": "^1.3",
-                "moontoast/math": "^1.1",
                "paragonie/random-lib": "^2",
+                "php-mock/php-mock": "^2.2",
                "php-mock/php-mock-mockery": "^1.3",
-                "php-mock/php-mock-phpunit": "^2.5",
                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpdoc-parser": "0.4.3",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-mockery": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^8.5",
-                "psy/psysh": "^0.10.0",
-                "slevomat/coding-standard": "^6.0",
+                "phpbench/phpbench": "^1.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9",
+                "ramsey/composer-repl": "^1.4",
+                "slevomat/coding-standard": "^8.4",
                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "3.9.4"
+                "vimeo/psalm": "^4.9"
            },
            "suggest": {
                "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
-                "ext-ctype": "Enables faster processing of character classification using ctype functions.",
                "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.",
                "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.",
                "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -1491,24 +1621,23 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
+                "captainhook": {
+                    "force-install": true
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Ramsey\\Uuid\\": "src/"
-                },
                "files": [
                    "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Ramsey\\Uuid\\": "src/"
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
            "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).",
-            "homepage": "https://github.com/ramsey/uuid",
            "keywords": [
                "guid",
                "identifier",
@@ -1518,9 +1647,13 @@
                {
                    "url": "https://github.com/ramsey",
                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
+                    "type": "tidelift"
                }
            ],
-            "time": "2020-03-29T20:13:32+00:00"
+            "time": "2023-01-12T18:13:24+00:00"
        },
        {
            "name": "sentry/sdk",
@@ -1972,20 +2105,23 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.17.1",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
-                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
            },
            "suggest": {
                "ext-ctype": "For best performance"
@@ -1993,7 +2129,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -2001,12 +2137,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                "files": [
                    "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2044,7 +2180,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
@@ -2077,12 +2213,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                "files": [
                    "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2151,12 +2287,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                "files": [
                    "bootstrap.php"
                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                "classmap": [
                    "Resources/stubs"
                ]
@@ -2227,12 +2363,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                "files": [
                    "bootstrap.php"
                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                "classmap": [
                    "Resources/stubs"
                ]
@@ -2311,12 +2447,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Uuid\\": ""
-                },
                "files": [
                    "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Uuid\\": ""
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
--- a/app/public/update.php
+++ b/app/public/update.php
@@ -6,6 +6,8 @@
    $updates = get_updates($db, $request);
    $authorised_users = get_subscribers($db, $request);
    $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+
+    $rid = htmlspecialchars($_GET['rid'])
 ?>


@@ -131,7 +133,7 @@
                    <div class="form-group" style="margin: 2%;">
                      <textarea type="text" class="form-control" id="msg" name="msg" rows="3"></textarea>
                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
-                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                      <a href="/view?rid=<?php echo($rid); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
                    </div>
                  </form>
              </div>
--- a/app/public/upload.php
+++ b/app/public/upload.php
@@ -6,6 +6,8 @@
    $updates = get_updates($db, $request);
    $authorised_users = get_subscribers($db, $request);
    $is_authorised = isAuthorised($_SESSION['uuid'], $authorised_users, $request);
+
+    $rid = htmlspecialchars($_GET['rid']);
 ?>


@@ -131,7 +133,7 @@
                    <div class="form-group" style="margin: 2%;">
                      <input type="file" class="form-control-file" id="file" name="file">
                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
-                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                      <a href="/view?rid=<?php echo($rid); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
                    </div>
                  </form>
              </div>
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -0,0 +1,12 @@
+sonar.projectKey=luketainton_FHeD
+sonar.organization=luketainton
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=FHeD
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
Author	SHA1	Message	Date
renovate[bot]	fb3d3146c8	Update dependency ramsey/uuid to v4.7.3 (#165 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-03-16 18:30:41 +00:00
renovate[bot]	ec332a519a	Update dependency jumbojett/openid-connect-php to v0.9.10 (#164 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-03-16 18:24:59 +00:00
renovate[bot]	7fe886a278	Update docker Docker tag to v23 (#163 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-18 19:07:36 +00:00
renovate[bot]	3458601402	Update docker Docker tag to v20.10.23 (#162 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-02-01 19:40:19 +00:00
renovate[bot]	32870cc447	Update actions/stale action to v7 (#161 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-22 22:24:13 +00:00
renovate[bot]	0efe142ea0	Update docker Docker tag to v20.10.22 (#160 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-12-17 20:33:54 +00:00
Luke Tainton	5eba9d705c	Create sonar-project.properties	2022-10-21 23:59:03 +01:00
Luke Tainton	1319d59c8c	Add Coverage	2022-10-21 23:57:39 +01:00
Luke Tainton	05e12dde69	Sonar: phpsecurity:S5131	2022-10-21 23:53:08 +01:00
Luke Tainton	a0035707b8	Sonar: phpsecurity:S5131	2022-10-21 23:51:31 +01:00
renovate[bot]	cdaf096965	Update docker Docker tag to v20.10.20 (#159 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-10-19 07:24:40 +01:00
renovate[bot]	46263f3195	Update docker Docker tag to v20.10.19 (#158 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-10-16 18:25:00 +01:00
renovate[bot]	3c4efa15c2	Update docker Docker tag to v20.10.18 (#156 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-10-01 11:24:37 +01:00
renovate[bot]	a24d001d98	Update actions/stale action to v6 (#157 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-10-01 11:22:53 +01:00
renovate[bot]	107988a5b3	Update actions/stale action to v5 (#149 ) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Luke Tainton <ltainton@cisco.com>	2022-04-13 14:47:09 +01:00
dependabot[bot]	ae82b926f6	⬆️ Bump guzzlehttp/psr7 from 1.6.1 to 1.8.5 in /app (#150 ) Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 1.6.1 to 1.8.5. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/1.8.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/1.6.1...1.8.5) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-13 14:46:49 +01:00
renovate[bot]	b12134b1c0	Update dependency docker to v20 (#152 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2022-04-13 14:46:39 +01:00
renovate[bot]	c56e16206b	Update actions/checkout action to v3 (#148 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2022-04-13 14:45:12 +01:00
Luke Tainton	06a4e56ee7	Move back to GitHub	2022-04-13 14:42:05 +01:00
Luke Tainton	c00037d3f6	Migrate to GitLab	2022-03-11 16:43:49 +00:00
renovate[bot]	c6a578b5bb	Update actions/stale action to v4 (#146 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2021-10-18 20:41:29 +01:00
dependabot[bot]	f7ce7cd401	⬆️ Bump phpseclib/phpseclib from 2.0.28 to 2.0.31 in /app (#142 ) Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.28 to 2.0.31. - [Release notes](https://github.com/phpseclib/phpseclib/releases) - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md) - [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.28...2.0.31) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-04-20 22:26:31 +01:00
Luke Tainton	18cdccb63e	Update Docker registry	2021-03-06 16:46:10 +00:00
Luke Tainton	bb3143c7c8	Update Docker registry	2021-03-06 16:44:29 +00:00
Luke Tainton	80679499e1	Update docker-compose config location (#141 )	2020-10-23 10:37:55 +01:00
renovate[bot]	23bf431c74	Update actions/stale action to v3 (#139 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-10-23 10:27:16 +01:00