Skip to content

Commit c49da4b

Browse files
committed
Replace _opendistro route to _plugins
Signed-off-by: Andrey Pleskach <[email protected]>
1 parent bc2c444 commit c49da4b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/cypress-test-multiauth-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
opensearch_security.multitenancy.tenants.preferred: ["Private", "Global"]
8484
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
8585
opensearch_security.cookie.secure: false
86-
server.xsrf.allowlist: ["/_opendistro/_security/saml/acs", "/_opendistro/_security/saml/acs/idpinitiated", "/_opendistro/_security/saml/logout"]
86+
server.xsrf.allowlist: ["/_plugins/_security/saml/acs", "/_plugins/_security/saml/acs/idpinitiated", "/_plugins/_security/saml/logout"]
8787
opensearch_security.auth.type: ["basicauth","saml"]
8888
opensearch_security.auth.multiple_auth_enabled: true
8989
opensearch_security.auth.anonymous_auth_enabled: false

.github/workflows/cypress-test-saml-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
opensearch_security.multitenancy.tenants.preferred: ["Private", "Global"]
8484
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
8585
opensearch_security.cookie.secure: false
86-
server.xsrf.allowlist: ["/_opendistro/_security/saml/acs", "/_opendistro/_security/saml/acs/idpinitiated", "/_opendistro/_security/saml/logout"]
86+
server.xsrf.allowlist: ["/_plugins/_security/saml/acs", "/_plugins/_security/saml/acs/idpinitiated", "/_plugins/_security/saml/logout"]
8787
opensearch_security.auth.type: ["saml"]
8888
opensearch_security.auth.multiple_auth_enabled: true
8989
opensearch_security.auth.anonymous_auth_enabled: false

server/auth/types/saml/routes.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class SamlAuthRoutes {
101101

102102
this.router.post(
103103
{
104-
path: `/_opendistro/_security/saml/acs`,
104+
path: `/_plugins/_security/saml/acs`,
105105
validate: {
106106
body: schema.any(),
107107
},
@@ -200,7 +200,7 @@ export class SamlAuthRoutes {
200200

201201
this.router.post(
202202
{
203-
path: `/_opendistro/_security/saml/acs/idpinitiated`,
203+
path: `/_plugins/_security/saml/acs/idpinitiated`,
204204
validate: {
205205
body: schema.any(),
206206
},
@@ -209,7 +209,7 @@ export class SamlAuthRoutes {
209209
},
210210
},
211211
async (context, request, response) => {
212-
const acsEndpoint = `${this.coreSetup.http.basePath.serverBasePath}/_opendistro/_security/saml/acs/idpinitiated`;
212+
const acsEndpoint = `${this.coreSetup.http.basePath.serverBasePath}/_plugins/_security/saml/acs/idpinitiated`;
213213
try {
214214
const credentials = await this.securityClient.authToken({
215215
requestId: undefined,
@@ -328,7 +328,7 @@ export class SamlAuthRoutes {
328328
}
329329
);
330330

331-
// Once the User is authenticated via the '_opendistro/_security/saml/acs' route,
331+
// Once the User is authenticated via the '_plugins/_security/saml/acs' route,
332332
// the browser will be redirected to '/auth/saml/redirectUrlFragment' route,
333333
// which will execute the redirectUrlFragment.js.
334334
this.coreSetup.http.resources.register(

test/jest_integration/runIdpServer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const argv = minimist(process.argv.slice(2), {
3131

3232
// Create certificate pair on the fly and pass it to runServer
3333
runServer({
34-
acsUrl: `http://localhost:5601${argv.basePath}/_opendistro/_security/saml/acs`,
34+
acsUrl: `http://localhost:5601${argv.basePath}/_plugins/_security/saml/acs`,
3535
audience: 'https://localhost:9200',
3636
cert: pems.cert,
3737
key: pems.private.toString().replace(/\r\n/, '\n'),

0 commit comments

Comments
 (0)