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

Feature/erssup 59897 #234

Open
wants to merge 3 commits into
base: feature/ERSSUP-56595-dev
Choose a base branch
from
Open

Feature/erssup 59897 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52baa2e
[ERSSUP-56595]-[]-[Discovery APIGEE configuration for ERSSUP-56026 APIM
nhsd-hubert-raich Aug 10, 2021
7cf4e65
[ERSSUP-58836]-[JW]-[Add app-restricted product]-[JG]
greenjamie Dec 16, 2021
fb37c2f
[ERSSUP-59897]-[]-[App-restricted useEffectiveCount test]-[JG]
greenjamie Mar 3, 2022
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
7 changes: 6 additions & 1 deletion manifest_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ ACCESS_MODES:
scopes: ['urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api']
requireCallbackUrl: true
description: User restricted

- name: application-restricted
nameSuffix: -application-restricted
displayName: Application Restricted
scopes: ['urn:nhsd:apim:app:level3:e-referrals-service-api']
requireCallbackUrl: false
description: Application Restricted

---

Expand Down
9 changes: 0 additions & 9 deletions proxies/live/apiproxy/policies/AssignMessage.AddIssuerHeader.xml
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions proxies/live/apiproxy/policies/AssignMessage.Remove.x-ers-business-function-header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Remove.x-ers-business-function-header">
<Remove>
<Headers>
<Header name="x-ers-business-function"/>
</Headers>
</Remove>
<IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
10 changes: 10 additions & 0 deletions proxies/live/apiproxy/policies/AssignMessage.Remove.x-ers-ods-code-header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Remove.x-ers-ods-code-header">
<Remove>
<Headers>
<Header name="x-ers-ods-code"/>
</Headers>
</Remove>
<IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
9 changes: 9 additions & 0 deletions .../apiproxy/policies/AssignMessage.Set.nhsd-ers-business-function-header-app-restricted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-business-function-header-app-restricted">
<Set>
<Headers>
<Header name="nhsd-ers-business-function">AUTHORISED_APPLICATION</Header>
</Headers>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
9 changes: 9 additions & 0 deletions proxies/live/apiproxy/policies/AssignMessage.Set.nhsd-ers-ods-code-header-app-restricted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.nhsd-ers-ods-code-header-app-restricted">
<Set>
<Headers>
<Header name="nhsd-ers-ods-code">{app.app-restricted-ods-code}</Header>
</Headers>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
9 changes: 9 additions & 0 deletions proxies/live/apiproxy/policies/AssignMessage.Set.x-ers-user-id-header-app-restricted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.x-ers-user-id-header-app-restricted">
<Set>
<Headers>
<Header name="x-ers-user-id">{app.app-restricted-user-id}</Header>
</Headers>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
11 changes: 3 additions & 8 deletions ...ssignMessage.RemoveAndAddUserIdHeader.xml → ....x-ers-user-id-header-user-restricted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddUserIdHeader">
<Remove>
<Headers>
<Header name="x-ers-user-id"/>
</Headers>
</Remove>
<Add>
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.Set.x-ers-user-id-header-user-restricted">
<Set>
<Headers>
<Header name="x-ers-user-id">{accesstoken.id_token-subject}</Header>
</Headers>
</Add>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
12 changes: 3 additions & 9 deletions .../AssignMessage.RemoveAndAddAsidHeader.xml → .../policies/AssignMessage.SetAsidHeader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddAsidHeader">
<Remove>
<Headers>
<Header name="XAPI_ASID"/>
</Headers>
</Remove>
<Add>
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.SetAsidHeader">
<Set>
<Headers>
<Header name="XAPI_ASID">{private.apigee.NHSD-ASID}</Header>
</Headers>
</Add>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignTo createNew="false"/>
</AssignMessage>
3 changes: 1 addition & 2 deletions proxies/live/apiproxy/policies/OAuthV2.VerifyAccessToken.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<OAuthV2 async="false" continueOnError="false" enabled="true" name="OauthV2.VerifyAccessToken">
<Operation>VerifyAccessToken</Operation>
<!-- Set Scope to accept only AAL3 security level. -->
<Scope>urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api</Scope>
<Scope>urn:nhsd:apim:app:level3:e-referrals-service-api urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api</Scope>
</OAuthV2>
10 changes: 10 additions & 0 deletions proxies/live/apiproxy/policies/RaiseFault.403Forbidden.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<RaiseFault async="false" continueOnError="false" enabled="true" name="RaiseFault.403Forbidden">
<FaultResponse>
<Set>
<Payload contentType="text/plain"/>
<StatusCode>403</StatusCode>
<ReasonPhrase>Forbidden</ReasonPhrase>
</Set>
</FaultResponse>
<IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
</RaiseFault>
2 changes: 1 addition & 1 deletion proxies/live/apiproxy/policies/SpikeArrest.Binary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<DisplayName>SpikeArrest.Binary</DisplayName>
<Identifier ref="app.asid"/>
<Rate ref="app.ratelimit.binary">120pm</Rate>
<UseEffectiveCount>true</UseEffectiveCount>
<UseEffectiveCount>false</UseEffectiveCount>
</SpikeArrest>
2 changes: 1 addition & 1 deletion proxies/live/apiproxy/policies/SpikeArrest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<DisplayName>SpikeArrest</DisplayName>
<Identifier ref="app.asid"/>
<Rate ref="app.ratelimit">600pm</Rate>
<UseEffectiveCount>true</UseEffectiveCount>
<UseEffectiveCount>false</UseEffectiveCount>
</SpikeArrest>
Loading