Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17724: clarify basic auth credential docs (#3301)

Eric Pugh84003aba0cbc
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adoc
index 4687fe5f6c0..530b3736bc9 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/basic-authentication-plugin.adoc
@@ -30,7 +30,7 @@ This file and where to put it is described in detail in the section xref:authent
If running in cloud mode, you can use the `bin/solr auth` command-line utility to enable security for a new installation, see: `bin/solr auth --help` for more details.
For Basic authentication, `security.json` must have an `authentication` block which defines the class being used for authentication.
-Usernames and passwords (Format: `base64(sha256(sha256(salt+password))) base64(salt)`) could be added when the file is created, or can be added later with the Authentication API, described below.
+Usernames and passwords could be added when the file is created, or can be added later with the Authentication API, described below.
An example `security.json` showing `authentication` and `authorization` blocks is shown below to show how authentication and authorization plugins can work together:
@@ -81,6 +81,14 @@ If `realm` is not defined, it will default to `solr`.
If you are using SolrCloud, you must upload `security.json` to ZooKeeper.
An example command and more information about securing your setup can be found at xref:authentication-and-authorization-plugins#in-a-solrcloud-cluster[Authentication and Authorization Plugins In a SolrCloud Cluster].
+=== Password Encoding
+
+Solr stores the passwords in the format: `base64(sha256(sha256(salt+password))) base64(salt)`.
+
+If you edit `security.json` directly then you need to encode the password yourself.
+You can visit https://clemente-biondo.github.io/ to use a simple web utility that does the encoding for you.
+
+
=== Caveats
There are a few things to keep in mind when using the Basic authentication plugin.
@@ -341,9 +349,9 @@ httpBasicAuthPassword=secretPassword
== Using the Solr Control Script with Basic Auth
Once Basic authentication is enabled, all requests to the Solr Control Script (`bin/solr`) must contain user credentials.
-To ensure this, add the following line to the `solr.in.sh` or `solr.in.cmd` file.
+While you can pass credentials into `bin/solr` directly when invoking a command, you can also globally define the credentials in the `solr.in.sh` or `solr.in.cmd` file.
-This example tells the `bin/solr` command line to to use "basic" as the type of authentication, and to pass credentials with the user-name "solr" and password "SolrRocks":
+Add the following line to the `solr.in.sh` or `solr.in.cmd` file:
[source,bash]
----
@@ -351,7 +359,9 @@ SOLR_AUTH_TYPE="basic"
SOLR_AUTHENTICATION_OPTS="-Dbasicauth=solr:SolrRocks"
----
-Alternatively, the `SOLR_AUTHENTICATION_OPTS` can take a path to a file, as in:
+This tells the `bin/solr` command line to to use "basic" as the type of authentication, and to pass credentials with the user-name "solr" and password "SolrRocks".
+
+Alternatively, the `SOLR_AUTHENTICATION_OPTS` can take a path to a configuration file, as in:
[source,bash,subs="attributes"]
----