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

Tools lib call ssl direct #1156

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Tools lib call ssl direct #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec942e5
easyrsa-tools.lib: Create 'openssl-easyrsa.cnf' and call SSL directly
TinCanTech Jun 2, 2024
484342c
easyrsa-tools.lib: Add version $EASYRSA_TOOLS_VERSION and check version
TinCanTech Jun 2, 2024
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
15 changes: 8 additions & 7 deletions dev/easyrsa-tools.lib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ if [ -z "$EASYRSA_TOOLS_CALLER" ]; then
return 1
fi

# Set tools version
EASYRSA_TOOLS_VERSION=1.0.1

# Get certificate start date
# shellcheck disable=2317 # Unreach - ssl_cert_not_before_date()
ssl_cert_not_before_date() {
Expand All @@ -18,7 +21,7 @@ ssl_cert_not_before_date - input error"
ssl_cert_not_before_date - missing cert"

fn_ssl_out="$(
easyrsa_openssl x509 -in "$1" -noout -startdate
"$EASYRSA_OPENSSL" x509 -in "$1" -noout -startdate
)" || die "\
ssl_cert_not_before_date - failed: -startdate"

Expand All @@ -39,7 +42,7 @@ ssl_cert_not_after_date - input error"
ssl_cert_not_after_date - missing cert"

fn_ssl_out="$(
easyrsa_openssl x509 -in "$1" -noout -enddate
"$EASYRSA_OPENSSL" x509 -in "$1" -noout -enddate
)" || die "\
ssl_cert_not_after_date - failed: -enddate"

Expand All @@ -62,7 +65,7 @@ iso_8601_cert_startdate: missing cert"

# On error return, let the caller decide what to do
if fn_ssl_out="$(
easyrsa_openssl x509 -in "$1" -noout \
"$EASYRSA_OPENSSL" x509 -in "$1" -noout \
-startdate -dateopt iso_8601
)"
then
Expand Down Expand Up @@ -92,8 +95,7 @@ iso_8601_cert_enddate: missing cert"

# On error return, let the caller decide what to do
if fn_ssl_out="$(
EASYRSA_VERBOSE=
easyrsa_openssl x509 -in "$1" -noout \
"$EASYRSA_OPENSSL" x509 -in "$1" -noout \
-enddate -dateopt iso_8601
)"
then
Expand Down Expand Up @@ -664,8 +666,7 @@ expire_status: FALL-BACK completed"

# Check cert expiry against window
# openssl direct call because error is expected
if OPENSSL_CONF=/dev/null \
"$EASYRSA_OPENSSL" x509 -in "$cert_issued" \
if "$EASYRSA_OPENSSL" x509 -in "$cert_issued" \
-noout -checkend "$pre_expire_window_s" \
1>/dev/null
then
Expand Down
14 changes: 14 additions & 0 deletions easyrsa3/easyrsa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5639,6 +5639,20 @@ Use of Status Reports requires Easy-RSA tools library, source:
Place a copy of easyrsa-tools.lib in a standard system location."
fi

# Verify tools version
if [ "$EASYRSA_TOOLS_VERSION" = 1.0.1 ]; then
verbose "EASYRSA_TOOLS_VERSION: $EASYRSA_TOOLS_VERSION"
else
warn "\
EasyRSA Tools version is out of date:
* EASYRSA_TOOLS_VERSION: $EASYRSA_TOOLS_VERSION"
fi

# Validate or create openssl-easyrsa.cnf
write_easyrsa_ssl_cnf_tmp
export OPENSSL_CONF="$EASYRSA_SSL_CONF"
verbose "$cmd: OPENSSL_CONF = $OPENSSL_CONF"

case "$cmd" in
show-expire)
[ -z "$alias_days" ] || \
Expand Down