yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-08 13:47:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Travis refactoring

Browse Source
This commit is contained in:
Gerardo 2020-04-19 15:03:42 +02:00 committed by GitHub
parent 6e589de5eb
commit 3945a59ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dnsapi/dns_aruba.sh
View File

@ -45,7 +45,7 @@ _initAuth() {
if [ -z "$ARUBA_AK" ] || [ -z "$ARUBA_AS" ] || [ -z "$ARUBA_TK" ]; then if [ -z "$ARUBA_AK" ] || [ -z "$ARUBA_AS" ] || [ -z "$ARUBA_TK" ]; then
ARUBA_AK="" ARUBA_AK=""
ARUBA_AS="" ARUBA_AS=""
ARUBA_TK="" ARUBA_TK=""
_err "You don't specify ARUBA application key and application secret yet." _err "You don't specify ARUBA application key and application secret yet."
_err "Please create you key and try again." _err "Please create you key and try again."
return 1 return 1
@ -53,7 +53,7 @@ _initAuth() {
if [ "$ARUBA_TK" != "$(_readaccountconf ARUBA_TK)" ]; then if [ "$ARUBA_TK" != "$(_readaccountconf ARUBA_TK)" ]; then
_info "It seems that your aruba key is changed, let's clear consumer key first." _info "It seems that your aruba key is changed, let's clear consumer key first."
_clearaccountconf ARUBA_TK _clearaccountconf ARUBA_TK
_clearaccountconf ARUBA_CK _clearaccountconf ARUBA_CK
fi fi
_saveaccountconf_mutable ARUBA_AK "$ARUBA_AK" _saveaccountconf_mutable ARUBA_AK "$ARUBA_AK"
@ -91,12 +91,10 @@ _initAuth() {
return 1 return 1
fi fi
domainData=$(echo "$response" | tr -d '\r' ) domainData=$(echo "$response" | tr -d '\r')
# get all Ids and peek only values # get all Ids and peek only values
temp="$(echo "$domainData" | _egrep_o "Id\": [^,]*" | cut -d : -f 2 | head -1)" temp="$(echo "$domainData" | _egrep_o "Id\": [^,]*" | cut -d : -f 2 | head -1)" # first element is zone Id
#read -ra ADDR <<< "$temp" #put Ids into array domain_id=$temp
domain_id=$temp # first element is zone Id
_info "DomainId is: $domain_id" _info "DomainId is: $domain_id"
_info "Consumer key is ok." _info "Consumer key is ok."
@ -114,7 +112,7 @@ dns_aruba_add() {
return 1 return 1
fi fi
_debug _domain "$_domain" _debug _domain "$_domain"
_sub_domain="_acme-challenge" _sub_domain="_acme-challenge"
_debug "Check if _acme-challenge record exists in " "$_domain" _debug "Check if _acme-challenge record exists in " "$_domain"
@ -155,12 +153,12 @@ dns_aruba_rm() {
_debug "Getting TXT record to delete: $_sub_domain.$_domain." _debug "Getting TXT record to delete: $_sub_domain.$_domain."
if ! _extract_record_id "$_sub_domain.$_domain"; then if ! _extract_record_id "$_sub_domain.$_domain"; then
return 1 return 1
fi fi
_debug "Deleting TXT record: $_sub_domain.$_domain" _debug "Deleting TXT record: $_sub_domain.$_domain"
if ! _aruba_rest DELETE "api/domains/dns/record/$_recordId"; then if ! _aruba_rest DELETE "api/domains/dns/record/$_recordId"; then
return 1 return 1
fi fi
return 0 return 0
@ -171,31 +169,29 @@ dns_aruba_rm() {
# returns TXT record and put it in_record_id, if esists # returns TXT record and put it in_record_id, if esists
_extract_record_id() { _extract_record_id() {
subdomain="$1" subdomain="$1"
_arrayid=0 _arrayid=0
_ids="$(echo $domainData | _egrep_o '"Id": [^,]+' | cut -d : -f 2)" _ids="$(echo "$domainData" | _egrep_o '"Id": [^,]+' | cut -d : -f 2)"
_debug $ids _debug $ids
#_temp="$(echo $domainData | grep -oP "\"DomainId\":\s\d{1,}," | tr -d ' ')" #_temp="$(echo $domainData | grep -oP "\"DomainId\":\s\d{1,}," | tr -d ' ')"
#_domainids="$(echo $_temp | tr -d ' ')" #_domainids="$(echo $_temp | tr -d ' ')"
_names="$(echo $domainData | _egrep_o '"Name": [^,]*' | cut -d : -f 2)" _names="$(echo "$domainData" | _egrep_o '"Name": [^,]*' | cut -d : -f 2)"
_debug $names _debug $names
ARRAY_IDS=$(echo $_ids | tr ", " "\n") ARRAY_IDS=$(echo "$_ids" | tr ", " "\n")
ARRAY_NAMES=$_names ARRAY_NAMES=$_names
j=0 j=0
for i in $ARRAY_NAMES; for i in $ARRAY_NAMES; do
do
if [ "$i" = "$subdomain" ]; then if [ "$i" = "$subdomain" ]; then
_debug printf "%s\t%s\n" "$i" _debug printf "%s\t%s\n" "$i"
_arrayname=$i #_arrayname=$i
_arrayId=$j _arrayId=$j
_info "Found txt record id: $_arrayId" _info "Found txt record id: $_arrayId"
fi fi
j=$(_math "$j" + 1) j=$(_math "$j" + 1)
done done
n=0 n=0
for i in $ARRAY_IDS; for i in $ARRAY_IDS; do
do
if [ "$n" = "$_arrayId" ]; then if [ "$n" = "$_arrayId" ]; then
_recordId=$i _recordId=$i
_info "recordid found: $_recordId" _info "recordid found: $_recordId"
@ -216,8 +212,8 @@ _aruba_authentication() {
_arubadata="grant_type=password&username=$ARUBA_AK&password=$ARUBA_AS" _arubadata="grant_type=password&username=$ARUBA_AK&password=$ARUBA_AS"
response="$(_post "$_arubadata" "$ARUBA_API/auth/token")" response="$(_post "$_arubadata" "$ARUBA_API/auth/token")"
_debug "$(_post "$_arubadata" "$ARUBA_API/auth/token")" _debug "$(_post "$_arubadata" "$ARUBA_API/auth/token")"
_debug3 response "$response" _debug3 response "$response"
access_token="$(echo "$response" | _egrep_o "access_token\":\"[^\"]*\"" | cut -d : -f 2 | tr -d '"')" access_token="$(echo "$response" | _egrep_o "access_token\":\"[^\"]*\"" | cut -d : -f 2 | tr -d '"')"