Run Webtests in the test-browser container

This is where they used to run. But the hostnames changed and the test
setup did change slightly

.env.dist

@@ -27,7 +27,7 @@ APP_SECRET=e1023e5989bec76e282bd0ee405200e0
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://app:[email protected]:3306/db_name?serverVersion=8"
-DATABASE_URL="mysql://spdrw:secret@db.vm.openconext.org/spdashboard?serverVersion=mariadb-10.4.11&charset=utf8"
+DATABASE_URL="mysql://spdrw:secret@db.dev.openconext.local/spdashboard?serverVersion=mariadb-10.4.11&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 MAILER_DSN=null://null
@@ -62,9 +62,9 @@ saml_sp_publickey='%kernel.project_dir%//vendor/surfnet/stepup-saml-bundle/src/R
 saml_sp_privatekey='%kernel.project_dir%//vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_privatekey.pem'
 saml_metadata_publickey='%kernel.project_dir%//vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_publickey.cer'
 saml_metadata_privatekey='%kernel.project_dir%//vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_privatekey.pem'
-saml_remote_idp_entity_id='https://engine.vm.openconext.org/authentication/idp/metadata'
-saml_remote_idp_host=engine.vm.openconext.org
-saml_remote_idp_sso_url='https://engine.vm.openconext.org/authentication/idp/single-sign-on'
+saml_remote_idp_entity_id='https://engine.dev.openconext.local/authentication/idp/metadata'
+saml_remote_idp_host=engine.dev.openconext.local
+saml_remote_idp_sso_url='https://engine.dev.openconext.local/authentication/idp/single-sign-on'
 saml_remote_idp_certificate=MIIDuDCCAqCgAwIBAgIJAPdqJ9JQKN6vMA0GCSqGSIb3DQEBBQUAMEYxDzANBgNVBAMTBkVuZ2luZTERMA8GA1UECxMIU2VydmljZXMxEzARBgNVBAoTCk9wZW5Db25leHQxCzAJBgNVBAYTAk5MMB4XDTE1MDQwMjE0MDE1NFoXDTI1MDQwMTE0MDE1NFowRjEPMA0GA1UEAxMGRW5naW5lMREwDwYDVQQLEwhTZXJ2aWNlczETMBEGA1UEChMKT3BlbkNvbmV4dDELMAkGA1UEBhMCTkwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeVodghQwFR0pItxGaJ3LXHA+ZLy1w/TMaGDcJaszAZRWRkL/6djwbabR7TB45QN6dfKOFGzobQxG1Oksky3gz4Pki1BSzi/DwsjWCw+Yi40cYpYeg/XM0tvHKVorlsx/7Thm5WuC7rwytujr/lV7f6lavf/ApnLHnOORU2h0ZWctJiestapMaC5mc40msruWWp04axmrYICmTmGhEy7w0qO4/HLKjXtWbJh71GWtJeLzG5Hj04X44wI+D9PUJs9U3SYh9SCFZwq0v+oYeqajiX0JPzB+8aVOPmOOM5WqoT8OCddOM/TlsL/0PcxByGHsgJuWbWMI1PKlK3omR764PAgMBAAGjgagwgaUwHQYDVR0OBBYEFLowmsUCD2CrHU0lich1DMkNppmLMHYGA1UdIwRvMG2AFLowmsUCD2CrHU0lich1DMkNppmLoUqkSDBGMQ8wDQYDVQQDEwZFbmdpbmUxETAPBgNVBAsTCFNlcnZpY2VzMRMwEQYDVQQKEwpPcGVuQ29uZXh0MQswCQYDVQQGEwJOTIIJAPdqJ9JQKN6vMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIF9tGG1C9HOSTQJA5qL13y5Ad8G57bJjBfTjp/dw308zwagsdTeFQIgsP4tdQqPMwYmBImcTx6vUNdiwlIol7TBCPGuqQAHD0lgTkChCzWezobIPxjitlkTUZGHqn4Kpq+mFelX9x4BElmxdLj0RQV3c3BhoW0VvJvBkqVKWkZ0HcUTQMlMrQEOq6D32jGh0LPCQN7Ke6ir0Ix5knb7oegND49fbLSxpdo5vSuxQd+Zn6nI1/VLWtWpdeHMKhiw2+/ArR9YM3cY8UwFQOj9Y6wI6gPCGh/q1qv2HnngmnPrNzZik8XucGcf1Wm2zE4UIVYKW31T52mqRVDKRk8F3Eo=
 
 # The default timeout for Curl requests when retrieving metadata
@@ -73,19 +73,19 @@ metadata_url_timeout=30
 # Manage defaults
 
 ## Manage test instance
-manage_test_host='https://manage.vm.openconext.org'
+manage_test_host='https://manage.dev.openconext.local'
 manage_test_username=sp-dashboard
 manage_test_password=secret
 manage_test_publication_status=testaccepted
 
 ## Manage production instance
-manage_prod_host='https://manage.vm.openconext.org'
+manage_prod_host='https://manage.dev.openconext.local'
 manage_prod_username=sp-dashboard
 manage_prod_password=secret
 manage_prod_publication_status=prodaccepted
 
 ## Teams test instance
-teams_host='https://teams.vm.openconext.org'
+teams_host='https://teams.dev.openconext.local'
 teams_username=spdashboard
 teams_password=secret
 

.env.test

@@ -6,5 +6,5 @@ APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 DATABASE_URL="sqlite:////tmp/spdashboard-webtests.sqlite"
 PANTHER_APP_ENV=panther
-administrator_teams="'urn:collab:admin.org:example.org'"
+administrator_teams="'urn:collab:org:dev.openconext.local'"
 jira_test_mode_storage_path='/var/www/html/var/webtest-jira.json'

cypress/e2e/a11y/dashboard.a11y.cy.js

@@ -3,7 +3,7 @@ import {terminalLog} from '../../functions/terminalLog';
 context('SPD verify a11y of dashboard', () => {
     beforeEach(() => {
         cy.login();
-        cy.visit('https://spdashboard.vm.openconext.org');
+        cy.visit('https://spdashboard.dev.openconext.local');
     });
 
     it('contains no a11y problems on load', () => {

cypress/e2e/edit_arp.cy.js

@@ -9,7 +9,7 @@ context('Edit ARP', () => {
     cy.loginToManageAndSelectTiffanyAching();
     cy.goToArpTab();
     cy.addSurfCrmId();
-    cy.visit('https://spdashboard.vm.openconext.org/service/2');
+    cy.visit('https://spdashboard.dev.openconext.local/service/2');
     cy.editEntity();
     cy.addPersonalCodeAttribute();
     cy.addComment('testing editing an attribute');

cypress/e2e/edit_service.cy.js

@@ -10,7 +10,7 @@ context('Edit another service', () => {
 
     // Als ingelogde gebruiker van dienst X kan ik geen edits doen in dienst Y (door het raden van de url van een andere service bijvoorbeeld)
     it('is not possible to edit another service', () => {
-        cy.visit('https://spdashboard.vm.openconext.org/service/3', { failOnStatusCode: false });
+        cy.visit('https://spdashboard.dev.openconext.local/service/3', { failOnStatusCode: false });
         cy.contains('Unable to find service');
     });
 

cypress/support/commands.js

@@ -37,7 +37,7 @@ Cypress.Commands.add('clickSubmit', () => {
 });
 
 Cypress.Commands.add('selectService', (serviceId = 1) => {
-    cy.visit(`https://spdashboard.vm.openconext.org/service/${serviceId}`);
+    cy.visit(`https://spdashboard.dev.openconext.local/service/${serviceId}`);
 });
 
 Cypress.Commands.add('checkCorrectTextValue', (label, value) => {

cypress/support/commands/fixtures/new_saml_entity_template.json

@@ -20,7 +20,7 @@
     "entityid": "{{entityId}}",
     "metaDataFields": {
       "AssertionConsumerService:0:Binding": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
-      "AssertionConsumerService:0:Location": "https://test.vm.openconext.org/acs",
+      "AssertionConsumerService:0:Location": "https://test.dev.openconext.local/acs",
       "NameIDFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
       "OrganizationName:en": "{{name}}",
       "coin:signature_method": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256",

cypress/support/commands/login.js

@@ -34,13 +34,13 @@ Cypress.Commands.add('checkForConsent', () => {
 });
 
 Cypress.Commands.add('login', (username = 'Tiffany', pass = 'Aching') => {
-    cy.origin('https://mujina-idp.vm.openconext.org', {args: {username, pass}}, ({username, pass}) => {
+    cy.origin('https://mujina-idp.dev.openconext.local', {args: {username, pass}}, ({username, pass}) => {
         cy.visit('/login');
         cy.get('#username').type(username);
         cy.get('#password').type(pass);
         cy.get('.login-form').submit();
     });
-    const url = 'https://spdashboard.vm.openconext.org';
+    const url = 'https://spdashboard.dev.openconext.local';
     cy.wait(400);
     cy.visit({
         url: url,

cypress/support/commands/manage.js

@@ -36,7 +36,7 @@ Cypress.Commands.add('createEntity', (entityId, team, name, attributes, environm
     };
     metadataTemplate = stringTemplateParser(JSON.stringify(metadataTemplate), templateVariables);
 
-    fetch('https://manage.vm.openconext.org/manage/api/internal/metadata', {
+    fetch('https://manage.dev.openconext.local/manage/api/internal/metadata', {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
@@ -58,7 +58,7 @@ Cypress.Commands.add('removeEntitiesForTeam', (teamName) => {
 
     const protocols = ['saml20_sp', 'oidc10_rp', 'oauth20_rs'];
 
-    let searchUri = 'https://manage.vm.openconext.org/manage/api/internal/search/${type}'
+    let searchUri = 'https://manage.dev.openconext.local/manage/api/internal/search/${type}'
 
     const searchBody = '{"metaDataFields.coin:service_team_id": "' + teamName.toString() +'"}';
 
@@ -78,7 +78,7 @@ Cypress.Commands.add('removeEntitiesForTeam', (teamName) => {
         .then(data => {
             for (const entityIndex in data) {
                 const entityId = data[entityIndex]['_id'];
-                const deleteUri = 'https://manage.vm.openconext.org/manage/api/internal/metadata/${type}/${entityId}';
+                const deleteUri = 'https://manage.dev.openconext.local/manage/api/internal/metadata/${type}/${entityId}';
                 let uri = deleteUri.toString().replace('${entityId}', entityId);
                 uri = uri.toString().replace('${type}', entityType);
 
@@ -106,7 +106,7 @@ Cypress.Commands.add('removeEntitiesForTeam', (teamName) => {
 });
 
 Cypress.Commands.add('deleteEntity', (entityType = '', entityId = '') => {
-    const deleteUri = 'https://manage.vm.openconext.org/manage/api/internal/metadata/${type}/${entityId}';
+    const deleteUri = 'https://manage.dev.openconext.local/manage/api/internal/metadata/${type}/${entityId}';
     let uri = deleteUri.toString().replace('${entityId}', entityId);
     uri.toString().replace('${type}', entityType);
 
@@ -127,13 +127,13 @@ Cypress.Commands.add('deleteEntity', (entityType = '', entityId = '') => {
         });
 });
 
-Cypress.Commands.add('loginToManage', (url = 'https://manage.vm.openconext.org') => {
+Cypress.Commands.add('loginToManage', (url = 'https://manage.dev.openconext.local') => {
     cy.visit(url);
     cy.wait(300);
     cy.checkForManage();
 });
 
-Cypress.Commands.add('loginToManageAndSelectTiffanyAching', (url = 'https://manage.vm.openconext.org') => {
+Cypress.Commands.add('loginToManageAndSelectTiffanyAching', (url = 'https://manage.dev.openconext.local') => {
     cy.loginToManage(url);
     cy.get('.search-input').type('Tiffany Aching');
     cy.get('.matched').contains('Tiffany Aching').click();

docker-compose-openconext.yml

@@ -9,10 +9,10 @@ services:
       dockerfile: Dockerfiledev
       target: openconext
     extra_hosts:
-      engine-api.vm.openconext.org: 127.0.0.2
-      engine.vm.openconext.org: 127.0.0.1
-      manage.vm.openconext.org: 127.0.0.1
-      voot.vm.openconext.org: 127.0.0.1
+      engine-api.dev.openconext.local: 127.0.0.2
+      engine.dev.openconext.local: 127.0.0.1
+      manage.dev.openconext.local: 127.0.0.1
+      voot.dev.openconext.local: 127.0.0.1
       connect.vm.openconext.org: 127.0.0.1
       test.openconext.org: 127.0.0.1
       teams.vm.openconext.org: 127.0.0.1
@@ -22,7 +22,7 @@ services:
       spdashboard:
         aliases:
           - db.vm.openconext.org
-          - engine.vm.openconext.org
+          - engine.dev.openconext.local
           - manage.vm.openconext.org
           - teams.vm.openconext.org
           - spdashboard.vm.openconext.org

docker-compose.yml

@@ -4,9 +4,6 @@ include:
 services:
     spdashboard:
       image:  ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest
-      environment:
-        - APP_ENV=dev
-        - APP_DEBUG=true
       volumes:
         - ../OpenConext-devconf/core/:/config
         - ./:/var/www/html/

docker/Dockerfiledev

@@ -8,7 +8,7 @@ COPY ./conf/spdup.sh /usr/local/sbin/spdup.sh
 CMD ["/usr/local/sbin/start.sh"]
 
 FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest as spddev
-COPY --from=openconext /etc/pki/ca-trust/source/anchors/star.vm.openconext.org.pem /usr/local/share/ca-certificates/star.vm.openconext.org.pem
+COPY --from=openconext /etc/pki/ca-trust/source/anchors/star.dev.openconext.local.pem /usr/local/share/ca-certificates/star.dev.openconext.local.pem
 COPY ./conf/zz-docker.conf /usr/local/etc/php/conf.d/
 COPY ./conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 RUN   /usr/sbin/update-ca-certificates

docker/conf/cypress_import_cert.sh

@@ -1,10 +1,10 @@
-# This will import the certificate offered by manage.vm.openconext.org into the local certificate store.
+# This will import the certificate offered by manage.dev.openconext.local into the local certificate store.
 
-until $(curl -k --output /dev/null --silent --head --fail https://manage.vm.openconext.org); do
+until $(curl -k --output /dev/null --silent --head --fail https://manage.dev.openconext.local); do
     printf '.'
     sleep 1
 done
 
-echo QUIT | openssl s_client -connect manage.vm.openconext.org:443  | sed -ne '/BEGIN CERT/,/END CERT/p' > /usr/share/ca-certificates/openconext.pem
+echo QUIT | openssl s_client -connect manage.dev.openconext.local:443  | sed -ne '/BEGIN CERT/,/END CERT/p' > /usr/share/ca-certificates/openconext.pem
 echo openconext.pem >> /etc/ca-certificates.conf
 update-ca-certificates

docker/conf/prep_oc.sh

@@ -13,19 +13,19 @@ mysql -e "create database if not exists spdashboard"
 mysql -e "grant all on spdashboard.* to spdrw identified by 'secret'"
 
 # We wait until manage becomes available
-while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' https://manage.vm.openconext.org/manage/api/health)" != "200" ]] ; do
+while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' https://manage.dev.openconext.local/manage/api/health)" != "200" ]] ; do
       sleep 5
 done
 
 # Add the SPdashboard SAML client to Manage and push 
 pass=$(cat /opt/manage/manage-api-users.yml | grep -A1 sysadmin | grep password | cut -d '"' -f2)
-curl  -H 'Content-Type: application/json' -u sysadmin:$pass -d@/usr/local/etc/saml20_sp.json -XPOST https://manage.vm.openconext.org/manage/api/internal/metadata
-curl  -u sysadmin:$pass -XGET https://manage.vm.openconext.org/manage/api/internal/push
+curl  -H 'Content-Type: application/json' -u sysadmin:$pass -d@/usr/local/etc/saml20_sp.json -XPOST https://manage.dev.openconext.local/manage/api/internal/metadata
+curl  -u sysadmin:$pass -XGET https://manage.dev.openconext.local/manage/api/internal/push
 
 # Set the Mujina Guest qualifier to "none"
-mujina_entity_id=$(curl -s -H  'Content-Type: application/json' -u sysadmin:$pass  -X POST -d '{"ALL_ATTRIBUTES":true, "entityid":"http://mock-idp"}' 'https://manage.vm.openconext.org/manage/api/internal/search/saml20_idp'| python2 -c 'import sys, json; print json.load(sys.stdin)[0]["_id"]')
-curl -s -H 'Content-Type: application/json' -u sysadmin:$pass -X PUT -d '{"id": "'$mujina_entity_id'", "type": "saml20_idp", "pathUpdates": { "metaDataFields.coin:guest_qualifier": "None" }}' https://manage.vm.openconext.org/manage/api/internal/merge
-curl  -u sysadmin:$pass -XGET https://manage.vm.openconext.org/manage/api/internal/push
+mujina_entity_id=$(curl -s -H  'Content-Type: application/json' -u sysadmin:$pass  -X POST -d '{"ALL_ATTRIBUTES":true, "entityid":"http://mock-idp"}' 'https://manage.dev.openconext.local/manage/api/internal/search/saml20_idp'| python2 -c 'import sys, json; print json.load(sys.stdin)[0]["_id"]')
+curl -s -H 'Content-Type: application/json' -u sysadmin:$pass -X PUT -d '{"id": "'$mujina_entity_id'", "type": "saml20_idp", "pathUpdates": { "metaDataFields.coin:guest_qualifier": "None" }}' https://manage.dev.openconext.local/manage/api/internal/merge
+curl  -u sysadmin:$pass -XGET https://manage.dev.openconext.local/manage/api/internal/push
 
 # Add the sp-dashboard user to the manage api user list
 echo '    - {' >> /opt/manage/manage-api-users.yml
@@ -37,8 +37,8 @@ systemctl restart manage
 # Add spdashboard to the loadbalancer. We reuse the welcome backend for it 
 echo "  backend spdashboard_be" >> /etc/haproxy/haproxy_backend.cfg
 echo "  server spd spdashboard_web:80" >> /etc/haproxy/haproxy_backend.cfg
-echo "spdashboard.vm.openconext.org spdashboard_be"  >> /etc/haproxy/maps/backends.map
-echo "spdashboard.vm.openconext.org" >> /etc/haproxy/acls/validvhostsunrestricted.acl
+echo "spdashboard.dev.openconext.local spdashboard_be"  >> /etc/haproxy/maps/backends.map
+echo "spdashboard.dev.openconext.local" >> /etc/haproxy/acls/validvhostsunrestricted.acl
 systemctl reload haproxy
 
 # Finished, make sure we don't run again

docker/conf/saml20_sp.json

@@ -2,7 +2,7 @@
   "version": 1,
   "type": "saml20_sp",
   "data": {
-    "entityid": "https://spdashboard.vm.openconext.org/saml/metadata",
+    "entityid": "https://spdashboard.dev.openconext.local/saml/metadata",
     "state": "prodaccepted",
     "allowedall": true,
     "arp": {
@@ -15,12 +15,12 @@
       "OrganizationName:en" : "OpenConext",
       "coin:no_consent_required" : true,
       "AssertionConsumerService:0:Binding": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
-      "AssertionConsumerService:0:Location": "https://spdashboard.vm.openconext.org/saml/acs",
+      "AssertionConsumerService:0:Location": "https://spdashboard.dev.openconext.local/saml/acs",
       "NameIDFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
       "coin:signature_method": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
     },
     "allowedEntities": [],
-    "metadataurl": "https://spd.vm.openconext.org/saml/metadata",
+    "metadataurl": "https://spd.dev.openconext.local/saml/metadata",
     "type": "saml20-sp",
     "revisionnote": "Initial import"
   }

docker/conf/spdup.sh

@@ -1,2 +1,2 @@
 # Wait untill the spdashboard is available
-while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' https://spdashboard.vm.openconext.org/health)" != "200" ]] ; do sleep 5; done
+while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' https://spdashboard.dev.openconext.local/health)" != "200" ]] ; do sleep 5; done

docs/teams.md

@@ -22,13 +22,13 @@ In order to use this, you need to recreate some parts of your dev env:
 
 - Start it, wait some time until everything is started. Then you need to fix a scope provisioning issue in OpenConext deploy:
 
-    - navigate to `https://manage.vm.openconext.org`
+    - navigate to `https://manage.dev.openconext.local`
     - Open the scopes tab, and add the scope "groups" (name and description don't matter)
-        - Move to the resource servers tab, and edit the resource server "voot.vm.openconext.org"
+        - Move to the resource servers tab, and edit the resource server "voot.dev.openconext.local"
     - Remove the "groups" scope. And save it
     - Reopen it, and add it again (yes this is really how you get it up & running again)
     - Click on PUSH
-    - You should now be able to open `https://teams.vm.openconext.org` (which in your /etc/hosts should point to 127.0.01)
+    - You should now be able to open `https://teams.dev.openconext.local` (which in your /etc/hosts should point to 127.0.01)
 
 ## 3. Accessing the logs
 
@@ -43,12 +43,12 @@ The docker container does not contain a functioning email service, and so sendin
 Therefore: to test with an actual member, you need to do the following:
 1. Find the invitation_uiid of the user you want to accept `docker-compose exec openconext mysql -e "select * from invitations \G" teams`
 When accepting a new invite a new private window needs to be opened, otherwise the following error will show: "You are already a member of this Team."
-2. Accept the invite by going to the following url: `https://teams.vm.openconext.org/invitation/accept/"invitation_uiid"` where you replace the text between the "" with the invitation_uiid found in the previous step.
+2. Accept the invite by going to the following url: `https://teams.dev.openconext.local/invitation/accept/"invitation_uiid"` where you replace the text between the "" with the invitation_uiid found in the previous step.
 
 Once this has been done you can make the team public so adding new members will be easier.
 This can be done with the next steps:
-1. Make sure that the user has the Owner role in `spdashboard.vm.openconext.org`.
-2. In `https://teams.vm.openconext.org/my-teams` open the team and enable the PUBLIC TEAM and PUBLIC LINK boxes.
+1. Make sure that the user has the Owner role in `spdashboard.dev.openconext.local`.
+2. In `https://teams.dev.openconext.local/my-teams` open the team and enable the PUBLIC TEAM and PUBLIC LINK boxes.
 3. In a new private browser this link can be used to join with a new login session.
 
 Subsequent team members can now join by using the public link within a new private browser.

tests/unit/Infrastructure/Manage/Dto/fixture/oidc_1.json

@@ -17,15 +17,15 @@
     ],
     "allowedResourceServers": [
       {
-        "name": "voot.vm.openconext.org"
+        "name": "voot.dev.openconext.local"
       }
     ],
     "allowedall": false,
     "arp": {
       "attributes": {},
       "enabled": true
     },
-    "entityid": "teams.vm.openconext.org",
+    "entityid": "teams.dev.openconext.local",
     "metaDataFields": {
       "OrganizationName:en": "OpenConext",
       "description:en": "OAuth client to access VOOT for group information",