Skip to content

fixes in EntraID article #222

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

Open
wants to merge 1 commit into
base: vnext-release
Choose a base branch
from
Open

fixes in EntraID article #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion authentication/AzureAD/templates/openIdWebSecurity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- Open ID Connect -->
<!-- Client with inbound propagation set to supported -->
<openidConnectClient authFilterRef="browserAuthFilter" id="odm" scope="openid" accessTokenInLtpaCookie="true"
<openidConnectClient authFilterRef="browserAuthFilter" id="odm" scope="openid"
clientId="AZUREAD_CLIENT_ID" clientSecret="AZUREAD_CLIENT_SECRET" tokenReuse="true"
signatureAlgorithm="RS256" inboundPropagation="supported"
jwkEndpointUrl="${ServerHost}/discovery/v2.0/keys"
Expand Down
36 changes: 1 addition & 35 deletions authentication/AzureAD/templates/webSecurity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,5 @@

<variable name="odm.rtsAdministrators.user1" value="${user1}"/>
<variable name="odm.resAdministrators.user1" value="${user1}"/>
<variable name="odm.resExecutors.user1" value="${user1}"/>

<authFilter id="browserAuthFilter">
<requestHeader id="allowBasicAuth" matchType="notContain" name="Authorization" value="Basic" />
<requestUrl id="ds1" matchType="notContain" urlPattern="DecisionService/rest"/>
<!-- RES console -->
<requestUrl id="res1" matchType="notContain" urlPattern="/res/auth"/>
<requestUrl id="res2" matchType="notContain" urlPattern="/res/repositoryService"/>
<requestUrl id="res3" matchType="notContain" urlPattern="/res/api"/>
<!-- Enterprise console -->
<requestUrl id="ec1" matchType="notContain" urlPattern="/teamserver/rts-sync"/>
<requestUrl id="ec2" matchType="notContain" urlPattern="/teamserver/remoting"/>
<requestUrl id="ec3" matchType="notContain" urlPattern="/teamserver/servlet/SessionServlet"/>
<!-- Business console -->
<requestUrl id="bc1" matchType="notContain" urlPattern="/decisioncenter/rts-sync"/>
<requestUrl id="bc2" matchType="notContain" urlPattern="/decisioncenter/remoting"/>
<requestUrl id="bc3" matchType="notContain" urlPattern="/decisioncenter/servlet/SessionServlet"/>
<!-- Decision Center API -->
<requestUrl id="dcapi" matchType="notContain" urlPattern="/decisioncenter-api/v1/" />
<!-- Decision Runner -->
<requestUrl id="dr1" matchType="notContain" urlPattern="/DecisionRunner/api"/>
<requestUrl id="dr2" matchType="notContain" urlPattern="/DecisionRunner/apiauth"/>
<requestUrl id="dr3" matchType="notContain" urlPattern="/DecisionRunner/serverinfo"/>
<!-- SSP (DVS) -->
<requestUrl id="tg1" matchType="notContain" urlPattern="/testing/sspService"/>
<requestUrl id="tg2" matchType="notContain" urlPattern="/testing/serverinfo"/>
</authFilter>

<!-- Note: The apiAuthFilter should be complementary to the browserAuthFilter -->
<authFilter id="apiAuthFilter">
<!-- This line is to support OIDC and BA by detecting the header -->
<requestHeader id="allowBasicAuth" matchType="contains" name="Authorization" value="Bearer" />
<requestUrl id="apiurl" matchType="contains" urlPattern="/DecisionService/rest|/res/api|/res/auth|/res/repositoryService|/teamserver/rts-sync|/teamserver/remoting|/teamserver/servlet/SessionServlet|/decisioncenter/rts-sync|/decisioncenter/remoting|/decisioncenter/servlet/SessionServlet|/decisioncenter-api/v1|/DecisionRunner/api|/DecisionRunner/apiauth|/DecisionRunner/serverinfo|/testing/sspService|/testing/serverinfo"/>
</authFilter>

<variable name="odm.resExecutors.user1" value="${user1}"/>
</server>
2 changes: 1 addition & 1 deletion authentication/AzureAD/templates_for_privatekeyjwt/openIdWebSecurity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- Open ID Connect -->
<!-- Client with inbound propagation set to supported -->
<openidConnectClient authFilterRef="browserAuthFilter" id="odm" scope="openid" accessTokenInLtpaCookie="true"
<openidConnectClient authFilterRef="browserAuthFilter" id="odm" scope="openid"
clientId="AZUREAD_CLIENT_ID" tokenEndpointAuthMethod="private_key_jwt" keyAliasName="myodmcompany" sslRef="odmDefaultSSLConfig"
signatureAlgorithm="RS256" inboundPropagation="supported"
jwkEndpointUrl="${ServerHost}/discovery/v2.0/keys"
Expand Down
34 changes: 0 additions & 34 deletions authentication/AzureAD/templates_for_privatekeyjwt/webSecurity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,4 @@
<variable name="odm.rtsAdministrators.user1" value="${user1}"/>
<variable name="odm.resAdministrators.user1" value="${user1}"/>
<variable name="odm.resExecutors.user1" value="${user1}"/>

<authFilter id="browserAuthFilter">
<requestHeader id="allowBasicAuth" matchType="notContain" name="Authorization" value="Basic" />
<requestUrl id="ds1" matchType="notContain" urlPattern="DecisionService/rest"/>
<!-- RES console -->
<requestUrl id="res1" matchType="notContain" urlPattern="/res/auth"/>
<requestUrl id="res2" matchType="notContain" urlPattern="/res/repositoryService"/>
<requestUrl id="res3" matchType="notContain" urlPattern="/res/api"/>
<!-- Enterprise console -->
<requestUrl id="ec1" matchType="notContain" urlPattern="/teamserver/rts-sync"/>
<requestUrl id="ec2" matchType="notContain" urlPattern="/teamserver/remoting"/>
<requestUrl id="ec3" matchType="notContain" urlPattern="/teamserver/servlet/SessionServlet"/>
<!-- Business console -->
<requestUrl id="bc1" matchType="notContain" urlPattern="/decisioncenter/rts-sync"/>
<requestUrl id="bc2" matchType="notContain" urlPattern="/decisioncenter/remoting"/>
<requestUrl id="bc3" matchType="notContain" urlPattern="/decisioncenter/servlet/SessionServlet"/>
<!-- Decision Center API -->
<requestUrl id="dcapi" matchType="notContain" urlPattern="/decisioncenter-api/v1/" />
<!-- Decision Runner -->
<requestUrl id="dr1" matchType="notContain" urlPattern="/DecisionRunner/api"/>
<requestUrl id="dr2" matchType="notContain" urlPattern="/DecisionRunner/apiauth"/>
<requestUrl id="dr3" matchType="notContain" urlPattern="/DecisionRunner/serverinfo"/>
<!-- SSP (DVS) -->
<requestUrl id="tg1" matchType="notContain" urlPattern="/testing/sspService"/>
<requestUrl id="tg2" matchType="notContain" urlPattern="/testing/serverinfo"/>
</authFilter>

<!-- Note: The apiAuthFilter should be complementary to the browserAuthFilter -->
<authFilter id="apiAuthFilter">
<!-- This line is to support OIDC and BA by detecting the header -->
<requestHeader id="allowBasicAuth" matchType="contains" name="Authorization" value="Bearer" />
<requestUrl id="apiurl" matchType="contains" urlPattern="/DecisionService/rest|/res/api|/res/auth|/res/repositoryService|/teamserver/rts-sync|/teamserver/remoting|/teamserver/servlet/SessionServlet|/decisioncenter/rts-sync|/decisioncenter/remoting|/decisioncenter/servlet/SessionServlet|/decisioncenter-api/v1|/DecisionRunner/api|/DecisionRunner/apiauth|/DecisionRunner/serverinfo|/testing/sspService|/testing/serverinfo"/>
</authFilter>

</server>