dsmiley commented on code in PR #1884: URL: https://github.com/apache/solr/pull/1884#discussion_r1313674795
########## solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java: ########## @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.opentelemetry; + +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; +import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue; + +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.trace.TracerProvider; +import java.util.Map; +import org.apache.solr.client.solrj.SolrRequest; +import org.apache.solr.client.solrj.impl.CloudSolrClient; +import org.apache.solr.client.solrj.request.CollectionAdminRequest; +import org.apache.solr.client.solrj.request.V2Request; +import org.apache.solr.cloud.SolrCloudTestCase; +import org.apache.solr.common.util.Utils; +import org.apache.solr.security.BasicAuthPlugin; +import org.apache.solr.security.RuleBasedAuthorizationPlugin; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class BasicAuthIntegrationTracingTest extends SolrCloudTestCase { + + private static final String COLLECTION = "collection1"; + private static final String USER = "solr"; + private static final String PASS = "SolrRocksAgain"; + private static final String SECURITY_JSON = + Utils.toJSONString( + Map.of( + "authorization", + Map.of( + "class", + RuleBasedAuthorizationPlugin.class.getName(), + "user-role", + singletonMap(USER, "admin"), + "permissions", + singletonList(Map.of("name", "all", "role", "admin"))), + "authentication", + Map.of( + "class", + BasicAuthPlugin.class.getName(), + "blockUnknown", + true, + "credentials", + singletonMap(USER, getSaltedHashedValue(PASS))))); + + @BeforeClass + public static void setupCluster() throws Exception { + // force early init + CustomTestOtelTracerConfigurator.prepareForTest(); + + configureCluster(4) + .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf")) + .withSolrXml(TEST_PATH().resolve("solr.xml")) + .withTraceIdGenerationDisabled() + .withSecurityJson(SECURITY_JSON) + .configure(); + + assertNotEquals( + "Expecting active otel, not noop impl", + TracerProvider.noop(), + GlobalOpenTelemetry.get().getTracerProvider()); + + CollectionAdminRequest.createCollection(COLLECTION, "config", 2, 2) + .setBasicAuthCredentials(USER, PASS) + .process(cluster.getSolrClient()); + cluster.waitForActiveCollection(COLLECTION, 2, 4); + } + + @AfterClass + public static void afterClass() { + CustomTestOtelTracerConfigurator.resetForTest(); + } + + /** See SOLR-16955 */ + @Test + public void testSetupBasicAuth() throws Exception { + CloudSolrClient cloudClient = cluster.getSolrClient(); + V2Request req = + new V2Request.Builder("/cluster/security/authentication") + .withMethod(SolrRequest.METHOD.POST) + .withPayload("{\"set-user\": {\"harry\":\"HarryIsCool\"}}") Review Comment: what; no Map.of/toJSON? ########## solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/BasicAuthIntegrationTracingTest.java: ########## @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.opentelemetry; + +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; +import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHashedValue; + +import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.trace.TracerProvider; +import java.util.Map; +import org.apache.solr.client.solrj.SolrRequest; +import org.apache.solr.client.solrj.impl.CloudSolrClient; +import org.apache.solr.client.solrj.request.CollectionAdminRequest; +import org.apache.solr.client.solrj.request.V2Request; +import org.apache.solr.cloud.SolrCloudTestCase; +import org.apache.solr.common.util.Utils; +import org.apache.solr.security.BasicAuthPlugin; +import org.apache.solr.security.RuleBasedAuthorizationPlugin; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class BasicAuthIntegrationTracingTest extends SolrCloudTestCase { + + private static final String COLLECTION = "collection1"; + private static final String USER = "solr"; + private static final String PASS = "SolrRocksAgain"; + private static final String SECURITY_JSON = + Utils.toJSONString( + Map.of( + "authorization", + Map.of( + "class", Review Comment: I like this style instead of a super long multi-line string -- nice! I'll advocate for this in other places now that I know this trick. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
