Merge branch 'eudi' of github.com:Gartic99/Satosa-Saml2Spid into eudi

italia · Dec 18, 2023 · 3e85c91 · 3e85c91
2 parents 38e89fb + d03c902
commit 3e85c91
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -32,7 +32,6 @@ jobs:
         sudo apt install -y libffi-dev libssl-dev python3-pip xmlsec1 procps libpcre3 libpcre3-dev
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install -r example_sp/djangosaml2_sp/requirements.txt
@@ -53,27 +52,32 @@ jobs:
     - name: djangosaml2 SP metadata to Proxy
       run: |
         wget http://localhost:8000/saml2/metadata -O example/metadata/sp/djangosaml2_sp.xml
+    - name: Create docker-example folder
+      run: |
+        mkdir -p docker-example
+        cp -r example/. docker-example
     - name: run satosa-saml2spid
       run: |
-        cd example
+        cd docker-example
         mkdir -p metadata/idp
         mkdir -p metadata/sp
-        export SATOSA_APP=`python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])'`
-        uwsgi --wsgi-file $SATOSA_APP/satosa/wsgi.py  --https 0.0.0.0:10000,./pki/cert.pem,./pki/privkey.pem --callable app -b 32768 &
-        sleep 5
+    - name: docker compose
+      run: |       
+        cd Docker-compose
+        docker compose -f docker-compose.yml up -d
     - name: Metadata proxy to djangosaml2 SP
       run: |
-        wget --no-check-certificate https://localhost:10000/Saml2IDP/metadata -O example_sp/djangosaml2_sp/saml2_sp/saml2_config/satosa-saml2spid.xml
+        wget --no-check-certificate https://localhost/Saml2IDP/metadata -O example_sp/djangosaml2_sp/saml2_sp/saml2_config/satosa-saml2spid.xml
     - name: spid-sp-test SPID metadata, requests and responses
       run: |
-        cd example
+        cd docker-example
         spid_sp_test --idp-metadata > metadata/idp/spid-sp-test.xml
-        spid_sp_test --metadata-url https://localhost:10000/spidSaml2/metadata --authn-url "http://localhost:8000/saml2/login/?idp=https://localhost:10000/Saml2IDP/metadata&next=/saml2/echo_attributes&idphint=https%253A%252F%252Flocalhost%253A8080" -ap spid_sp_test.plugins.authn_request.SatosaSaml2Spid --extra --debug ERROR -tr
+        spid_sp_test --metadata-url https://localhost/spidSaml2/metadata --authn-url "http://localhost:8000/saml2/login/?idp=https://localhost/Saml2IDP/metadata&next=/saml2/echo_attributes&idphint=https%253A%252F%252Flocalhost%253A8080" -ap spid_sp_test.plugins.authn_request.SatosaSaml2Spid --extra --debug ERROR -tr
     - name: spid-sp-test CIE id metadata
       run: |
-        cd example
-        spid_sp_test --profile cie-sp-public --metadata-url https://localhost:10000/cieSaml2/metadata
+        cd docker-example
+        spid_sp_test --profile cie-sp-public --metadata-url https://localhost/cieSaml2/metadata
     - name: spid-sp-test eIDAS FiCEP metadata
       run: |
-        cd example
-        spid_sp_test --profile ficep-eidas-sp --metadata-url https://localhost:10000/spidSaml2/metadata
+        cd docker-example
+        spid_sp_test --profile ficep-eidas-sp --metadata-url https://localhost/spidSaml2/metadata