Merge branch 'italia-master'

italia · Jan 31, 2023 · 3e224c0 · 3e224c0
2 parents d3db2d6 + 9b26830
commit 3e224c0
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 19 deletions.
diff --git a/.github/workflows/docker-ghcr-cd.yaml b/.github/workflows/docker-ghcr-cd.yaml
@@ -0,0 +1,47 @@
+# 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: Create and publish a Docker image
+
+on:
+  release:
+    types:
+      - published
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_SECRET }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/README.idpy.forks.mngmnt.md b/README.idpy.forks.mngmnt.md
@@ -5,15 +5,12 @@ git clone https://github.com/identitypython/pysaml2
 cd pysaml2/
 
 # create current pplnx branch
-git checkout --orphan pplnx-v7.0.1+
+git checkout --orphan pplnx-v7.2.1
 git remote add pplnx https://github.com/peppelinux/pysaml2.git
 git reset --hard
 git pull origin master
 
 # pplnx's patches
-# https://github.com/IdentityPython/pysaml2/pull/602/files
-# SPID requirements
-git pull pplnx date_xsd_type
 
 # https://github.com/IdentityPython/pysaml2/pull/628
 # SPID required
@@ -24,33 +21,34 @@ git pull pplnx disabled_weak_algs
 git pull pplnx ns_prefixes
 ````
 
-If `ns_prefixes` still conflicts, mind these two lines (#15 #16):
-````
-TMPL_NO_HEADER = """<xenc:EncryptedData xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="{ed_id}" Type="http://www.w3.org/2001/04/xmlenc#Element"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc" /><ds:KeyInfo><xenc:EncryptedKey Id="{ek_id}"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" />{key_info}<xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedKey></ds:KeyInfo><xenc:CipherData><xenc:CipherValue /></xenc:CipherData></xenc:EncryptedData>"""
-TMPL = f"<?xml version='1.0' encoding='UTF-8'?>\n{TMPL_NO_HEADER}"
-````
 # SATOSA
 
 ````
 git clone https://github.com/identitypython/satosa
 cd SATOSA
 git remote add pplnx https://github.com/peppelinux/SATOSA.git
-git checkout --orphan pplnx-v8.0.0
+git checkout --orphan pplnx-v8.2.0
 git reset --hard
 git pull origin master
 
 pip install -r tests/test_requirements.txt
+pip install pymongo
 
 # install mongodb first!
-apt install -y gnupg wget
-wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
-echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
-apt update
-apt install -y mongodb-org
-systemctl start mongod
+sudo apt install dirmngr gnupg apt-transport-https ca-certificates software-properties-common
+wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc | sudo apt-key add -
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-5.0.list
+sudo apt update
+
+# workaround for ubuntu 22.04
+wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
+sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
+
+sudo apt install -y mongodb-org
+sudo systemctl start mongod
 
 # check that tests are ok
-py.test tests/ -x
+python3 -m pytest tests/ -x
 
 # https://github.com/IdentityPython/SATOSA/pull/363
 git pull pplnx cookie_conf_2

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.1.0
-git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.0.0
+git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.2.1
+git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.2.0
 
 pymongo
 satosa_oidcop