Merge tag 'v2.4.14.4' into globus

.dockerignore

@@ -1 +1,38 @@
-/Dockerfile*
+/.project
+/.cproject
+/aclocal.m4
+/config.log
+/config.status
+/configure
+/Makefile
+/Makefile.in
+/autom4te.cache/
+/.libs/
+/m4/
+/compile
+/config.guess
+/install-sh
+/libtool
+/ltmain.sh
+/*.la
+/config.sub
+/depcomp
+/missing
+/.vscode/
+/configure~
+/config.guess~
+/config.sub~
+/test-driver
+/test-suite.log
+/ar-lib
+/.github
+/.gitignore
+/test/test
+/test/*.lo
+/test/*.o
+/test/*.slo
+/test/.libs/
+/test/test-cmd
+/test/.deps/
+/test/.libs/
+/test/.gitignore

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions and Suggestions
+    url: https://github.com/OpenIDC/mod_auth_openidc/discussions
+    about: This issue tracker is not for end users, please provide your question/suggestion in the Discussions forum here.

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Dependencies
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config
+        sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libpcre2-dev
+    - name: Configure
+      run: |
+        ./autogen.sh
+        ./configure
+    - name: Make
+      run: make
+    - name: Test
+      run: make check || (cat test-suite.log && exit -1)
+    - name: Distcheck
+      run: make distcheck DESTDIR=/tmp/mod_auth_openidc

.github/workflows/codeql-analysis.yml

@@ -1,24 +1,6 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '19 13 * * 6'
+on: [push, pull_request]
 
 jobs:
   analyze:
@@ -33,46 +15,27 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'cpp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install packages
       run: |
         sudo apt-get update
         sudo apt-get install -y apache2-dev libcjose-dev libssl-dev
         sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev
 
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # 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@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
 
     - run: |
        ./autogen.sh
        ./configure 
-       make test
+       make check
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/issues.yml

@@ -0,0 +1,18 @@
+on:
+  issues:
+    types: [opened, reopened]
+jobs:
+  check:
+    if: github.event.issue.user.login != 'zandbelt'
+    runs-on: ubuntu-latest
+    steps: 
+      - if: github.event.action == 'opened'
+        uses: actions-ecosystem/action-add-labels@v1
+        name: Label Invalid
+        with:
+          labels: invalid
+      - uses: peter-evans/close-issue@v2
+        name: Close Issue
+        with:
+          comment: "https://github.com/OpenIDC/mod_auth_openidc/wiki#20-why-is-my-ticket-closed-as-invalid"
+

.github/workflows/scorecard.yml

@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '35 16 * * 6'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        with:
+          sarif_file: results.sarif

.gitignore

@@ -1,3 +1,5 @@
+/.project
+/.cproject
 /aclocal.m4
 /config.log
 /config.status
@@ -13,7 +15,7 @@
 /install-sh
 /libtool
 /ltmain.sh
-/mod_auth_openidc.la
+/*.la
 /config.sub
 /depcomp
 /missing
@@ -23,6 +25,10 @@
 /configure~
 /Dockerfile-*
 /*.rpm
-
 /config.guess~
 /config.sub~
+/test-driver
+/test-suite.log
+/ar-lib
+/Makefile.in
+/autom4te.cache/

AUTHORS

@@ -73,7 +73,21 @@ reporting bugs, providing fixes, suggesting useful features or other:
 	Steffen Greber <https://github.com/codemaker219>
 	Iain Heggie <https://github.com/iainh>
 	Dirk Kok <https://github.com/Foxite>
-	Meheni https://github.com/Meheni
-
-
+	Meheni <https://github.com/Meheni>
+	abg35 <https://github.com/abg35>
+	Nathan Neulinger <https://github.com/nneul>
+	Simon Studer <https://github.com/studersi>
+	juur <https://github.com/juur>
+	sebastian-goeldi <https://github.com/sebastian-goeldi>
+	rajeevn1 <https://github.com/rajeevn1>
+	Daan Bakker <https://github.com/dbakker>
+	smanolache <https://github.com/smanolache>
+	blackwhiser1 <https://github.com/blackwhiser1>
+	Ruediger Pluem <https://github.com/rpluem-vf>
+	Nikhil Chaudhari <https://github.com/nvchaudhari1991>
+	Quentin Gillet <qgillet@gmail.com>
+	Brent van Laere <brent.van.laere@gmail.com>
+	Mads Freek Petersen <https://github.com/madsfreek>
+	Stefan Richter <https://github.com/sealor>
+	Mattias Åsander <https://github.com/mattias-asander>