Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not generate per-keyId metadata links for non-IdP metadata #1275

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Do not generate per-keyId metadata links for non-IdP metadata #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e08cd2
Do not generate per-keyId metadata links for non-IdP metadata
thijskh Oct 16, 2023
201ec7a
Add functional test
thijskh Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FrontPage.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Feature:
Then I should see 8 links on the front page
And I should see text matching "The Public SAML Signing certificate of the OpenConext IdP"
And I should see URL "/authentication/idp/certificate"
# The default key should not get a separate URL next to the key-less url
And I should not see URL "/authentication/idp/certificate/key:default"
And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext IdP Proxy"
And I should see URL "/authentication/idp/metadata"
Expand All @@ -28,14 +29,15 @@ Feature:
And I should see URL "/authentication/sp/debug"
And I should see text matching "The Public SAML Signing certificate of the OpenConext SP"
And I should see URL "/authentication/sp/certificate"
And I should not see URL "/authentication/sp/certificate/key:default"
# The key:-variants should only be shown for the IdP metadata feeds
And I should not see URL "/authentication/sp/certificate/key:"
And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext SP Proxy"
And I should see URL "/authentication/sp/metadata"
And I should not see URL "/authentication/sp/metadata/key:default"
And I should not see URL "/authentication/sp/metadata/key:"
And I should see text matching "Step-up authentication Certificate and Metadata"
And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext step-up authentication Proxy"
And I should see URL "/authentication/stepup/metadata"
And I should not see URL "/authentication/stepup/metadata/key:default"
And I should not see URL "/authentication/stepup/metadata/key:"
# eduGAIN metadata is no longer created by EngineBlock
And I should not see text matching "eduGAIN"
# IdP / SP metadata combination (for Shiboleth entities) is no longer supported
Expand Down
9 changes: 0 additions & 9 deletions theme/base/templates/modules/Authentication/View/Index/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@
<dd>
<ul>
<li><a href="/authentication/sp/certificate">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/sp/certificate/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
<dt>
Expand All @@ -104,9 +101,6 @@
<dd>
<ul>
<li><a href="/authentication/sp/metadata">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/sp/metadata/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
</dl>
Expand All @@ -122,9 +116,6 @@
<dd>
<ul>
<li><a href="/authentication/stepup/metadata">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/stepup/metadata/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
</dl>
Expand Down
9 changes: 0 additions & 9 deletions theme/openconext/templates/modules/Authentication/View/Index/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@
<dd>
<ul>
<li><a href="/authentication/sp/certificate">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/sp/certificate/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
<dt>
Expand All @@ -107,9 +104,6 @@
<dd>
<ul>
<li><a href="/authentication/sp/metadata">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/sp/metadata/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
</dl>
Expand All @@ -125,9 +119,6 @@
<dd>
<ul>
<li><a href="/authentication/stepup/metadata">Open link</a></li>
{% for keyId in keyPairIds %}
<li><a href="/authentication/stepup/metadata/key:{{ keyId }}">Open link</a></li>
{% endfor %}
</ul>
</dd>
</dl>
Expand Down