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

SOLR-13087: Remove 'whoami' usage in bin/solr 

whoami displays a warning if the effective-uid is not in /etc/password.
This can happen in certain situations when running in a docker
container.  This replaces the 'whoami' usage with a safer check.
This commit is contained in:
Jason Gerlowski 2019-12-06 15:06:23 -05:00
parent a7444f7af4
commit 62e0222aef
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -210,6 +210,9 @@ Bug Fixes
* SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (janhoy) * SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (janhoy)
* SOLR-13087: Use EUID instead of whoami to check for root in the bin/solr script (Martijn Koster via Jason Gerlowski)
Other Changes Other Changes
--------------------- ---------------------

4
solr/bin/solr
View File

@ -1141,7 +1141,7 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
echo " To turn off: bin/solr config -c $CREATE_NAME -p $CREATE_PORT -action set-user-property -property update.autoCreateFields -value false" echo " To turn off: bin/solr config -c $CREATE_NAME -p $CREATE_PORT -action set-user-property -property update.autoCreateFields -value false"
fi fi
if [[ "$(whoami)" == "root" ]] && [[ "$FORCE" == "false" ]] ; then if [[ $EUID -eq 0 ]] && [[ "$FORCE" == "false" ]] ; then
echo "WARNING: Creating cores as the root user can cause Solr to fail and is not advisable. Exiting." echo "WARNING: Creating cores as the root user can cause Solr to fail and is not advisable. Exiting."
echo " If you started Solr as root (not advisable either), force core creation by adding argument -force" echo " If you started Solr as root (not advisable either), force core creation by adding argument -force"
exit 1 exit 1
@ -1877,7 +1877,7 @@ if [ -z "$STOP_PORT" ]; then
fi fi
if [ "$SCRIPT_CMD" == "start" ] || [ "$SCRIPT_CMD" == "restart" ] ; then if [ "$SCRIPT_CMD" == "start" ] || [ "$SCRIPT_CMD" == "restart" ] ; then
if [[ "$(whoami)" == "root" ]] && [[ "$FORCE" == "false" ]] ; then if [[ $EUID -eq 0 ]] && [[ "$FORCE" == "false" ]] ; then
echo "WARNING: Starting Solr as the root user is a security risk and not considered best practice. Exiting." echo "WARNING: Starting Solr as the root user is a security risk and not considered best practice. Exiting."
echo " Please consult the Reference Guide. To override this check, start with argument '-force'" echo " Please consult the Reference Guide. To override this check, start with argument '-force'"
exit 1 exit 1