Browse Source

Merge pull request #4279 from acmesh-official/dev

sync
pull/4295/head
neil 2 years ago
committed by GitHub
parent
commit
4904d100ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/DNS.yml
  2. 2
      .github/workflows/DragonFlyBSD.yml
  3. 2
      .github/workflows/FreeBSD.yml
  4. 2
      .github/workflows/Linux.yml
  5. 2
      .github/workflows/MacOS.yml
  6. 2
      .github/workflows/NetBSD.yml
  7. 2
      .github/workflows/OpenBSD.yml
  8. 2
      .github/workflows/PebbleStrict.yml
  9. 2
      .github/workflows/Solaris.yml
  10. 2
      .github/workflows/Ubuntu.yml
  11. 2
      .github/workflows/Windows.yml
  12. 2
      .github/workflows/dockerhub.yml
  13. 2
      .github/workflows/issue.yml
  14. 2
      .github/workflows/shellcheck.yml
  15. 31
      dnsapi/dns_kas.sh
  16. 2
      dnsapi/dns_namesilo.sh

2
.github/workflows/DNS.yml

@ -12,7 +12,7 @@ on:
- '.github/workflows/DNS.yml' - '.github/workflows/DNS.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:

2
.github/workflows/DragonFlyBSD.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/DragonFlyBSD.yml' - '.github/workflows/DragonFlyBSD.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/FreeBSD.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/FreeBSD.yml' - '.github/workflows/FreeBSD.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/Linux.yml

@ -16,7 +16,7 @@ on:
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/MacOS.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/MacOS.yml' - '.github/workflows/MacOS.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/NetBSD.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/NetBSD.yml' - '.github/workflows/NetBSD.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/OpenBSD.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/OpenBSD.yml' - '.github/workflows/OpenBSD.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/PebbleStrict.yml

@ -15,7 +15,7 @@ on:
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/Solaris.yml

@ -17,7 +17,7 @@ on:
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:

2
.github/workflows/Ubuntu.yml

@ -15,7 +15,7 @@ on:
- '.github/workflows/Ubuntu.yml' - '.github/workflows/Ubuntu.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/Windows.yml

@ -16,7 +16,7 @@ on:
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/dockerhub.yml

@ -12,7 +12,7 @@ on:
- '.github/workflows/dockerhub.yml' - '.github/workflows/dockerhub.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

2
.github/workflows/issue.yml

@ -14,6 +14,6 @@ jobs:
issue_number: context.issue.number, issue_number: context.issue.number,
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
body: 'Please upgrade to the latest code and try again first. Maybe it's already fixed. ```acme.sh --upgrade``` If it's still not working, please provide the log with `--debug 2`, otherwise, nobody can help you.'
body: "Please upgrade to the latest code and try again first. Maybe it's already fixed. ```acme.sh --upgrade``` If it's still not working, please provide the log with `--debug 2`, otherwise, nobody can help you."
}) })

2
.github/workflows/shellcheck.yml

@ -14,7 +14,7 @@ on:
- '.github/workflows/shellcheck.yml' - '.github/workflows/shellcheck.yml'
concurrency: concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true

31
dnsapi/dns_kas.sh

@ -8,12 +8,12 @@
# - $KAS_Authtype (Kasserver API auth type. Default: plain) # - $KAS_Authtype (Kasserver API auth type. Default: plain)
# - $KAS_Authdata (Kasserver API auth data.) # - $KAS_Authdata (Kasserver API auth data.)
# #
# Author: squared GmbH <github@squaredgmbh.de>
# Last update: squared GmbH <github@squaredgmbh.de>
# Credits: # Credits:
# Inspired by dns_he.sh. Thanks a lot man!
# Previous version by Martin Kammerlander, Phlegx Systems OG <martin.kammerlander@phlegx.com>
# Previous update by Marc-Oliver Lange <git@die-lang.es>
# KASAPI SOAP guideline by https://github.com/o1oo11oo/kasapi.sh
# - dns_he.sh. Thanks a lot man!
# - Martin Kammerlander, Phlegx Systems OG <martin.kammerlander@phlegx.com>
# - Marc-Oliver Lange <git@die-lang.es>
# - https://github.com/o1oo11oo/kasapi.sh
######################################################################## ########################################################################
KAS_Api_GET="$(_get "https://kasapi.kasserver.com/soap/wsdl/KasApi.wsdl")" KAS_Api_GET="$(_get "https://kasapi.kasserver.com/soap/wsdl/KasApi.wsdl")"
KAS_Api="$(echo "$KAS_Api_GET" | tr -d ' ' | grep -i "<soap:addresslocation=" | sed "s/='/\n/g" | grep -i "http" | sed "s/'\/>//g")" KAS_Api="$(echo "$KAS_Api_GET" | tr -d ' ' | grep -i "<soap:addresslocation=" | sed "s/='/\n/g" | grep -i "http" | sed "s/'\/>//g")"
@ -31,13 +31,13 @@ dns_kas_add() {
_txtvalue=$2 _txtvalue=$2
_info "[KAS] -> Using DNS-01 All-inkl/Kasserver hook" _info "[KAS] -> Using DNS-01 All-inkl/Kasserver hook"
_info "[KAS] -> Check and Save Props"
_check_and_save
_info "[KAS] -> Adding $_fulldomain DNS TXT entry on all-inkl.com/Kasserver" _info "[KAS] -> Adding $_fulldomain DNS TXT entry on all-inkl.com/Kasserver"
_info "[KAS] -> Retriving Credential Token" _info "[KAS] -> Retriving Credential Token"
_get_credential_token _get_credential_token
_info "[KAS] -> Check and Save Props"
_check_and_save
_info "[KAS] -> Checking Zone and Record_Name" _info "[KAS] -> Checking Zone and Record_Name"
_get_zone_and_record_name "$_fulldomain" _get_zone_and_record_name "$_fulldomain"
@ -90,14 +90,14 @@ dns_kas_rm() {
_txtvalue=$2 _txtvalue=$2
_info "[KAS] -> Using DNS-01 All-inkl/Kasserver hook" _info "[KAS] -> Using DNS-01 All-inkl/Kasserver hook"
_info "[KAS] -> Check and Save Props"
_check_and_save
_info "[KAS] -> Cleaning up after All-inkl/Kasserver hook" _info "[KAS] -> Cleaning up after All-inkl/Kasserver hook"
_info "[KAS] -> Removing $_fulldomain DNS TXT entry on All-inkl/Kasserver" _info "[KAS] -> Removing $_fulldomain DNS TXT entry on All-inkl/Kasserver"
_info "[KAS] -> Retriving Credential Token" _info "[KAS] -> Retriving Credential Token"
_get_credential_token _get_credential_token
_info "[KAS] -> Check and Save Props"
_check_and_save
_info "[KAS] -> Checking Zone and Record_Name" _info "[KAS] -> Checking Zone and Record_Name"
_get_zone_and_record_name "$_fulldomain" _get_zone_and_record_name "$_fulldomain"
@ -239,6 +239,15 @@ _get_credential_token() {
response="$(_post "$data" "$KAS_Auth" "" "POST" "$contentType")" response="$(_post "$data" "$KAS_Auth" "" "POST" "$contentType")"
_debug2 "[KAS] -> Response" "$response" _debug2 "[KAS] -> Response" "$response"
if [ -z "$response" ]; then
_info "[KAS] -> Response was empty, please check manually."
return 1
elif _contains "$response" "<SOAP-ENV:Fault>"; then
faultstring="$(echo "$response" | tr -d '\n\r' | sed "s/<faultstring>/\n=> /g" | sed "s/<\/faultstring>/\n/g" | grep "=>" | sed "s/=> //g")"
_err "[KAS] -> Could not retrieve login token or antoher error =>$faultstring<= occurred, please check manually."
return 1
fi
_credential_token="$(echo "$response" | tr '\n' ' ' | sed 's/.*return xsi:type="xsd:string">\(.*\)<\/return>/\1/' | sed 's/<\/ns1:KasAuthResponse\(.*\)Envelope>.*//')" _credential_token="$(echo "$response" | tr '\n' ' ' | sed 's/.*return xsi:type="xsd:string">\(.*\)<\/return>/\1/' | sed 's/<\/ns1:KasAuthResponse\(.*\)Envelope>.*//')"
_debug "[KAS] -> Credential Token: " "$_credential_token" _debug "[KAS] -> Credential Token: " "$_credential_token"
return 0 return 0

2
dnsapi/dns_namesilo.sh

@ -110,7 +110,7 @@ _get_root() {
return 1 return 1
fi fi
if _contains "$response" "<domain>$host"; then
if _contains "$response" ">$host</domain>"; then
_sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p) _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
_domain="$host" _domain="$host"
return 0 return 0

Loading…
Cancel
Save