Upgrade Stepup-RA to run on Symfony 6.4 and PHP 8.2

.docheader

@@ -0,0 +1,15 @@
+/**
+ * Copyright %regexp:\d{4}% SURFnet %regexp:(B.V.|bv)%
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

.github/workflows/build-push-docker-image.yml

@@ -0,0 +1,68 @@
+name: build-push-docker-image
+
+on:
+  push:
+    branches: feature/docker_configs
+  workflow_dispatch:
+
+jobs:
+  build-push-docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Get the latest release
+        id: release
+        uses: robinraju/[email protected]
+        with:
+          latest: true
+          fileName: "*.tar.bz2"
+
+      - name: Get commit details for the tag from the latest release
+        id: commit_details
+        run: |
+          GIT_SHA=$(git rev-list -n 1 ${{ steps.release.outputs.tag_name }})
+          GIT_COMMIT_TIME=$(git show -s --format=%ci ${{ steps.release.outputs.tag_name }})
+          echo "::set-output name=sha::$GIT_SHA"
+          echo "::set-output name=commit_time::$GIT_COMMIT_TIME"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set docker labels and tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/openconext/stepup-ra/stepup-ra
+          tags: |
+            type=ref,event=tag
+            type=semver,pattern={{version}}
+            type=sha
+            type=raw,value=prod
+
+      - name: Build and push the Production image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          build-args: |
+            APP_VERSION=${{ steps.release.outputs.tag_name }}
+            GIT_SHA=${{ steps.commit_details.outputs.sha }}
+            GIT_COMMIT_TIME=${{ steps.commit_details.outputs.commit_time }}
+          file: docker/Dockerfile.prod
+          platforms: linux/amd64,linux/arm64
+          push: true          
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/daily-security-check.yml

@@ -19,9 +19,9 @@ jobs:
         uses: andstor/file-existence-action@v2
         with:
           files: "composer.lock"
-      - name: Run php local security checker
-        if: steps.check_composer.outputs.files_exists == 'true'
-        uses: symfonycorp/security-checker-action@v4
+      -   name: Vulnerability check
+          run: php composer audit
+          if: steps.check_composer.outputs.files_exists == 'true'
 
       # node-yarn checks
       - name: Check for node-yarn project
@@ -97,6 +97,6 @@ jobs:
           SLACK_COLOR: ${{ job.status }}
           SLACK_ICON: https://static.surfconext.nl/logos/idp/surfnet.png
           SLACK_MESSAGE: 'Dependency check failed :crying_cat_face:'
-          SLACK_TITLE: Dependency check wants attention
+          SLACK_TITLE: ${{ github.repository }} wants attention
           SLACK_USERNAME: NightlySecurityCheck
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/tag-release.yml

@@ -5,27 +5,33 @@ on:
       - "*.*.*"
 jobs:
   build:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     timeout-minutes: 10
     env:
       COMPONENT_NAME: Stepup-RA
     if: always()
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: OpenConext/Stepup-Build
-          ref: master
+          ref: feature/php82_build
+
       - name: Output the semver tag to the tag variable
         id: vars
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+
       - name: Run release script
         run: ./stepup-build.sh ${COMPONENT_NAME} --tag ${{ steps.vars.outputs.tag }}
+
       - name: Grab the archive filename
         id: archive
         run: |
           echo ::set-output name=archive::$(find . -maxdepth 1 -name "$COMPONENT_NAME*.tar.bz2" -printf '%f\n')
           echo ::set-output name=shasum::$(find . -maxdepth 1 -name "$COMPONENT_NAME*.sha" -printf '%f\n')
+
       - name: Create Draft Release
         id: create_release
         uses: actions/create-release@v1
@@ -37,6 +43,7 @@ jobs:
           body: Auto generated release. Please update these release notes manually.
           draft: true
           prerelease: false
+
       - uses: actions/[email protected]
         name: Upload the release artefact tarbal
         env:
@@ -62,3 +69,11 @@ jobs:
         with:
           release_id: ${{ steps.create_release.outputs.id }}
 
+  after_build:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Docker container build
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: build-push-docker-image.yml

.github/workflows/test-integration.yml

@@ -1,48 +1,29 @@
-name: test-integration
-on:
-  pull_request:
-  push:
-    branches: [ master, develop ]
+name: Run QA tests (static analysis, lint and unit tests)
+on: [pull_request]
+
 jobs:
-  build:
+  run-qa-tests:
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    defaults:
+      run:
+        working-directory: /var/www/html/
+    container:
+      image:  ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest
+      volumes:
+        - .:/var/www/html
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Init environment
-        run: |
-          cd ci/docker
-          docker-compose up -d
-      - name: Install dependencies
-        run: |
-          cd ci/docker && docker-compose exec -T stepup-ra bash -lc '
-          composer install
-          yarn
-          ./bin/console assets:install
-          '
-      - name: Build frontend assets
-        run: cd ci/docker && docker-compose exec -T stepup-ra bash -lc 'yarn encore production'
-      - name: Run test scripts
-        run: cd ci/docker && docker-compose exec -T stepup-ra bash -lc ' composer test '
-      - name: Output log files on failure
-        if: failure()
-        run: cd ci/docker && docker-compose exec -T stepup-ra -c 'cat var/log/webtest.log'
+        uses: actions/checkout@v4
+
+      - name: Composer install
+        run: composer install
+
+      - name: Yarn install
+        run: yarn
+
+      - name: build frontend
+        run: yarn encore prod
+
+      - name: Run QA tests
+        run: composer check

.gitignore

@@ -1,25 +1,12 @@
-/web/bundles/
-/web/app_dev.php
-/web/app_dev.php.dist
-/web/app_test.php
-/app/bootstrap.php.cache
-/web/css/*
-/web/js/*
 /config/*.crt
 /config/*.key
 /config/keys
-/app/cache/*
-/config/legacy/parameters.yaml
-/config/legacy/samlstepupproviders_parameters.yaml
-/config/legacy/global_view_parameters.yaml
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
+/config/openconext/parameters.yaml
+/config/openconext/samlstepupproviders_parameters.yaml
+/config/openconext/global_view_parameters.yaml
 /build/
 /composer.phar
 /cache.properties
-/app/SymfonyRequirements.php
-/app/check.php
 /local-php-security-checker
 .idea/
 

.scrutinizer.yml

@@ -1,3 +1,9 @@
+build:
+    image: default-jammy
+    environment:
+        php: 8.2
+        node: v20
+
 filter:
     excluded_paths:
         - "*/Tests/*"

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 6.0.0
+- Update php8 and Symfony 6.4
+
 ## 5.0.5
 - Translate remaining [Recovery token] occurrences #303
 - Installed security updates for phpseclib/phpseclib and guzzlehttp/psr7

assets/js/app.js

@@ -4,4 +4,4 @@ import 'bootstrap-less';
 
 
 import '../../vendor/surfnet/stepup-bundle/src/Resources/public/js/stepup.js';
-import '../../src/Surfnet/StepupRa/RaBundle/Resources/public/js/stepup-ra.js';
+import './stepup-ra.js';

src/Surfnet/StepupRa/RaBundle/Resources/public/js/stepup-ra.js → assets/js/stepup-ra.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import moment from "moment";
+
 (function ($) {
     'use strict';
 

src/Surfnet/StepupRa/RaBundle/Resources/public/less/style.less → assets/less/style.less

@@ -1,5 +1,5 @@
-@import "../../../../../../../node_modules/bootstrap-less/bootstrap/index";
-@import "../../../../../../../node_modules/font-awesome/less/font-awesome";
+@import "../../node_modules/bootstrap-less/bootstrap/index";
+@import "../../node_modules/font-awesome/less/font-awesome";
 
 .progress-steps {
     font-size: 110%;

bin/console

@@ -1,42 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-use App\Kernel;
+use Surfnet\StepupRa\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\ErrorHandler\Debug;
 
-if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
-    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+if (!is_file(dirname(__DIR__).'/vendor/autoload.php')) {
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }
 
-set_time_limit(0);
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__).'/config/bootstrap.php';
 
-require dirname(__DIR__).'/vendor/autoload.php';
+return function (array $context) {
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 
-if (!class_exists(Application::class)) {
-    throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
-}
-
-$input = new ArgvInput();
-if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
-}
-
-if ($input->hasParameterOption('--no-debug', true)) {
-    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
-}
-
-require dirname(__DIR__).'/config/bootstrap.php';
-
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$application = new Application($kernel);
-$application->run($input);
+    return new Application($kernel);
+};