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

Jump to bottom

Fix for empty error objects in response breaking extraction of domain validation types #5008

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix for empty error objects in response breaking extraction of domain validation types #5008

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
160b2e9
Merge pull request #4986 from acmesh-official/dev
Neilpang Feb 3, 2024
de14d59
Merge pull request #4987 from acmesh-official/dev
Neilpang Feb 4, 2024
b0ca443
Fix for empty error objects in response breaking extraction of domain…
cjwalsh Feb 21, 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
6 changes: 4 additions & 2 deletions acme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4722,7 +4722,8 @@ $_authorizations_map"
_debug keyauthorization "$keyauthorization"
fi

entry="$(echo "$response" | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
# Fix for empty error objects in response which mess up the original code, adapted from fix suggested here: https://github.com/acmesh-official/acme.sh/issues/4933#issuecomment-1870499018
entry="$(echo "$response" | sed s/'"error":{}'/'"error":null'/ | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
_debug entry "$entry"

if [ -z "$keyauthorization" -a -z "$entry" ]; then
Expand Down Expand Up @@ -6283,7 +6284,8 @@ _deactivate() {
fi
_debug "Trigger validation."
vtype="$(_getIdType "$_d_domain")"
entry="$(echo "$response" | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
# Fix for empty error objects in response which mess up the original code, adapted from fix suggested here: https://github.com/acmesh-official/acme.sh/issues/4933#issuecomment-1870499018
entry="$(echo "$response" | sed s/'"error":{}'/'"error":null'/ | _egrep_o '[^\{]*"type":"'$vtype'"[^\}]*')"
_debug entry "$entry"
if [ -z "$entry" ]; then
_err "Error, can not get domain token $d"
Expand Down
Loading