plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-11-10 00:11:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3070 from phedoreanu/replace_response_equals_with_contains

Browse Source 
replace response equals with contains
This commit is contained in:
neil 2020-07-27 15:54:05 +08:00 committed by GitHub
commit fce0bf6e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dnsapi/dns_1984hosting.sh
View File

@ -3,7 +3,7 @@
#So, here must be a method dns_1984hosting_add() #So, here must be a method dns_1984hosting_add()
#Which will be called by acme.sh to add the txt record to your api system. #Which will be called by acme.sh to add the txt record to your api system.
#returns 0 means success, otherwise error. #returns 0 means success, otherwise error.
#
#Author: Adrian Fedoreanu #Author: Adrian Fedoreanu
#Report Bugs here: https://github.com/acmesh-official/acme.sh #Report Bugs here: https://github.com/acmesh-official/acme.sh
# or here... https://github.com/acmesh-official/acme.sh/issues/2851 # or here... https://github.com/acmesh-official/acme.sh/issues/2851
@ -100,7 +100,7 @@ _1984hosting_add_txt_record() {
elif _contains "$response" "<html>"; then elif _contains "$response" "<html>"; then
_err "1984Hosting failed to add TXT record for $subdomain. Check $HTTP_HEADER file" _err "1984Hosting failed to add TXT record for $subdomain. Check $HTTP_HEADER file"
return 1 return 1
elif [ "$response" = '{"auth": false, "ok": false}' ]; then elif _contains "$response" '"auth": false'; then
_err "1984Hosting failed to add TXT record for $subdomain. Invalid or expired cookie" _err "1984Hosting failed to add TXT record for $subdomain. Invalid or expired cookie"
return 1 return 1
fi fi
@ -167,7 +167,7 @@ _1984hosting_login() {
response="$(echo "$response" | _normalizeJson)" response="$(echo "$response" | _normalizeJson)"
_debug2 response "$response" _debug2 response "$response"
if [ "$response" = '{"loggedin": true, "ok": true}' ]; then if _contains "$response" '"loggedin": true'; then
One984HOSTING_COOKIE="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _tail_n 1 | _egrep_o 'sessionid=[^;]*;' | tr -d ';')" One984HOSTING_COOKIE="$(grep -i '^set-cookie:' "$HTTP_HEADER" | _tail_n 1 | _egrep_o 'sessionid=[^;]*;' | tr -d ';')"
export One984HOSTING_COOKIE export One984HOSTING_COOKIE
_saveaccountconf_mutable One984HOSTING_COOKIE "$One984HOSTING_COOKIE" _saveaccountconf_mutable One984HOSTING_COOKIE "$One984HOSTING_COOKIE"
@ -196,7 +196,7 @@ _check_cookie() {
_authget "https://management.1984hosting.com/accounts/loginstatus/" _authget "https://management.1984hosting.com/accounts/loginstatus/"
response="$(echo "$_response" | _normalizeJson)" response="$(echo "$_response" | _normalizeJson)"
if [ "$_response" = '{"ok": true}' ]; then if _contains "$response" '"ok": true'; then
_debug "Cached cookie still valid" _debug "Cached cookie still valid"
return 0 return 0
fi fi