Skip to content

Commit bb50f0f

Browse files
committed
Merge branch 'wip-version-7' into wip-version-7-dbal
2 parents 97db4db + 4d26ade commit bb50f0f

File tree

5 files changed

+47
-6
lines changed

5 files changed

+47
-6
lines changed

.github/workflows/sonar.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: SonarQube Scan
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
sonar:
8+
runs-on: ubuntu-latest
9+
continue-on-error: true
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: SonarQube Scan
13+
uses: SonarSource/sonarqube-scan-action@v2
14+
env:
15+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
16+
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
17+
with:
18+
args: >
19+
-Dsonar.projectKey=${{ github.event.repository.name }}
20+
-Dsonar.projectName=${{ github.event.repository.name }}

conformance-tests/conformance-basic-ci.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
"match": "https://op.local.stack-dev.cirrusidentity.com/simplesaml/module.php/core/loginuserpass*",
3737
"commands": [["click", "id", "submit_button"]]
3838
},
39+
{
40+
"task": "Post Login Redirect",
41+
"optional": true,
42+
"match": "https://op.local.stack-dev.cirrusidentity.com/simplesaml/module.php/core/postredirect*",
43+
"commands": [["wait", "id", "submission_complete", 10]]
44+
},
3945
{
4046
"task": "Verify Complete",
4147
"match": "*/test/a/simplesamlphp-module-oidc/callback*",

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG SSP_VERSION="v2.4.4"
22
FROM cirrusid/simplesamlphp:${SSP_VERSION}
33
#FROM cicnavi/simplesamlphp:${SSP_VERSION}
44

5-
RUN apt-get update && apt-get install -y sqlite3
5+
RUN apt-get update && apt-get --no-install-recommends install -y sqlite3
66
# Prepopulate the DB with items needed for testing
77
ADD docker/conformance.sql /tmp/
88
# Preload some clients

templates/config/federation.twig

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,33 @@
1111
<h4>{{ 'Entity'|trans }}</h4>
1212
<p>
1313
{{ 'Configuration URL'|trans }}:
14-
<a href="{{ routes.urlFederationConfiguration }}" target="_blank">{{ routes.urlFederationConfiguration }}</a>
14+
<a href="{{ routes.urlFederationConfiguration }}"
15+
target="_blank"
16+
rel="noopener noreferrer"
17+
>{{ routes.urlFederationConfiguration }}</a>
1518
</p>
1619
<p>
1720
{{ 'Issuer'|trans }}: {{ moduleConfig.getIssuer }}
1821
<br>
1922
{{ 'Organization Name'|trans }}: {{ moduleConfig.getOrganizationName }}
2023
<br>
2124
{{ 'Logo URI'|trans }}:
22-
<a href="{{ moduleConfig.getLogoUri }}" target="_blank">{{ moduleConfig.getLogoUri }}</a>
25+
<a href="{{ moduleConfig.getLogoUri }}"
26+
target="_blank"
27+
rel="noopener noreferrer"
28+
>{{ moduleConfig.getLogoUri }}</a>
2329
<br>
2430
{{ 'Policy URI'|trans }}:
25-
<a href="{{ moduleConfig.getPolicyUri }}" target="_blank">{{ moduleConfig.getPolicyUri }}</a>
31+
<a href="{{ moduleConfig.getPolicyUri }}"
32+
target="_blank"
33+
rel="noopener noreferrer"
34+
>{{ moduleConfig.getPolicyUri }}</a>
2635
<br>
2736
{{ 'Homepage URI'|trans }}:
28-
<a href="{{ moduleConfig.getHomepageUri }}" target="_blank">{{ moduleConfig.getHomepageUri }}</a>
37+
<a href="{{ moduleConfig.getHomepageUri }}"
38+
target="_blank"
39+
rel="noopener noreferrer"
40+
>{{ moduleConfig.getHomepageUri }}</a>
2941
<br>
3042
{{ 'Contacts'|trans }}:
3143
{% if moduleConfig.getContacts is not empty %}

templates/config/protocol.twig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
<h4>{{ 'Entity'|trans }}</h4>
88
<p>
99
{{ 'Discovery URL'|trans }}:
10-
<a href="{{ routes.urlConfiguration }}" target="_blank">{{ routes.urlConfiguration }}</a>
10+
<a href="{{ routes.urlConfiguration }}"
11+
target="_blank"
12+
rel="noopener noreferrer"
13+
>{{ routes.urlConfiguration }}</a>
1114
</p>
1215
<p>
1316
{{ 'Issuer'|trans }}: {{ moduleConfig.getIssuer }}

0 commit comments

Comments
 (0)