From d86dc3f8e16dd78b3853393db6957c4168178f85 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 21 Feb 2023 15:52:26 -0500 Subject: [PATCH] Updates toString calls affected by change in method signature (#2418) (#2452) Signed-off-by: Darshit Chanpura (cherry picked from commit f808b2ae207442b5f18dc47bfb67c5a71e75e8b8) Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com> --- .../security/action/whoami/WhoAmIResponse.java | 3 ++- .../configuration/ConfigurationRepository.java | 3 ++- .../security/configuration/DlsFlsValveImpl.java | 7 ++++--- .../opensearch/security/tools/SecurityAdmin.java | 2 +- .../java/org/opensearch/security/ConfigTests.java | 15 ++++++++------- .../opensearch/security/dlic/dlsfls/DlsTest.java | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opensearch/security/action/whoami/WhoAmIResponse.java b/src/main/java/org/opensearch/security/action/whoami/WhoAmIResponse.java index 69ed3e52ba..635cba8945 100644 --- a/src/main/java/org/opensearch/security/action/whoami/WhoAmIResponse.java +++ b/src/main/java/org/opensearch/security/action/whoami/WhoAmIResponse.java @@ -34,6 +34,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.common.xcontent.XContentType; public class WhoAmIResponse extends ActionResponse implements ToXContent { @@ -105,6 +106,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return Strings.toString(this, true, true); + return Strings.toString(XContentType.JSON,this, true, true); } } diff --git a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java index 81f5c5d60d..5fb0473d2e 100644 --- a/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java +++ b/src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java @@ -63,6 +63,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.concurrent.ThreadContext.StoredContext; +import org.opensearch.common.xcontent.XContentType; import org.opensearch.env.Environment; import org.opensearch.security.auditlog.AuditLog; import org.opensearch.security.auditlog.config.AuditConfig; @@ -379,7 +380,7 @@ public Map> getConfigurationsFromIndex(Co if (logComplianceEvent && auditLog.getComplianceConfig().isEnabled()) { CType configurationType = configTypes.iterator().next(); Map fields = new HashMap(); - fields.put(configurationType.toLCString(), Strings.toString(retVal.get(configurationType))); + fields.put(configurationType.toLCString(), Strings.toString(XContentType.JSON, retVal.get(configurationType))); auditLog.logDocumentRead(this.securityIndex, configurationType.toLCString(), null, fields); } diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java index 4a81e517a0..e15b972589 100644 --- a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java +++ b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java @@ -52,6 +52,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.query.ParsedQuery; import org.opensearch.rest.RestStatus; import org.opensearch.search.DocValueFormat; @@ -209,10 +210,10 @@ public boolean invoke(String action, ActionRequest request, final ActionListener StringBuilder sb = new StringBuilder(); if (searchRequest.source() != null) { - sb.append(Strings.toString(searchRequest.source()) + System.lineSeparator()); + sb.append(Strings.toString(XContentType.JSON, searchRequest.source()) + System.lineSeparator()); } - sb.append(Strings.toString(af) + System.lineSeparator()); + sb.append(Strings.toString(XContentType.JSON, af) + System.lineSeparator()); LogManager.getLogger("debuglogger").error(sb.toString()); @@ -222,7 +223,7 @@ public boolean invoke(String action, ActionRequest request, final ActionListener searchRequest.requestCache(Boolean.FALSE); } else { LogManager.getLogger("debuglogger").error("Shard requestcache enabled for " - + (searchRequest.source() == null ? "" : Strings.toString(searchRequest.source()))); + + (searchRequest.source() == null ? "" : Strings.toString(XContentType.JSON, searchRequest.source()))); } } else { diff --git a/src/main/java/org/opensearch/security/tools/SecurityAdmin.java b/src/main/java/org/opensearch/security/tools/SecurityAdmin.java index 25cf3919f3..dfc95a7436 100644 --- a/src/main/java/org/opensearch/security/tools/SecurityAdmin.java +++ b/src/main/java/org/opensearch/security/tools/SecurityAdmin.java @@ -999,7 +999,7 @@ protected static void generateDiagnoseTrace(final RestHighLevelClient restHighLe try { sb.append("ClusterHealthRequest:"+System.lineSeparator()); ClusterHealthResponse nir = restHighLevelClient.cluster().health(new ClusterHealthRequest(), RequestOptions.DEFAULT); - sb.append(Strings.toString(nir, true, true)); + sb.append(Strings.toString(XContentType.JSON, nir, true, true)); } catch (Exception e1) { sb.append(ExceptionsHelper.stackTrace(e1)); } diff --git a/src/test/java/org/opensearch/security/ConfigTests.java b/src/test/java/org/opensearch/security/ConfigTests.java index 8d7ebf8003..c5b8c089e4 100644 --- a/src/test/java/org/opensearch/security/ConfigTests.java +++ b/src/test/java/org/opensearch/security/ConfigTests.java @@ -28,6 +28,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.collect.Tuple; +import org.opensearch.common.xcontent.XContentType; import org.opensearch.security.securityconf.Migration; import org.opensearch.security.securityconf.impl.CType; import org.opensearch.security.securityconf.impl.SecurityDynamicConfiguration; @@ -59,18 +60,18 @@ public void testMigrate() throws Exception { Tuple, SecurityDynamicConfiguration> rolesResult = Migration.migrateRoles((SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/roles.yml", CType.ROLES), (SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/roles_mapping.yml", CType.ROLESMAPPING)); - System.out.println(Strings.toString(rolesResult.v2(), true, false)); - System.out.println(Strings.toString(rolesResult.v1(), true, false)); + System.out.println(Strings.toString(XContentType.JSON, rolesResult.v2(), true, false)); + System.out.println(Strings.toString(XContentType.JSON, rolesResult.v1(), true, false)); SecurityDynamicConfiguration actionGroupsResult = Migration.migrateActionGroups((SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/action_groups.yml", CType.ACTIONGROUPS)); - System.out.println(Strings.toString(actionGroupsResult, true, false)); + System.out.println(Strings.toString(XContentType.JSON, actionGroupsResult, true, false)); SecurityDynamicConfiguration configResult =Migration.migrateConfig((SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/config.yml", CType.CONFIG)); - System.out.println(Strings.toString(configResult, true, false)); + System.out.println(Strings.toString(XContentType.JSON, configResult, true, false)); SecurityDynamicConfiguration internalUsersResult = Migration.migrateInternalUsers((SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/internal_users.yml", CType.INTERNALUSERS)); - System.out.println(Strings.toString(internalUsersResult, true, false)); + System.out.println(Strings.toString(XContentType.JSON, internalUsersResult, true, false)); SecurityDynamicConfiguration rolemappingsResult = Migration.migrateRoleMappings((SecurityDynamicConfiguration)load("./legacy/securityconfig_v6/roles_mapping.yml", CType.ROLESMAPPING)); - System.out.println(Strings.toString(rolemappingsResult, true, false)); + System.out.println(Strings.toString(XContentType.JSON, rolemappingsResult, true, false)); } @Test @@ -113,7 +114,7 @@ private void check(String file, CType cType) throws Exception { //Assert.assertTrue(dc.getCEntries().size() > 0); String jsonSerialize = DefaultObjectMapper.objectMapper.writeValueAsString(dc); SecurityDynamicConfiguration conf = SecurityDynamicConfiguration.fromJson(jsonSerialize, cType, configVersion, 0, 0); - SecurityDynamicConfiguration.fromJson(Strings.toString(conf), cType, configVersion, 0, 0); + SecurityDynamicConfiguration.fromJson(Strings.toString(XContentType.JSON, conf), cType, configVersion, 0, 0); } diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/DlsTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/DlsTest.java index 25e86d03db..a91939eccb 100644 --- a/src/test/java/org/opensearch/security/dlic/dlsfls/DlsTest.java +++ b/src/test/java/org/opensearch/security/dlic/dlsfls/DlsTest.java @@ -42,7 +42,7 @@ protected void populateData(Client tc) { e.printStackTrace(); } System.out.println("q"); - System.out.println(Strings.toString(tc.search(new SearchRequest().indices(".opendistro_security")).actionGet())); + System.out.println(Strings.toString(XContentType.JSON, tc.search(new SearchRequest().indices(".opendistro_security")).actionGet())); tc.search(new SearchRequest().indices("deals")).actionGet(); }