Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace santize_path() and ignore Windows "security" warning #1033

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Replace santize_path() and ignore Windows "security" warning #1033

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
774b9c5
Replace santize_path() and ignore Windows "security" warning
TinCanTech Oct 9, 2023
0fa7218
init-pki, User message: Replace use of $vars with $EASYRSA_VARS_FILE
TinCanTech Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 8 additions & 43 deletions easyrsa3/easyrsa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,12 @@ init_pki() {
shift
done

# EasyRSA will NOT do 'rm -rf /'
case "$EASYRSA_PKI" in
.|..|./|../|.//*|..//*|/|//*|\\|?:|'')
user_error "Invalid PKI: $EASYRSA_PKI"
esac

# If EASYRSA_PKI exists, confirm before deletion
if [ -e "$EASYRSA_PKI" ]; then
confirm "Confirm removal: " "yes" "
Expand Down Expand Up @@ -1372,7 +1378,7 @@ conflicting vars files have been found elsewhere."
else
information "
Using Easy-RSA configuration:
* ${vars:-undefined}"
* ${EASYRSA_VARS_FILE:-undefined}"
fi

# For new PKIs , pki/vars was auto-created, show message
Expand Down Expand Up @@ -5584,7 +5590,7 @@ EasyRSA '$cmd' does not support --startdate or --enddate"
if [ "$easyrsa_host_os" = win ]; then
if echo "$PWD" | grep -q '/Prog.*/OpenVPN/easy-rsa'
then
warn "\
verbose "\
Using Windows-System-Folders for your PKI is NOT SECURE!
Your Easy-RSA PKI CA Private Key is WORLD readable.

Expand All @@ -5596,12 +5602,6 @@ To correct this problem, it is recommended that you either:
fi
fi

# Use of --silent and --verbose
if [ "$EASYRSA_SILENT" ] && [ "$EASYRSA_VERBOSE" ]; then
user_error "\
Use of --silent and --verbose is unresolvable."
fi

verbose "mutual_exclusions: COMPLETED"
} # => mutual_exclusions()

Expand Down Expand Up @@ -5869,9 +5869,6 @@ ${unexpected_error}"

# Verify working environment
verify_working_env() {
# Do not allow demented paths, eg: '/' or '\'
sanitize_path

# Verify SSL Lib - One time ONLY
verify_ssl_lib

Expand Down Expand Up @@ -5928,38 +5925,6 @@ Temporary directory does not exist:
verbose "verify_working_env: COMPLETED"
} # => verify_working_env()

# Sanitize demented directory names
sanitize_path() {
# Sanitize PWD
verbose "Working dir: $PWD"
case "$PWD" in
*/|*\\|?:)
user_error "\
EasyRSA cannot be run in the root directory: $PWD"
esac

# Sanitize EASYRSA
verbose "EASYRSA: $EASYRSA"
case "$EASYRSA" in
*/|*\\|?:)
user_error "Invalid EASYRSA: $EASYRSA"
esac

# Sanitize EASYRSA_PKI
verbose "EASYRSA_PKI: $EASYRSA_PKI"
case "$EASYRSA_PKI" in
*/|*\\|?:)
user_error "Invalid EASYRSA_PKI: $EASYRSA_PKI"
esac

# Sanitize EASYRSA_TEMP_DIR
verbose "EASYRSA_TEMP_DIR: $EASYRSA_TEMP_DIR"
case "$EASYRSA_TEMP_DIR" in
*/|*\\|?:)
user_error "Invalid EASYRSA_TEMP_DIR: $EASYRSA_TEMP_DIR"
esac
} # => sanitize_path()

# variable assignment by indirection.
# Sets '$1' as the value contained in '$2'
# and exports (may be blank)
Expand Down