Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8048: bin/solr script should support basic auth credentials provided in solr.in.sh

This commit is contained in:
Noble Paul 2016-06-14 19:47:18 +05:30
parent 2e101c42ca
commit 5ee4e8a614
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solr/core/src/java/org/apache/solr/util/SolrCLI.java
View File

@ -104,6 +104,7 @@ import org.noggit.ObjectBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.common.params.CommonParams.NAME; import static org.apache.solr.common.params.CommonParams.NAME;
/** /**
* Command-line utility for working with Solr. * Command-line utility for working with Solr.
@ -164,8 +165,8 @@ public class SolrCLI {
HttpClientUtil.addRequestInterceptor((httpRequest, httpContext) -> { HttpClientUtil.addRequestInterceptor((httpRequest, httpContext) -> {
String pair = ss.get(0) + ":" + ss.get(1); String pair = ss.get(0) + ":" + ss.get(1);
byte[] encodedBytes = Base64.encodeBase64(pair.getBytes(StandardCharsets.UTF_8)); byte[] encodedBytes = Base64.encodeBase64(pair.getBytes(UTF_8));
httpRequest.addHeader(new BasicHeader("Authorization", "Basic "+ new String(encodedBytes))); httpRequest.addHeader(new BasicHeader("Authorization", "Basic "+ new String(encodedBytes, UTF_8)));
}); });
} }
} }
@ -2344,7 +2345,7 @@ public class SolrCLI {
echo("\nWelcome to the SolrCloud example!\n"); echo("\nWelcome to the SolrCloud example!\n");
Scanner readInput = prompt ? new Scanner(userInput, StandardCharsets.UTF_8.name()) : null; Scanner readInput = prompt ? new Scanner(userInput, UTF_8.name()) : null;
if (prompt) { if (prompt) {
echo("This interactive session will help you launch a SolrCloud cluster on your local workstation."); echo("This interactive session will help you launch a SolrCloud cluster on your local workstation.");