diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/rest/RestGetCertificateInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/rest/RestGetCertificateInfoAction.java index d7d7d7042ed3c..620719560cd40 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/rest/RestGetCertificateInfoAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/rest/RestGetCertificateInfoAction.java @@ -31,6 +31,7 @@ public class RestGetCertificateInfoAction extends BaseRestHandler { public RestGetCertificateInfoAction(Settings settings, RestController controller) { super(settings); controller.registerHandler(GET, "/_xpack/ssl/certificates", this); + controller.registerHandler(GET, "/_ssl/certificates", this); } @Override @@ -48,4 +49,4 @@ public RestResponse buildResponse(Response response, XContentBuilder builder) th } }); } -} \ No newline at end of file +} diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java index e74c954821e75..3db31cdb1ee7f 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/RestAuthenticateAction.java @@ -40,6 +40,7 @@ public RestAuthenticateAction(Settings settings, RestController controller, Secu super(settings, licenseState); this.securityContext = securityContext; controller.registerHandler(GET, "/_xpack/security/_authenticate", this); + controller.registerHandler(GET, "/_security/_authenticate", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(GET, "/_shield/authenticate", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java index 5a08c267b9077..a438248a95766 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java @@ -61,6 +61,7 @@ public final class RestGetTokenAction extends SecurityBaseRestHandler { public RestGetTokenAction(Settings settings, RestController controller, XPackLicenseState xPackLicenseState) { super(settings, xPackLicenseState); controller.registerHandler(POST, "/_xpack/security/oauth2/token", this); + controller.registerHandler(POST, "/_/security/oauth2/token", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java index d76f4da7d8ce0..078f613dfad93 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestInvalidateTokenAction.java @@ -44,6 +44,7 @@ public final class RestInvalidateTokenAction extends SecurityBaseRestHandler { public RestInvalidateTokenAction(Settings settings, RestController controller, XPackLicenseState xPackLicenseState) { super(settings, xPackLicenseState); controller.registerHandler(DELETE, "/_xpack/security/oauth2/token", this); + controller.registerHandler(DELETE, "/_security/oauth2/token", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestDeletePrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestDeletePrivilegesAction.java index d0cee0dd6b902..a190394758d20 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestDeletePrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestDeletePrivilegesAction.java @@ -34,6 +34,7 @@ public class RestDeletePrivilegesAction extends SecurityBaseRestHandler { public RestDeletePrivilegesAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(DELETE, "/_xpack/security/privilege/{application}/{privilege}", this); + controller.registerHandler(DELETE, "/_security/privilege/{application}/{privilege}", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetPrivilegesAction.java index 8e3c3bbb87e6e..66005b1b365b3 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetPrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetPrivilegesAction.java @@ -39,8 +39,11 @@ public class RestGetPrivilegesAction extends SecurityBaseRestHandler { public RestGetPrivilegesAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(GET, "/_xpack/security/privilege/", this); + controller.registerHandler(GET, "/_security/privilege/", this); controller.registerHandler(GET, "/_xpack/security/privilege/{application}", this); + controller.registerHandler(GET, "/_security/privilege/{application}", this); controller.registerHandler(GET, "/_xpack/security/privilege/{application}/{privilege}", this); + controller.registerHandler(GET, "/_security/privilege/{application}/{privilege}", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestPutPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestPutPrivilegesAction.java index dc565e3f87339..0976da007bf2c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestPutPrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestPutPrivilegesAction.java @@ -39,7 +39,9 @@ public class RestPutPrivilegesAction extends SecurityBaseRestHandler { public RestPutPrivilegesAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(PUT, "/_xpack/security/privilege/", this); + controller.registerHandler(PUT, "/_security/privilege/", this); controller.registerHandler(POST, "/_xpack/security/privilege/", this); + controller.registerHandler(POST, "/_security/privilege/", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java index 09af866dc4aad..01a232640afcf 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/realm/RestClearRealmCacheAction.java @@ -29,6 +29,7 @@ public final class RestClearRealmCacheAction extends SecurityBaseRestHandler { public RestClearRealmCacheAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/realm/{realms}/_clear_cache", this); + controller.registerHandler(POST, "/_security/realm/{realms}/_clear_cache", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(POST, "/_shield/realm/{realms}/_cache/clear", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java index 0965ff4d17647..f7559a7ca7ab7 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestClearRolesCacheAction.java @@ -29,6 +29,7 @@ public final class RestClearRolesCacheAction extends SecurityBaseRestHandler { public RestClearRolesCacheAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/role/{name}/_clear_cache", this); + controller.registerHandler(POST, "/_security/role/{name}/_clear_cache", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(POST, "/_shield/role/{name}/_clear_cache", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java index 16f203e37cda3..16a1654070a50 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestDeleteRoleAction.java @@ -36,6 +36,7 @@ public class RestDeleteRoleAction extends SecurityBaseRestHandler { public RestDeleteRoleAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(DELETE, "/_xpack/security/role/{name}", this); + controller.registerHandler(DELETE, "/_security/role/{name}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(DELETE, "/_shield/role/{name}", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java index 2130a8f6b6894..2f4d03bc33741 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java @@ -38,7 +38,9 @@ public class RestGetRolesAction extends SecurityBaseRestHandler { public RestGetRolesAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(GET, "/_xpack/security/role/", this); + controller.registerHandler(GET, "/_security/role/", this); controller.registerHandler(GET, "/_xpack/security/role/{name}", this); + controller.registerHandler(GET, "/_security/role/{name}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(GET, "/_shield/role", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java index 07f0a70aed2dd..ad3cb2728bf82 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestPutRoleAction.java @@ -38,7 +38,9 @@ public class RestPutRoleAction extends SecurityBaseRestHandler { public RestPutRoleAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/role/{name}", this); + controller.registerHandler(POST, "/_security/role/{name}", this); controller.registerHandler(PUT, "/_xpack/security/role/{name}", this); + controller.registerHandler(PUT, "/_security/role/{name}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(POST, "/_shield/role/{name}", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java index ce1f9ad05954f..1840185cfca33 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestDeleteRoleMappingAction.java @@ -31,6 +31,7 @@ public class RestDeleteRoleMappingAction extends SecurityBaseRestHandler { public RestDeleteRoleMappingAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(DELETE, "/_xpack/security/role_mapping/{name}", this); + controller.registerHandler(DELETE, "/_security/role_mapping/{name}", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java index 4d1f3d969fa41..c4e9e788d2195 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestGetRoleMappingsAction.java @@ -32,7 +32,9 @@ public class RestGetRoleMappingsAction extends SecurityBaseRestHandler { public RestGetRoleMappingsAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(GET, "/_xpack/security/role_mapping/", this); + controller.registerHandler(GET, "/_security/role_mapping/", this); controller.registerHandler(GET, "/_xpack/security/role_mapping/{name}", this); + controller.registerHandler(GET, "/_security/role_mapping/{name}", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java index 088364eb95c02..6e2154016c9ea 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/rolemapping/RestPutRoleMappingAction.java @@ -35,7 +35,9 @@ public class RestPutRoleMappingAction extends SecurityBaseRestHandler { public RestPutRoleMappingAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/role_mapping/{name}", this); + controller.registerHandler(POST, "/_security/role_mapping/{name}", this); controller.registerHandler(PUT, "/_xpack/security/role_mapping/{name}", this); + controller.registerHandler(PUT, "/_security/role_mapping/{name}", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java index 7a0e9a25c5af6..7f2cb5c4afa24 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java @@ -59,6 +59,7 @@ public RestSamlAuthenticateAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/saml/authenticate", this); + controller.registerHandler(POST, "/_security/saml/authenticate", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlInvalidateSessionAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlInvalidateSessionAction.java index 6d3b41775b140..d6675b736953e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlInvalidateSessionAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlInvalidateSessionAction.java @@ -44,6 +44,7 @@ public class RestSamlInvalidateSessionAction extends SamlBaseRestHandler { public RestSamlInvalidateSessionAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/saml/invalidate", this); + controller.registerHandler(POST, "/_security/saml/invalidate", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlLogoutAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlLogoutAction.java index bc81f2d6babd2..ba39fbe13df62 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlLogoutAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlLogoutAction.java @@ -44,6 +44,7 @@ public class RestSamlLogoutAction extends SamlBaseRestHandler { public RestSamlLogoutAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/saml/logout", this); + controller.registerHandler(POST, "/_security/saml/logout", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlPrepareAuthenticationAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlPrepareAuthenticationAction.java index 0860f3648721c..f7f6156b9fc40 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlPrepareAuthenticationAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlPrepareAuthenticationAction.java @@ -45,6 +45,7 @@ public class RestSamlPrepareAuthenticationAction extends SamlBaseRestHandler { public RestSamlPrepareAuthenticationAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/saml/prepare", this); + controller.registerHandler(POST, "/_security/saml/prepare", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java index 9907e3345232e..c6c63146cc860 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestChangePasswordAction.java @@ -42,9 +42,13 @@ public RestChangePasswordAction(Settings settings, RestController controller, Se this.securityContext = securityContext; passwordHasher = Hasher.resolve(XPackSettings.PASSWORD_HASHING_ALGORITHM.get(settings)); controller.registerHandler(POST, "/_xpack/security/user/{username}/_password", this); + controller.registerHandler(POST, "/_security/user/{username}/_password", this); controller.registerHandler(PUT, "/_xpack/security/user/{username}/_password", this); + controller.registerHandler(PUT, "/_security/user/{username}/_password", this); controller.registerHandler(POST, "/_xpack/security/user/_password", this); + controller.registerHandler(POST, "/_security/user/_password", this); controller.registerHandler(PUT, "/_xpack/security/user/_password", this); + controller.registerHandler(PUT, "/_security/user/_password", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java index fda76a38bc566..8d2f5f7d2b254 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestDeleteUserAction.java @@ -36,6 +36,7 @@ public class RestDeleteUserAction extends SecurityBaseRestHandler { public RestDeleteUserAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(DELETE, "/_xpack/security/user/{username}", this); + controller.registerHandler(DELETE, "/_security/user/{username}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(DELETE, "/_shield/user/{username}", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUserPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUserPrivilegesAction.java index 2145b6f39dc59..a420751683c35 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUserPrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUserPrivilegesAction.java @@ -45,6 +45,7 @@ public RestGetUserPrivilegesAction(Settings settings, RestController controller, super(settings, licenseState); this.securityContext = securityContext; controller.registerHandler(GET, "/_xpack/security/user/_privileges", this); + controller.registerHandler(GET, "/_security/user/_privileges", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java index a55f49e263cf9..f02cba9c8cfa7 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestGetUsersAction.java @@ -38,7 +38,9 @@ public class RestGetUsersAction extends SecurityBaseRestHandler { public RestGetUsersAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(GET, "/_xpack/security/user/", this); + controller.registerHandler(GET, "/_security/user/", this); controller.registerHandler(GET, "/_xpack/security/user/{username}", this); + controller.registerHandler(GET, "/_security/user/{username}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(GET, "/_shield/user", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java index 6ec8250420eed..c5785fa7f2724 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestHasPrivilegesAction.java @@ -46,9 +46,13 @@ public RestHasPrivilegesAction(Settings settings, RestController controller, Sec super(settings, licenseState); this.securityContext = securityContext; controller.registerHandler(GET, "/_xpack/security/user/{username}/_has_privileges", this); + controller.registerHandler(GET, "/_security/user/{username}/_has_privileges", this); controller.registerHandler(POST, "/_xpack/security/user/{username}/_has_privileges", this); + controller.registerHandler(POST, "/_security/user/{username}/_has_privileges", this); controller.registerHandler(GET, "/_xpack/security/user/_has_privileges", this); + controller.registerHandler(GET, "/_security/user/_has_privileges", this); controller.registerHandler(POST, "/_xpack/security/user/_has_privileges", this); + controller.registerHandler(POST, "/_security/user/_has_privileges", this); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java index 6373d4a25c350..f91f1fdcbbd9f 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestPutUserAction.java @@ -47,7 +47,9 @@ public RestPutUserAction(Settings settings, RestController controller, XPackLice super(settings, licenseState); passwordHasher = Hasher.resolve(XPackSettings.PASSWORD_HASHING_ALGORITHM.get(settings)); controller.registerHandler(POST, "/_xpack/security/user/{username}", this); + controller.registerHandler(POST, "/_security/user/{username}", this); controller.registerHandler(PUT, "/_xpack/security/user/{username}", this); + controller.registerHandler(PUT, "/_security/user/{username}", this); // @deprecated: Remove in 6.0 controller.registerAsDeprecatedHandler(POST, "/_shield/user/{username}", this, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java index 8d796b9c6180f..f106ea4dc921a 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/user/RestSetEnabledAction.java @@ -33,9 +33,13 @@ public class RestSetEnabledAction extends SecurityBaseRestHandler { public RestSetEnabledAction(Settings settings, RestController controller, XPackLicenseState licenseState) { super(settings, licenseState); controller.registerHandler(POST, "/_xpack/security/user/{username}/_enable", this); + controller.registerHandler(POST, "/_security/user/{username}/_enable", this); controller.registerHandler(PUT, "/_xpack/security/user/{username}/_enable", this); + controller.registerHandler(PUT, "/_security/user/{username}/_enable", this); controller.registerHandler(POST, "/_xpack/security/user/{username}/_disable", this); + controller.registerHandler(POST, "/_security/user/{username}/_disable", this); controller.registerHandler(PUT, "/_xpack/security/user/{username}/_disable", this); + controller.registerHandler(PUT, "/_security/user/{username}/_disable", this); } @Override