Update LetsEncrypt.yml

.github/workflows/DNS.yml

@@ -1,249 +0,0 @@
-name: DNS
-on:
-  push:
-    paths:
-      - 'dnsapi/*.sh'
-      - '.github/workflows/DNS.yml'
-  pull_request:
-    branches:
-      - 'dev'
-    paths:
-      - 'dnsapi/*.sh'
-      - '.github/workflows/DNS.yml'
-
-
-jobs:
-  CheckToken:
-    runs-on: ubuntu-latest
-    outputs:
-      hasToken: ${{ steps.step_one.outputs.hasToken }}
-    steps:
-      - name: Set the value
-        id: step_one
-        run: |
-          if [ "${{secrets.TokenName1}}" ] ; then
-            echo "::set-output name=hasToken::true"
-          else
-            echo "::set-output name=hasToken::false"
-          fi
-      - name: Check the value
-        run: echo ${{ steps.step_one.outputs.hasToken }}
-
-  Fail:
-    runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'false')"
-    steps:
-    - name: "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
-      run: |
-        echo "Read this:   https://github.com/acmesh-official/acme.sh/wiki/DNS-API-Test"
-        if [ "${{github.actor}}" != "Neilpang" ]; then
-          false
-        fi
-
-  Docker:
-    runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Set env file
-      run: |
-        cd ../acmetest 
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          echo "${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}" >> env.list
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          echo "${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}" >> env.list
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          echo "${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}" >> env.list
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          echo "${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}" >> env.list
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          echo "${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}" >> env.list
-        fi
-        echo "TEST_DNS_NO_WILDCARD" >> env.list 
-        echo "TEST_DNS_SLEEP" >> env.list
-    - name: Run acmetest
-      run: cd ../acmetest && ./rundocker.sh  testall
-
-  MacOS:
-    runs-on: macos-latest
-    needs: Docker
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install tools
-      run:  brew install socat
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      run: |
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
-        fi
-        cd ../acmetest
-        ./letest.sh
-
-  Windows:
-    runs-on: windows-latest
-    needs: MacOS
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - name: Set git to use LF
-      run: |
-          git config --global core.autocrlf false
-    - uses: actions/checkout@v2
-    - name: Install cygwin base packages with chocolatey
-      run: |
-          choco config get cacheLocation
-          choco install --no-progress cygwin
-      shell: cmd
-    - name: Install cygwin additional packages
-      run: |
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git
-      shell: cmd
-    - name: Set ENV
-      shell: cmd
-      run: |
-          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      shell: bash
-      run: |
-        if [ "${{ secrets.TokenName1}}" ] ; then
-          export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
-        fi
-        if [ "${{ secrets.TokenName2}}" ] ; then
-          export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
-        fi
-        if [ "${{ secrets.TokenName3}}" ] ; then
-          export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
-        fi
-        if [ "${{ secrets.TokenName4}}" ] ; then
-          export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
-        fi
-        if [ "${{ secrets.TokenName5}}" ] ; then
-          export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
-        fi
-        cd ../acmetest
-        ./letest.sh
-
-  FreeBSD:
-    runs-on: macos-latest
-    needs: Windows
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v0.1.4
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: pkg install -y socat curl
-        usesh: true
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-  Solaris:
-    runs-on: macos-latest
-    needs: FreeBSD
-    env:
-      TEST_DNS : ${{ secrets.TEST_DNS }}
-      TestingDomain: ${{ secrets.TestingDomain }}
-      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
-      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
-      CASE: le_test_dnsapi
-      TEST_LOCAL: 1
-      DEBUG: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/solaris-vm@v0.0.3
-      with:
-        envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
-        prepare: pkgutil -y -i socat curl
-        run: |
-          if [ "${{ secrets.TokenName1}}" ] ; then
-            export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
-          fi
-          if [ "${{ secrets.TokenName2}}" ] ; then
-            export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
-          fi
-          if [ "${{ secrets.TokenName3}}" ] ; then
-            export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
-          fi
-          if [ "${{ secrets.TokenName4}}" ] ; then
-            export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
-          fi
-          if [ "${{ secrets.TokenName5}}" ] ; then
-            export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
-          fi
-          cd ../acmetest
-          ./letest.sh
-
-        

.github/workflows/LetsEncrypt.yml

@@ -1,42 +1,9 @@
 name: LetsEncrypt
-on:
+on: [push, pull_request]
-  push:
-    branches:
-      - '*'
-    paths:
-      - '**.sh'
-      - '**.yml'
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '**.sh'
-      - '**.yml'
-
 
 jobs:
-  CheckToken:
-    runs-on: ubuntu-latest
-    outputs:
-      hasToken: ${{ steps.step_one.outputs.hasToken }}
-    env: 
-      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
-    steps:
-      - name: Set the value
-        id: step_one
-        run: |
-          if [ "$NGROK_TOKEN" ] ; then
-            echo "::set-output name=hasToken::true"
-          else
-            echo "::set-output name=hasToken::false"
-          fi
-      - name: Check the value
-        run: echo ${{ steps.step_one.outputs.hasToken }}
-
   Ubuntu:
     runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
     env:
       NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
       TEST_LOCAL: 1
@@ -47,101 +14,19 @@ jobs:
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
-      run: cd ../acmetest && sudo --preserve-env ./letest.sh
+      run: cd ../acmetest && sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
 
   MacOS:
-    runs-on: macos-latest
     needs: Ubuntu
+    runs-on: macos-latest
     env:
       NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
       TEST_LOCAL: 1
     steps:
     - uses: actions/checkout@v2
     - name: Install tools
-      run:  brew install socat
+      run:  brew update && brew install socat;
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
-      run: cd ../acmetest && sudo --preserve-env ./letest.sh
+      run: cd ../acmetest && sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
-
-  Windows:
-    runs-on: windows-latest
-    needs: MacOS
-    env:
-      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
-      TEST_LOCAL: 1
-      #The 80 port is used by Windows server, we have to use a custom port, ngrok will also use this port.
-      Le_HTTPPort: 8888
-    steps:
-    - name: Set git to use LF
-      run: |
-          git config --global core.autocrlf false
-    - uses: actions/checkout@v2
-    - name: Install cygwin base packages with chocolatey
-      run: |
-          choco config get cacheLocation
-          choco install --no-progress cygwin
-      shell: cmd
-    - name: Install cygwin additional packages
-      run: |
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git
-      shell: cmd
-    - name: Set ENV
-      shell: cmd
-      run: |
-          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%
-    - name: Check ENV
-      shell: cmd
-      run: |
-          echo "PATH=%PATH%"
-    - name: Clone acmetest
-      shell: cmd
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - name: Run acmetest
-      shell: cmd
-      run: cd ../acmetest && bash.exe -c ./letest.sh
-
-  FreeBSD:
-    runs-on: macos-latest
-    needs: Windows
-    env:
-      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
-      TEST_LOCAL: 1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/freebsd-vm@v0.1.4
-      with:
-        envs: 'NGROK_TOKEN TEST_LOCAL'
-        prepare: pkg install -y socat curl
-        usesh: true
-        run: |
-          cd ../acmetest && ./letest.sh
-
-  Solaris:
-    runs-on: macos-latest
-    needs: FreeBSD
-    env:
-      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}
-      TEST_LOCAL: 1
-    steps:
-    - uses: actions/checkout@v2
-    - uses: vmactions/ngrok-tunnel@v0.0.1
-      id: ngrok
-      with:
-        protocol: http
-        port: 8080
-    - name: Set envs
-      run: echo "TestingDomain=${{steps.ngrok.outputs.server}}" >> $GITHUB_ENV
-    - name: Clone acmetest
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
-    - uses: vmactions/solaris-vm@v0.0.3
-      with:
-        envs: 'TEST_LOCAL TestingDomain'
-        nat: |
-          "8080": "80"
-        prepare: pkgutil -y -i socat curl
-        run: |
-          cd ../acmetest && ./letest.sh
-

.github/workflows/PebbleStrict.yml

@@ -1,17 +1,5 @@
 name: PebbleStrict
-on:
+on: [push, pull_request]
-  push:
-    branches:
-      - '*'
-    paths:
-      - '**.sh'
-      - '**.yml'
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '**.sh'
-      - '**.yml'
 
 jobs:
   PebbleStrict:

.github/workflows/dockerhub.yml

@@ -8,35 +8,17 @@ on:
       - '*'
     
 jobs:
-  CheckToken:
-    runs-on: ubuntu-latest
-    outputs:
-      hasToken: ${{ steps.step_one.outputs.hasToken }}
-    env: 
-      DOCKER_PASSWORD : ${{ secrets.DOCKER_PASSWORD }}
-    steps:
-      - name: Set the value
-        id: step_one
-        run: |
-          if [ "$DOCKER_PASSWORD" ] ; then
-            echo "::set-output name=hasToken::true"
-          else
-            echo "::set-output name=hasToken::false"
-          fi
-      - name: Check the value
-        run: echo ${{ steps.step_one.outputs.hasToken }}
-        
   build:
     runs-on: ubuntu-latest
-    needs: CheckToken
-    if: "contains(needs.CheckToken.outputs.hasToken, 'true')"
     steps:
       - name: checkout code
         uses: actions/checkout@v2
-      - name: Set up QEMU
+      - name: install buildx
-        uses: docker/setup-qemu-action@v1
+        id: buildx
-      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
-        uses: docker/setup-buildx-action@v1
+        with:
+          buildx-version: latest
+          qemu-version: latest
       - name: login to docker hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
@@ -61,4 +43,4 @@ jobs:
             --tag ${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG} \
             --output "type=image,push=true" \
             --build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
-            --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386,linux/ppc64le,linux/s390x .
+            --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .

.github/workflows/shellcheck.yml

@@ -1,20 +1,8 @@
 name: Shellcheck
-on:
+on: [push, pull_request]
-  push:
-    branches:
-      - '*'
-    paths:
-      - '**.sh'
-      - '**.yml'
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - '**.sh'
-      - '**.yml'
 
 jobs:
-  ShellCheck:
+  formatCheck:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -22,11 +10,6 @@ jobs:
       run: sudo apt-get install -y shellcheck
     - name: DoShellcheck
       run: shellcheck -V  && shellcheck -e SC2181 **/*.sh && echo "shellcheck OK"
-
-  shfmt:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
     - name: Install shfmt
       run: curl -sSL https://github.com/mvdan/sh/releases/download/v3.1.2/shfmt_v3.1.2_linux_amd64 -o ~/shfmt && chmod +x ~/shfmt
     - name: shfmt

Dockerfile

@@ -7,12 +7,10 @@ RUN apk update -f \
   coreutils \
   bind-tools \
   curl \
-  sed \
   socat \
   tzdata \
   oath-toolkit-oathtool \
   tar \
-  libidn \
   && rm -rf /var/cache/apk/*
 
 ENV LE_CONFIG_HOME /acme.sh

README.md

@@ -1,9 +1,9 @@
 # An ACME Shell script: acme.sh 
 
-![LetsEncrypt](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)
+![shellcheck](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)
-![Shellcheck](https://github.com/acmesh-official/acme.sh/workflows/Shellcheck/badge.svg)
+![shellcheck](https://github.com/acmesh-official/acme.sh/workflows/Shellcheck/badge.svg)
-![PebbleStrict](https://github.com/acmesh-official/acme.sh/workflows/PebbleStrict/badge.svg)
+![shellcheck](https://github.com/acmesh-official/acme.sh/workflows/PebbleStrict/badge.svg)
-![DockerHub](https://github.com/acmesh-official/acme.sh/workflows/Build%20DockerHub/badge.svg)
+![shellcheck](https://github.com/acmesh-official/acme.sh/workflows/Build%20DockerHub/badge.svg)
 
 
 <a href="https://opencollective.com/acmesh" alt="Financial Contributors on Open Collective"><img src="https://opencollective.com/acmesh/all/badge.svg?label=financial+contributors" /></a> 
@@ -57,26 +57,26 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
 
 | NO | Status| Platform|
 |----|-------|---------|
-|1|[![MacOS](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Mac OSX
+|1|[![](https://acmesh-official.github.io/acmetest/status/ubuntu-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Ubuntu
-|2|[![Windows](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Windows (cygwin with curl, openssl and crontab included)
+|2|[![](https://acmesh-official.github.io/acmetest/status/debian-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
-|3|[![FreeBSD](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|FreeBSD
+|3|[![](https://acmesh-official.github.io/acmetest/status/centos-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
-|4|[![Solaris](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Solaris
+|4|[![](https://acmesh-official.github.io/acmetest/status/windows-cygwin.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Windows (cygwin with curl, openssl and crontab included)
-|5|[![Ubuntu](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)| Ubuntu
+|5|[![](https://acmesh-official.github.io/acmetest/status/freebsd.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|FreeBSD
 |6|[![](https://acmesh-official.github.io/acmetest/status/pfsense.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|pfsense
-|7|[![](https://acmesh-official.github.io/acmetest/status/openbsd.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|OpenBSD
+|7|[![](https://acmesh-official.github.io/acmetest/status/opensuse-leap-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE
-|8|[![](https://acmesh-official.github.io/acmetest/status/debian-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
+|8|[![](https://acmesh-official.github.io/acmetest/status/alpine-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Alpine Linux (with curl)
-|9|[![](https://acmesh-official.github.io/acmetest/status/centos-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
+|9|[![](https://acmesh-official.github.io/acmetest/status/archlinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Archlinux
-|10|[![](https://acmesh-official.github.io/acmetest/status/opensuse-leap-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE
+|10|[![](https://acmesh-official.github.io/acmetest/status/fedora-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|fedora
-|11|[![](https://acmesh-official.github.io/acmetest/status/alpine-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Alpine Linux (with curl)
+|11|[![](https://acmesh-official.github.io/acmetest/status/kalilinux-kali.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Kali Linux
-|12|[![](https://acmesh-official.github.io/acmetest/status/archlinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Archlinux
+|12|[![](https://acmesh-official.github.io/acmetest/status/oraclelinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Oracle Linux
-|13|[![](https://acmesh-official.github.io/acmetest/status/fedora-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|fedora
+|13|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
-|14|[![](https://acmesh-official.github.io/acmetest/status/kalilinux-kali.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Kali Linux
+|14|-----| Cloud Linux  https://github.com/acmesh-official/acme.sh/issues/111
-|15|[![](https://acmesh-official.github.io/acmetest/status/oraclelinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Oracle Linux
+|15|[![](https://acmesh-official.github.io/acmetest/status/openbsd.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|OpenBSD
-|16|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
+|16|[![](https://acmesh-official.github.io/acmetest/status/mageia.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Mageia
-|17|-----| Cloud Linux  https://github.com/acmesh-official/acme.sh/issues/111
+|17|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
-|18|[![](https://acmesh-official.github.io/acmetest/status/mageia.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Mageia
+|18|[![](https://acmesh-official.github.io/acmetest/status/solaris.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|SunOS/Solaris
-|19|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
+|19|[![](https://acmesh-official.github.io/acmetest/status/gentoo-stage3-amd64.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Gentoo Linux
-|20|[![](https://acmesh-official.github.io/acmetest/status/gentoo-stage3-amd64.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|Gentoo Linux
+|20|[![Build Status](https://github.com/acmesh-official/acme.sh/workflows/LetsEncrypt/badge.svg)](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Mac OSX
 |21|[![](https://acmesh-official.github.io/acmetest/status/clearlinux-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|ClearLinux
 
 For all build statuses, check our [weekly build project](https://github.com/acmesh-official/acmetest):
@@ -89,7 +89,6 @@ https://github.com/acmesh-official/acmetest
 - [ZeroSSL.com CA](https://github.com/acmesh-official/acme.sh/wiki/ZeroSSL.com-CA)
 - [BuyPass.com CA](https://github.com/acmesh-official/acme.sh/wiki/BuyPass.com-CA)
 - [Pebble strict Mode](https://github.com/letsencrypt/pebble)
-- Any other [RFC8555](https://tools.ietf.org/html/rfc8555)-compliant CA
 
 # Supported modes
 
@@ -110,13 +109,13 @@ https://github.com/acmesh-official/acmetest
 Check this project: https://github.com/acmesh-official/get.acme.sh
 
 ```bash
-curl https://get.acme.sh | sh -s email=my@example.com
+curl https://get.acme.sh | sh
 ```
 
 Or:
 
 ```bash
-wget -O -  https://get.acme.sh | sh -s email=my@example.com
+wget -O -  https://get.acme.sh | sh
 ```
 
 
@@ -127,7 +126,7 @@ Clone this project and launch installation:
 ```bash
 git clone https://github.com/acmesh-official/acme.sh.git
 cd ./acme.sh
-./acme.sh --install -m my@example.com
+./acme.sh --install
 ```
 
 You `don't have to be root` then, although `it is recommended`.

acme.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VER=2.8.9
+VER=2.8.7
 
 PROJECT_NAME="acme.sh"
 
@@ -102,8 +102,6 @@ DEBUG_LEVEL_NONE=0
 
 DOH_CLOUDFLARE=1
 DOH_GOOGLE=2
-DOH_ALI=3
-DOH_DP=4
 
 HIDDEN_VALUE="[hidden](please add '--output-insecure' to see this value)"
 
@@ -162,8 +160,6 @@ _SERVER_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Server"
 
 _PREFERRED_CHAIN_WIKI="https://github.com/acmesh-official/acme.sh/wiki/Preferred-Chain"
 
-_DNSCHECK_WIKI="https://github.com/acmesh-official/acme.sh/wiki/dnscheck"
-
 _DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
 
 _DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR"
@@ -564,16 +560,8 @@ if _exists xargs && [ "$(printf %s '\\x41' | xargs printf)" = 'A' ]; then
 fi
 
 _h2b() {
-  if _exists xxd; then
+  if _exists xxd && xxd -r -p 2>/dev/null; then
-    if _contains "$(xxd --help 2>&1)" "assumes -c30"; then
+    return
-      if xxd -r -p -c 9999 2>/dev/null; then
-        return
-      fi
-    else
-      if xxd -r -p 2>/dev/null; then
-        return
-      fi
-    fi
   fi
 
   hex=$(cat)
@@ -968,9 +956,9 @@ _dbase64() {
 _checkcert() {
   _cf="$1"
   if [ "$DEBUG" ]; then
-    ${ACME_OPENSSL_BIN:-openssl} x509 -noout -text -in "$_cf"
+    openssl x509 -noout -text -in "$_cf"
   else
-    ${ACME_OPENSSL_BIN:-openssl} x509 -noout -text -in "$_cf" >/dev/null 2>&1
+    openssl x509 -noout -text -in "$_cf" >/dev/null 2>&1
   fi
 }
 
@@ -1134,7 +1122,7 @@ _createkey() {
 
   if _isEccKey "$length"; then
     _debug "Using ec name: $eccname"
-    if _opkey="$(${ACME_OPENSSL_BIN:-openssl} ecparam -name "$eccname" -noout -genkey 2>/dev/null)"; then
+    if _opkey="$(${ACME_OPENSSL_BIN:-openssl} ecparam -name "$eccname" -genkey 2>/dev/null)"; then
       echo "$_opkey" >"$f"
     else
       _err "error ecc key name: $eccname"
@@ -1142,11 +1130,7 @@ _createkey() {
     fi
   else
     _debug "Using RSA: $length"
-    __traditional=""
+    if _opkey="$(${ACME_OPENSSL_BIN:-openssl} genrsa "$length" 2>/dev/null)"; then
-    if _contains "$(${ACME_OPENSSL_BIN:-openssl} help genrsa 2>&1)" "-traditional"; then
-      __traditional="-traditional"
-    fi
-    if _opkey="$(${ACME_OPENSSL_BIN:-openssl} genrsa $__traditional "$length" 2>/dev/null)"; then
       echo "$_opkey" >"$f"
     else
       _err "error rsa key: $length"
@@ -1738,14 +1722,6 @@ _mktemp() {
   _err "Can not create temp file."
 }
 
-#clear all the https envs to cause _inithttp() to run next time.
-_resethttp() {
-  __HTTP_INITIALIZED=""
-  _ACME_CURL=""
-  _ACME_WGET=""
-  ACME_HTTP_NO_REDIRECTS=""
-}
-
 _inithttp() {
 
   if [ -z "$HTTP_HEADER" ] || ! touch "$HTTP_HEADER"; then
@@ -1761,10 +1737,7 @@ _inithttp() {
   fi
 
   if [ -z "$_ACME_CURL" ] && _exists "curl"; then
-    _ACME_CURL="curl --silent --dump-header $HTTP_HEADER "
+    _ACME_CURL="curl -L --silent --dump-header $HTTP_HEADER "
-    if [ -z "$ACME_HTTP_NO_REDIRECTS" ]; then
-      _ACME_CURL="$_ACME_CURL -L "
-    fi
     if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ]; then
       _CURL_DUMP="$(_mktemp)"
       _ACME_CURL="$_ACME_CURL --trace-ascii $_CURL_DUMP "
@@ -1783,9 +1756,6 @@ _inithttp() {
 
   if [ -z "$_ACME_WGET" ] && _exists "wget"; then
     _ACME_WGET="wget -q"
-    if [ "$ACME_HTTP_NO_REDIRECTS" ]; then
-      _ACME_WGET="$_ACME_WGET --max-redirect 0 "
-    fi
     if [ "$DEBUG" ] && [ "$DEBUG" -ge "2" ]; then
       _ACME_WGET="$_ACME_WGET -d "
     fi
@@ -2040,7 +2010,7 @@ _send_signed_request() {
         if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type" >/dev/null; then
           _headers="$(cat "$HTTP_HEADER")"
           _debug2 _headers "$_headers"
-          _CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2 | cut -d , -f 1)"
+          _CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
         fi
       fi
       if [ -z "$_CACHED_NONCE" ]; then
@@ -2116,11 +2086,11 @@ _send_signed_request() {
 
     _debug2 original "$response"
     if echo "$responseHeaders" | grep -i "Content-Type: *application/json" >/dev/null 2>&1; then
-      response="$(echo "$response" | _json_decode | _normalizeJson)"
+      response="$(echo "$response" | _normalizeJson | _json_decode)"
     fi
     _debug2 response "$response"
 
-    _CACHED_NONCE="$(echo "$responseHeaders" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2 | cut -d , -f 1)"
+    _CACHED_NONCE="$(echo "$responseHeaders" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
 
     if ! _startswith "$code" "2"; then
       _body="$response"
@@ -2135,12 +2105,6 @@ _send_signed_request() {
         _sleep $_sleep_retry_sec
         continue
       fi
-      if _contains "$_body" "The Replay Nonce is not recognized"; then
-        _info "The replay Nonce is not valid, let's get a new one, Sleeping $_sleep_retry_sec seconds."
-        _CACHED_NONCE=""
-        _sleep $_sleep_retry_sec
-        continue
-      fi
     fi
     return 0
   done
@@ -2268,7 +2232,7 @@ _getdeployconf() {
     return 0 # do nothing
   fi
   _saved=$(_readdomainconf "SAVED_$_rac_key")
-  eval "export $_rac_key=\"\$_saved\""
+  eval "export $_rac_key=\"$_saved\""
 }
 
 #_saveaccountconf  key  value  base64encode
@@ -2299,13 +2263,6 @@ _clearaccountconf() {
   _clear_conf "$ACCOUNT_CONF_PATH" "$1"
 }
 
-#key
-_clearaccountconf_mutable() {
-  _clearaccountconf "SAVED_$1"
-  #remove later
-  _clearaccountconf "$1"
-}
-
 #_savecaconf  key  value
 _savecaconf() {
   _save_conf "$CA_CONF" "$1" "$2"
@@ -2359,7 +2316,7 @@ _startserver() {
 echo 'HTTP/1.0 200 OK'; \
 echo 'Content-Length\: $_content_len'; \
 echo ''; \
-printf '%s' '$content';" &
+printf -- '$content';" &
   serverproc="$!"
 }
 
@@ -3098,11 +3055,6 @@ _checkConf() {
       _debug "Try include files"
       for included in $(cat "$2" | tr "\t" " " | grep "^ *include *.*;" | sed "s/include //" | tr -d " ;"); do
         _debug "check included $included"
-        if !_startswith "$included" "/" && _exists dirname; then
-          _relpath="$(dirname "$_c_file")"
-          _debug "_relpath" "$_relpath"
-          included="$_relpath/included"
-        fi
         if _checkConf "$1" "$included"; then
           return 0
         fi
@@ -3923,15 +3875,7 @@ _ns_purge_cf() {
 
 #checks if cf server is available
 _ns_is_available_cf() {
-  if _get "https://cloudflare-dns.com" "" 1 >/dev/null 2>&1; then
+  if _get "https://cloudflare-dns.com" >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-_ns_is_available_google() {
-  if _get "https://dns.google" "" 1 >/dev/null 2>&1; then
     return 0
   else
     return 1
@@ -3946,38 +3890,6 @@ _ns_lookup_google() {
   _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
 }
 
-_ns_is_available_ali() {
-  if _get "https://dns.alidns.com" "" 1 >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#domain, type
-_ns_lookup_ali() {
-  _cf_ld="$1"
-  _cf_ld_type="$2"
-  _cf_ep="https://dns.alidns.com/resolve"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
-}
-
-_ns_is_available_dp() {
-  if _get "https://dns.alidns.com" "" 1 >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#dnspod
-_ns_lookup_dp() {
-  _cf_ld="$1"
-  _cf_ld_type="$2"
-  _cf_ep="https://doh.pub/dns-query"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
-}
-
 #domain, type
 _ns_lookup() {
   if [ -z "$DOH_USE" ]; then
@@ -3985,30 +3897,16 @@ _ns_lookup() {
     if _ns_is_available_cf; then
       _debug "Use cloudflare doh server"
       export DOH_USE=$DOH_CLOUDFLARE
-    elif _ns_is_available_google; then
+    else
       _debug "Use google doh server"
       export DOH_USE=$DOH_GOOGLE
-    elif _ns_is_available_ali; then
-      _debug "Use aliyun doh server"
-      export DOH_USE=$DOH_ALI
-    elif _ns_is_available_dp; then
-      _debug "Use dns pod doh server"
-      export DOH_USE=$DOH_DP
-    else
-      _err "No doh"
     fi
   fi
 
   if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
     _ns_lookup_cf "$@"
-  elif [ "$DOH_USE" = "$DOH_GOOGLE" ]; then
-    _ns_lookup_google "$@"
-  elif [ "$DOH_USE" = "$DOH_ALI" ]; then
-    _ns_lookup_ali "$@"
-  elif [ "$DOH_USE" = "$DOH_DP" ]; then
-    _ns_lookup_dp "$@"
   else
-    _err "Unknown doh provider: DOH_USE=$DOH_USE"
+    _ns_lookup_google "$@"
   fi
 
 }
@@ -4033,7 +3931,7 @@ __purge_txt() {
   if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
     _ns_purge_cf "$_p_txtdomain" "TXT"
   else
-    _debug "no purge api for this doh api, just sleep 5 secs"
+    _debug "no purge api for google dns api, just sleep 5 secs"
     _sleep 5
   fi
 
@@ -4046,8 +3944,6 @@ _check_dns_entries() {
   _end_time="$(_math "$_end_time" + 1200)" #let's check no more than 20 minutes.
 
   while [ "$(_time)" -le "$_end_time" ]; do
-    _info "You can use '--dnssleep' to disable public dns checks."
-    _info "See: $_DNSCHECK_WIKI"
     _left=""
     for entry in $dns_entries; do
       d=$(_getfield "$entry" 1)
@@ -4095,42 +3991,12 @@ _check_dns_entries() {
 }
 
 #file
-_get_chain_issuers() {
+_get_cert_issuers() {
   _cfile="$1"
-  if _contains "$(${ACME_OPENSSL_BIN:-openssl} help crl2pkcs7 2>&1)" "Usage: crl2pkcs7" || _contains "$(${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -help 2>&1)" "Usage: crl2pkcs7" || _contains "$(${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 help 2>&1)" "unknown option help"; then
+  if _contains "$(${ACME_OPENSSL_BIN:-openssl} help crl2pkcs7 2>&1)" "Usage: crl2pkcs7"; then
-    ${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -nocrl -certfile $_cfile | ${ACME_OPENSSL_BIN:-openssl} pkcs7 -print_certs -text -noout | grep -i 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
+    ${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -nocrl -certfile $_cfile | openssl pkcs7 -print_certs -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
   else
-    _cindex=1
+    ${ACME_OPENSSL_BIN:-openssl} x509 -in $_cfile -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
-    for _startn in $(grep -n -- "$BEGIN_CERT" "$_cfile" | cut -d : -f 1); do
-      _endn="$(grep -n -- "$END_CERT" "$_cfile" | cut -d : -f 1 | _head_n $_cindex | _tail_n 1)"
-      _debug2 "_startn" "$_startn"
-      _debug2 "_endn" "$_endn"
-      if [ "$DEBUG" ]; then
-        _debug2 "cert$_cindex" "$(sed -n "$_startn,${_endn}p" "$_cfile")"
-      fi
-      sed -n "$_startn,${_endn}p" "$_cfile" | ${ACME_OPENSSL_BIN:-openssl} x509 -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2 | sed "s/ *\(.*\)/\1/"
-      _cindex=$(_math $_cindex + 1)
-    done
-  fi
-}
-
-#
-_get_chain_subjects() {
-  _cfile="$1"
-  if _contains "$(${ACME_OPENSSL_BIN:-openssl} help crl2pkcs7 2>&1)" "Usage: crl2pkcs7" || _contains "$(${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -help 2>&1)" "Usage: crl2pkcs7" || _contains "$(${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 help 2>&1)" "unknown option help"; then
-    ${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -nocrl -certfile $_cfile | ${ACME_OPENSSL_BIN:-openssl} pkcs7 -print_certs -text -noout | grep -i 'Subject:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
-  else
-    _cindex=1
-    for _startn in $(grep -n -- "$BEGIN_CERT" "$_cfile" | cut -d : -f 1); do
-      _endn="$(grep -n -- "$END_CERT" "$_cfile" | cut -d : -f 1 | _head_n $_cindex | _tail_n 1)"
-      _debug2 "_startn" "$_startn"
-      _debug2 "_endn" "$_endn"
-      if [ "$DEBUG" ]; then
-        _debug2 "cert$_cindex" "$(sed -n "$_startn,${_endn}p" "$_cfile")"
-      fi
-      sed -n "$_startn,${_endn}p" "$_cfile" | ${ACME_OPENSSL_BIN:-openssl} x509 -text -noout | grep -i 'Subject:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2 | sed "s/ *\(.*\)/\1/"
-      _cindex=$(_math $_cindex + 1)
-    done
   fi
 }
 
@@ -4138,12 +4004,14 @@ _get_chain_subjects() {
 _match_issuer() {
   _cfile="$1"
   _missuer="$2"
-  _fissuers="$(_get_chain_issuers $_cfile)"
+  _fissuers="$(_get_cert_issuers $_cfile)"
   _debug2 _fissuers "$_fissuers"
-  _rootissuer="$(echo "$_fissuers" | _lower_case | _tail_n 1)"
+  if _contains "$_fissuers" "$_missuer"; then
-  _debug2 _rootissuer "$_rootissuer"
+    return 0
+  fi
+  _fissuers="$(echo "$_fissuers" | _lower_case)"
   _missuer="$(echo "$_missuer" | _lower_case)"
-  _contains "$_rootissuer" "$_missuer"
+  _contains "$_fissuers" "$_missuer"
 }
 
 #webroot, domain domainlist  keylength
@@ -4781,7 +4649,7 @@ $_authorizations_map"
       _debug2 response "$response"
 
       status=$(echo "$response" | _egrep_o '"status":"[^"]*' | cut -d : -f 2 | tr -d '"')
-      if _contains "$status" "valid"; then
+      if [ "$status" = "valid" ]; then
         _info "$(__green Success)"
         _stopserver "$serverproc"
         serverproc=""
@@ -4846,7 +4714,7 @@ $_authorizations_map"
       return 1
     fi
     if [ -z "$Le_LinkOrder" ]; then
-      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n \t" | cut -d ":" -f 2-)"
+      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n" | cut -d ":" -f 2-)"
     fi
 
     _savedomainconf "Le_LinkOrder" "$Le_LinkOrder"
@@ -4917,9 +4785,6 @@ $_authorizations_map"
     _split_cert_chain "$CERT_PATH" "$CERT_FULLCHAIN_PATH" "$CA_CERT_PATH"
 
     if [ "$_preferred_chain" ] && [ -f "$CERT_FULLCHAIN_PATH" ]; then
-      if [ "$DEBUG" ]; then
-        _debug "default chain issuers: " "$(_get_chain_issuers "$CERT_FULLCHAIN_PATH")"
-      fi
       if ! _match_issuer "$CERT_FULLCHAIN_PATH" "$_preferred_chain"; then
         rels="$(echo "$responseHeaders" | tr -d ' <>' | grep -i "^link:" | grep -i 'rel="alternate"' | cut -d : -f 2- | cut -d ';' -f 1)"
         _debug2 "rels" "$rels"
@@ -4935,22 +4800,13 @@ $_authorizations_map"
           _relca="$CA_CERT_PATH.alt"
           echo "$response" >"$_relcert"
           _split_cert_chain "$_relcert" "$_relfullchain" "$_relca"
-          if [ "$DEBUG" ]; then
-            _debug "rel chain issuers: " "$(_get_chain_issuers "$_relfullchain")"
-          fi
           if _match_issuer "$_relfullchain" "$_preferred_chain"; then
             _info "Matched issuer in: $rel"
             cat $_relcert >"$CERT_PATH"
             cat $_relfullchain >"$CERT_FULLCHAIN_PATH"
             cat $_relca >"$CA_CERT_PATH"
-            rm -f "$_relcert"
-            rm -f "$_relfullchain"
-            rm -f "$_relca"
             break
           fi
-          rm -f "$_relcert"
-          rm -f "$_relfullchain"
-          rm -f "$_relca"
         done
       fi
     fi
@@ -5122,7 +4978,7 @@ $_authorizations_map"
   fi
 }
 
-#in_out_cert   out_fullchain   out_ca
+#in_out_cert   out_fullchain out out_ca
 _split_cert_chain() {
   _certf="$1"
   _fullchainf="$2"
@@ -5348,7 +5204,6 @@ signcsr() {
   _renew_hook="${10}"
   _local_addr="${11}"
   _challenge_alias="${12}"
-  _preferred_chain="${13}"
 
   _csrsubj=$(_readSubjectFromCSR "$_csrfile")
   if [ "$?" != "0" ]; then
@@ -5395,7 +5250,7 @@ signcsr() {
   _info "Copy csr to: $CSR_PATH"
   cp "$_csrfile" "$CSR_PATH"
 
-  issue "$_csrW" "$_csrsubj" "$_csrdomainlist" "$_csrkeylength" "$_real_cert" "$_real_key" "$_real_ca" "$_reload_cmd" "$_real_fullchain" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_addr" "$_challenge_alias" "$_preferred_chain"
+  issue "$_csrW" "$_csrsubj" "$_csrdomainlist" "$_csrkeylength" "$_real_cert" "$_real_key" "$_real_ca" "$_reload_cmd" "$_real_fullchain" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_addr" "$_challenge_alias"
 
 }
 
@@ -5968,7 +5823,7 @@ _deactivate() {
     _URL_NAME="uri"
   fi
 
-  entries="$(echo "$response" | tr '][' '==' | _egrep_o "challenges\": *=[^=]*=" | tr '}{' '\n' | grep "\"status\": *\"valid\"")"
+  entries="$(echo "$response" | _egrep_o "[^{]*\"type\":\"[^\"]*\", *\"status\": *\"valid\", *\"$_URL_NAME\"[^}]*")"
   if [ -z "$entries" ]; then
     _info "No valid entries found."
     if [ -z "$thumbprint" ]; then
@@ -6011,7 +5866,7 @@ _deactivate() {
     _debug _vtype "$_vtype"
     _info "Found $_vtype"
 
-    uri="$(echo "$entry" | _egrep_o "\"$_URL_NAME\":\"[^\"]*\"" | tr -d '" ' | cut -d : -f 2-)"
+    uri="$(echo "$entry" | _egrep_o "\"$_URL_NAME\":\"[^\"]*" | cut -d : -f 2,3 | tr -d '"')"
     _debug uri "$uri"
 
     if [ "$_d_type" ] && [ "$_d_type" != "$_vtype" ]; then
@@ -6232,7 +6087,7 @@ _installalias() {
 
 }
 
-# nocron confighome noprofile accountemail
+# nocron confighome noprofile
 install() {
 
   if [ -z "$LE_WORKING_DIR" ]; then
@@ -6242,8 +6097,6 @@ install() {
   _nocron="$1"
   _c_home="$2"
   _noprofile="$3"
-  _accountemail="$4"
-
   if ! _initpath; then
     _err "Install failed."
     return 1
@@ -6362,10 +6215,6 @@ install() {
     fi
   fi
 
-  if [ "$_accountemail" ]; then
-    _saveaccountconf "ACCOUNT_EMAIL" "$_accountemail"
-  fi
-
   _info OK
 }
 
@@ -6644,7 +6493,7 @@ Parameters:
   --cert-home <directory>           Specifies the home dir to save all the certs, only valid for '--install' command.
   --config-home <directory>         Specifies the home dir to save all the configurations.
   --useragent <string>              Specifies the user agent string. it will be saved for future use too.
-  -m, --email <email>               Specifies the account email, only valid for the '--install' and '--update-account' command.
+  -m, --accountemail <email>        Specifies the account email, only valid for the '--install' and '--update-account' command.
   --accountkey <file>               Specifies the account key path, only valid for the '--install' command.
   --days <ndays>                    Specifies the days to renew the cert when using '--issue' command. The default value is $DEFAULT_RENEW days.
   --httpport <port>                 Specifies the standalone listening port. Only valid if the server is behind a reverse proxy or load balancer.
@@ -6655,9 +6504,9 @@ Parameters:
   --insecure                        Do not check the server certificate, in some devices, the api server's certificate may not be trusted.
   --ca-bundle <file>                Specifies the path to the CA certificate bundle to verify api server's certificate.
   --ca-path <directory>             Specifies directory containing CA certificates in PEM format, used by wget or curl.
-  --no-cron                         Only valid for '--install' command, which means: do not install the default cron job.
+  --nocron                          Only valid for '--install' command, which means: do not install the default cron job.
                                     In this case, the certs will not be renewed automatically.
-  --no-profile                      Only valid for '--install' command, which means: do not install aliases to user profile.
+  --noprofile                       Only valid for '--install' command, which means: do not install aliases to user profile.
   --no-color                        Do not output color text.
   --force-color                     Force output of color text. Useful for non-interactive use with the aha tool for HTML E-Mails.
   --ecc                             Specifies to use the ECC cert. Valid for '--install-cert', '--renew', '--revoke', '--to-pkcs12' and '--create-csr'
@@ -6695,17 +6544,18 @@ Parameters:
 "
 }
 
-installOnline() {
+# nocron noprofile
+_installOnline() {
   _info "Installing from online archive."
-
+  _nocron="$1"
-  _branch="$BRANCH"
+  _noprofile="$2"
-  if [ -z "$_branch" ]; then
+  if [ ! "$BRANCH" ]; then
-    _branch="master"
+    BRANCH="master"
   fi
 
-  target="$PROJECT/archive/$_branch.tar.gz"
+  target="$PROJECT/archive/$BRANCH.tar.gz"
   _info "Downloading $target"
-  localname="$_branch.tar.gz"
+  localname="$BRANCH.tar.gz"
   if ! _get "$target" >$localname; then
     _err "Download error."
     return 1
@@ -6717,9 +6567,9 @@ installOnline() {
       exit 1
     fi
 
-    cd "$PROJECT_NAME-$_branch"
+    cd "$PROJECT_NAME-$BRANCH"
     chmod +x $PROJECT_ENTRY
-    if ./$PROJECT_ENTRY --install "$@"; then
+    if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then
       _info "Install success!"
       _initpath
       _saveaccountconf "UPGRADE_HASH" "$(_getUpgradeHash)"
@@ -6727,7 +6577,7 @@ installOnline() {
 
     cd ..
 
-    rm -rf "$PROJECT_NAME-$_branch"
+    rm -rf "$PROJECT_NAME-$BRANCH"
     rm -f "$localname"
   )
 }
@@ -6755,7 +6605,7 @@ upgrade() {
     [ -z "$FORCE" ] && [ "$(_getUpgradeHash)" = "$(_readaccountconf "UPGRADE_HASH")" ] && _info "Already uptodate!" && exit 0
     export LE_WORKING_DIR
     cd "$LE_WORKING_DIR"
-    installOnline "--nocron" "--noprofile"
+    _installOnline "nocron" "noprofile"
   ); then
     _info "Upgrade success!"
     exit 0
@@ -6799,8 +6649,8 @@ _checkSudo() {
       return 0
     fi
     if [ -n "$SUDO_COMMAND" ]; then
-      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`, or `sudo su acmeuser1`
+      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
-      _endswith "$SUDO_COMMAND" /bin/su || _contains "$SUDO_COMMAND" "/bin/su " || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1
+      _endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1
       return $?
     fi
     #otherwise
@@ -6935,11 +6785,6 @@ _process() {
     --install)
       _CMD="install"
       ;;
-    --install-online)
-      shift
-      installOnline "$@"
-      return
-      ;;
     --uninstall)
       _CMD="uninstall"
       ;;
@@ -7214,9 +7059,9 @@ _process() {
       USER_AGENT="$_useragent"
       shift
       ;;
-    -m | --email | --accountemail)
+    -m | --accountemail)
       _accountemail="$2"
-      export ACCOUNT_EMAIL="$_accountemail"
+      ACCOUNT_EMAIL="$_accountemail"
       shift
       ;;
     --accountkey)
@@ -7259,10 +7104,10 @@ _process() {
       CA_PATH="$_ca_path"
       shift
       ;;
-    --no-cron | --nocron)
+    --nocron)
       _nocron="1"
       ;;
-    --no-profile | --noprofile)
+    --noprofile)
       _noprofile="1"
       ;;
     --no-color)
@@ -7482,7 +7327,7 @@ _process() {
   fi
   _debug "Running cmd: ${_CMD}"
   case "${_CMD}" in
-  install) install "$_nocron" "$_confighome" "$_noprofile" "$_accountemail" ;;
+  install) install "$_nocron" "$_confighome" "$_noprofile" ;;
   uninstall) uninstall "$_nocron" ;;
   upgrade) upgrade ;;
   issue)
@@ -7492,7 +7337,7 @@ _process() {
     deploy "$_domain" "$_deploy_hook" "$_ecc"
     ;;
   signcsr)
-    signcsr "$_csr" "$_webroot" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_address" "$_challenge_alias" "$_preferred_chain"
+    signcsr "$_csr" "$_webroot" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_address" "$_challenge_alias"
     ;;
   showcsr)
     showcsr "$_csr" "$_domain"
@@ -7595,6 +7440,12 @@ _process() {
 
 }
 
+if [ "$INSTALLONLINE" ]; then
+  INSTALLONLINE=""
+  _installOnline
+  exit
+fi
+
 main() {
   [ -z "$1" ] && showhelp && return
   if _startswith "$1" '-'; then _process "$@"; else "$@"; fi

deploy/cleverreach.sh

@@ -1,92 +0,0 @@
-#!/usr/bin/env sh
-# Here is the script to deploy the cert to your CleverReach Account using the CleverReach REST API.
-# Your OAuth needs the right scope, please contact CleverReach support for that.
-#
-# Written by Jan-Philipp Benecke <github@bnck.me>
-# Public domain, 2020
-#
-# Following environment variables must be set:
-#
-#export DEPLOY_CLEVERREACH_CLIENT_ID=myid
-#export DEPLOY_CLEVERREACH_CLIENT_SECRET=mysecret
-
-cleverreach_deploy() {
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _rest_endpoint="https://rest.cleverreach.com"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  _getdeployconf DEPLOY_CLEVERREACH_CLIENT_ID
-  _getdeployconf DEPLOY_CLEVERREACH_CLIENT_SECRET
-  _getdeployconf DEPLOY_CLEVERREACH_SUBCLIENT_ID
-
-  if [ -z "${DEPLOY_CLEVERREACH_CLIENT_ID}" ]; then
-    _err "CleverReach Client ID is not found, please define DEPLOY_CLEVERREACH_CLIENT_ID."
-    return 1
-  fi
-  if [ -z "${DEPLOY_CLEVERREACH_CLIENT_SECRET}" ]; then
-    _err "CleverReach client secret is not found, please define DEPLOY_CLEVERREACH_CLIENT_SECRET."
-    return 1
-  fi
-
-  _savedeployconf DEPLOY_CLEVERREACH_CLIENT_ID "${DEPLOY_CLEVERREACH_CLIENT_ID}"
-  _savedeployconf DEPLOY_CLEVERREACH_CLIENT_SECRET "${DEPLOY_CLEVERREACH_CLIENT_SECRET}"
-  _savedeployconf DEPLOY_CLEVERREACH_SUBCLIENT_ID "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
-
-  _info "Obtaining a CleverReach access token"
-
-  _data="{\"grant_type\": \"client_credentials\", \"client_id\": \"${DEPLOY_CLEVERREACH_CLIENT_ID}\", \"client_secret\": \"${DEPLOY_CLEVERREACH_CLIENT_SECRET}\"}"
-  _auth_result="$(_post "$_data" "$_rest_endpoint/oauth/token.php" "" "POST" "application/json")"
-
-  _debug _data "$_data"
-  _debug _auth_result "$_auth_result"
-
-  _regex=".*\"access_token\":\"\([-._0-9A-Za-z]*\)\".*$"
-  _debug _regex "$_regex"
-  _access_token=$(echo "$_auth_result" | _json_decode | sed -n "s/$_regex/\1/p")
-
-  _debug _subclient "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
-
-  if [ -n "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}" ]; then
-    _info "Obtaining token for sub-client ${DEPLOY_CLEVERREACH_SUBCLIENT_ID}"
-    export _H1="Authorization: Bearer ${_access_token}"
-    _subclient_token_result="$(_get "$_rest_endpoint/v3/clients/$DEPLOY_CLEVERREACH_SUBCLIENT_ID/token")"
-    _access_token=$(echo "$_subclient_token_result" | sed -n "s/\"//p")
-
-    _debug _subclient_token_result "$_access_token"
-
-    _info "Destroying parent token at CleverReach, as it not needed anymore"
-    _destroy_result="$(_post "" "$_rest_endpoint/v3/oauth/token.json" "" "DELETE" "application/json")"
-    _debug _destroy_result "$_destroy_result"
-  fi
-
-  _info "Uploading certificate and key to CleverReach"
-
-  _certData="{\"cert\":\"$(_json_encode <"$_cfullchain")\", \"key\":\"$(_json_encode <"$_ckey")\"}"
-  export _H1="Authorization: Bearer ${_access_token}"
-  _add_cert_result="$(_post "$_certData" "$_rest_endpoint/v3/ssl" "" "POST" "application/json")"
-
-  if [ -z "${DEPLOY_CLEVERREACH_SUBCLIENT_ID}" ]; then
-    _info "Destroying token at CleverReach, as it not needed anymore"
-    _destroy_result="$(_post "" "$_rest_endpoint/v3/oauth/token.json" "" "DELETE" "application/json")"
-    _debug _destroy_result "$_destroy_result"
-  fi
-
-  if ! echo "$_add_cert_result" | grep '"error":' >/dev/null; then
-    _info "Uploaded certificate successfully"
-    return 0
-  else
-    _debug _add_cert_result "$_add_cert_result"
-    _err "Unable to update certificate"
-    return 1
-  fi
-}

deploy/docker.sh

@@ -275,7 +275,6 @@ _check_curl_version() {
 
   if [ "$_major$_minor" -lt "740" ]; then
     _err "curl v$_cversion doesn't support unit socket"
-    _err "Please upgrade to curl 7.40 or later."
     return 1
   fi
   if [ "$_major$_minor" -lt "750" ]; then

deploy/fritzbox.sh

@@ -28,11 +28,9 @@ fritzbox_deploy() {
   _debug _cfullchain "$_cfullchain"
 
   if ! _exists iconv; then
-    if ! _exists uconv; then
+    if ! _exists perl; then
-      if ! _exists perl; then
+      _err "iconv or perl not found"
-        _err "iconv or uconv or perl not found"
+      return 1
-        return 1
-      fi
     fi
   fi
 
@@ -66,11 +64,9 @@ fritzbox_deploy() {
   _info "Log in to the FRITZ!Box"
   _fritzbox_challenge="$(_get "${_fritzbox_url}/login_sid.lua" | sed -e 's/^.*<Challenge>//' -e 's/<\/Challenge>.*$//')"
   if _exists iconv; then
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | iconv -f ASCII -t UTF16LE | _digest md5 hex)"
+    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | iconv -f ASCII -t UTF16LE | md5sum | awk '{print $1}')"
-  elif _exists uconv; then
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | uconv -f ASCII -t UTF16LE | _digest md5 hex)"
   else
-    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | perl -p -e 'use Encode qw/encode/; print encode("UTF-16LE","$_"); $_="";' | _digest md5 hex)"
+    _fritzbox_hash="$(printf "%s-%s" "${_fritzbox_challenge}" "${_fritzbox_password}" | perl -p -e 'use Encode qw/encode/; print encode("UTF-16LE","$_"); $_="";' | md5sum | awk '{print $1}')"
   fi
   _fritzbox_sid="$(_get "${_fritzbox_url}/login_sid.lua?sid=0000000000000000&username=${_fritzbox_username}&response=${_fritzbox_challenge}-${_fritzbox_hash}" | sed -e 's/^.*<SID>//' -e 's/<\/SID>.*$//')"
 

deploy/mailcow.sh

@@ -27,43 +27,26 @@ mailcow_deploy() {
     return 1
   fi
 
-  #Tests if _ssl_path is the mailcow root directory.
+  _ssl_path="${_mailcow_path}/data/assets/ssl/"
-  if [ -f "${_mailcow_path}/generate_config.sh" ]; then
-    _ssl_path="${_mailcow_path}/data/assets/ssl/"
-  else
-    _ssl_path="${_mailcow_path}"
-  fi
-
   if [ ! -d "$_ssl_path" ]; then
     _err "Cannot find mailcow ssl path: $_ssl_path"
     return 1
   fi
 
-  # ECC or RSA
-  if [ -z "${Le_Keylength}" ]; then
-    Le_Keylength=""
-  fi
-  if _isEccKey "${Le_Keylength}"; then
-    _info "ECC key type detected"
-    _cert_name_prefix="ecdsa-"
-  else
-    _info "RSA key type detected"
-    _cert_name_prefix=""
-  fi
   _info "Copying key and cert"
-  _real_key="$_ssl_path/${_cert_name_prefix}key.pem"
+  _real_key="$_ssl_path/key.pem"
   if ! cat "$_ckey" >"$_real_key"; then
     _err "Error: write key file to: $_real_key"
     return 1
   fi
 
-  _real_fullchain="$_ssl_path/${_cert_name_prefix}cert.pem"
+  _real_fullchain="$_ssl_path/cert.pem"
   if ! cat "$_cfullchain" >"$_real_fullchain"; then
     _err "Error: write cert file to: $_real_fullchain"
     return 1
   fi
 
-  DEFAULT_MAILCOW_RELOAD="docker restart $(docker ps -qaf name=postfix-mailcow); docker restart $(docker ps -qaf name=nginx-mailcow); docker restart $(docker ps -qaf name=dovecot-mailcow)"
+  DEFAULT_MAILCOW_RELOAD="cd ${_mailcow_path} && docker-compose restart postfix-mailcow dovecot-mailcow nginx-mailcow"
   _reload="${DEPLOY_MAILCOW_RELOAD:-$DEFAULT_MAILCOW_RELOAD}"
 
   _info "Run reload: $_reload"

deploy/peplink.sh

@@ -1,123 +0,0 @@
-#!/usr/bin/env sh
-
-# Script to deploy cert to Peplink Routers
-#
-# The following environment variables must be set:
-#
-# PEPLINK_Hostname - Peplink hostname
-# PEPLINK_Username - Peplink username to login
-# PEPLINK_Password - Peplink password to login
-#
-# The following environmental variables may be set if you don't like their
-# default values:
-#
-# PEPLINK_Certtype - Certificate type to target for replacement
-#                    defaults to "webadmin", can be one of:
-#                      * "chub" (ContentHub)
-#                      * "openvpn" (OpenVPN CA)
-#                      * "portal" (Captive Portal SSL)
-#                      * "webadmin" (Web Admin SSL)
-#                      * "webproxy" (Proxy Root CA)
-#                      * "wwan_ca" (Wi-Fi WAN CA)
-#                      * "wwan_client" (Wi-Fi WAN Client)
-# PEPLINK_Scheme   - defaults to "https"
-# PEPLINK_Port     - defaults to "443"
-#
-#returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-_peplink_get_cookie_data() {
-  grep -i "\W$1=" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
-}
-
-#domain keyfile certfile cafile fullchain
-peplink_deploy() {
-
-  _cdomain="$1"
-  _ckey="$2"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _cfullchain "$_cfullchain"
-  _debug _ckey "$_ckey"
-
-  # Get Hostname, Username and Password, but don't save until we successfully authenticate
-  _getdeployconf PEPLINK_Hostname
-  _getdeployconf PEPLINK_Username
-  _getdeployconf PEPLINK_Password
-  if [ -z "${PEPLINK_Hostname:-}" ] || [ -z "${PEPLINK_Username:-}" ] || [ -z "${PEPLINK_Password:-}" ]; then
-    _err "PEPLINK_Hostname & PEPLINK_Username & PEPLINK_Password must be set"
-    return 1
-  fi
-  _debug2 PEPLINK_Hostname "$PEPLINK_Hostname"
-  _debug2 PEPLINK_Username "$PEPLINK_Username"
-  _secure_debug2 PEPLINK_Password "$PEPLINK_Password"
-
-  # Optional certificate type, scheme, and port for Peplink
-  _getdeployconf PEPLINK_Certtype
-  _getdeployconf PEPLINK_Scheme
-  _getdeployconf PEPLINK_Port
-
-  # Don't save the certificate type until we verify it exists and is supported
-  _savedeployconf PEPLINK_Scheme "$PEPLINK_Scheme"
-  _savedeployconf PEPLINK_Port "$PEPLINK_Port"
-
-  # Default vaules for certificate type, scheme, and port
-  [ -n "${PEPLINK_Certtype}" ] || PEPLINK_Certtype="webadmin"
-  [ -n "${PEPLINK_Scheme}" ] || PEPLINK_Scheme="https"
-  [ -n "${PEPLINK_Port}" ] || PEPLINK_Port="443"
-
-  _debug2 PEPLINK_Certtype "$PEPLINK_Certtype"
-  _debug2 PEPLINK_Scheme "$PEPLINK_Scheme"
-  _debug2 PEPLINK_Port "$PEPLINK_Port"
-
-  _base_url="$PEPLINK_Scheme://$PEPLINK_Hostname:$PEPLINK_Port"
-  _debug _base_url "$_base_url"
-
-  # Login, get the auth token from the cookie
-  _info "Logging into $PEPLINK_Hostname:$PEPLINK_Port"
-  encoded_username="$(printf "%s" "$PEPLINK_Username" | _url_encode)"
-  encoded_password="$(printf "%s" "$PEPLINK_Password" | _url_encode)"
-  response=$(_post "func=login&username=$encoded_username&password=$encoded_password" "$_base_url/cgi-bin/MANGA/api.cgi")
-  auth_token=$(_peplink_get_cookie_data "bauth" <"$HTTP_HEADER")
-  _debug3 response "$response"
-  _debug auth_token "$auth_token"
-
-  if [ -z "$auth_token" ]; then
-    _err "Unable to authenticate to $PEPLINK_Hostname:$PEPLINK_Port using $PEPLINK_Scheme."
-    _err "Check your username and password."
-    return 1
-  fi
-
-  _H1="Cookie: $auth_token"
-  export _H1
-  _debug2 H1 "${_H1}"
-
-  # Now that we know the hostnameusername and password are good, save them
-  _savedeployconf PEPLINK_Hostname "$PEPLINK_Hostname"
-  _savedeployconf PEPLINK_Username "$PEPLINK_Username"
-  _savedeployconf PEPLINK_Password "$PEPLINK_Password"
-
-  _info "Generate form POST request"
-
-  encoded_key="$(_url_encode <"$_ckey")"
-  encoded_fullchain="$(_url_encode <"$_cfullchain")"
-  body="cert_type=$PEPLINK_Certtype&cert_uid=&section=CERT_modify&key_pem=$encoded_key&key_pem_passphrase=&key_pem_passphrase_confirm=&cert_pem=$encoded_fullchain"
-  _debug3 body "$body"
-
-  _info "Upload $PEPLINK_Certtype certificate to the Peplink"
-
-  response=$(_post "$body" "$_base_url/cgi-bin/MANGA/admin.cgi")
-  _debug3 response "$response"
-
-  if echo "$response" | grep 'Success' >/dev/null; then
-    # We've verified this certificate type is valid, so save it
-    _savedeployconf PEPLINK_Certtype "$PEPLINK_Certtype"
-    _info "Certificate was updated"
-    return 0
-  else
-    _err "Unable to update certificate, error code $response"
-    return 1
-  fi
-}

deploy/synology_dsm.sh

@@ -21,6 +21,10 @@
 
 ########  Public functions #####################
 
+_syno_get_cookie_data() {
+  grep -i "\W$1=" | grep -i "^Set-Cookie:" | _tail_n 1 | _egrep_o "$1=[^;]*;" | tr -d ';'
+}
+
 #domain keyfile certfile cafile fullchain
 synology_dsm_deploy() {
 
@@ -69,25 +73,13 @@ synology_dsm_deploy() {
   _base_url="$SYNO_Scheme://$SYNO_Hostname:$SYNO_Port"
   _debug _base_url "$_base_url"
 
-  _debug "Getting API version"
-  response=$(_get "$_base_url/webapi/query.cgi?api=SYNO.API.Info&version=1&method=query&query=SYNO.API.Auth")
-  api_version=$(echo "$response" | grep "SYNO.API.Auth" | sed -n 's/.*"maxVersion" *: *\([0-9]*\).*/\1/p')
-  _debug3 response "$response"
-  _debug3 api_version "$api_version"
-
   # Login, get the token from JSON and session id from cookie
   _info "Logging into $SYNO_Hostname:$SYNO_Port"
   encoded_username="$(printf "%s" "$SYNO_Username" | _url_encode)"
   encoded_password="$(printf "%s" "$SYNO_Password" | _url_encode)"
-
+  encoded_did="$(printf "%s" "$SYNO_DID" | _url_encode)"
-  if [ -n "$SYNO_DID" ]; then
+  response=$(_get "$_base_url/webman/login.cgi?username=$encoded_username&passwd=$encoded_password&enable_syno_token=yes&device_id=$encoded_did" 1)
-    _H1="Cookie: did=$SYNO_DID"
+  token=$(echo "$response" | grep -i "X-SYNO-TOKEN:" | sed -n 's/^X-SYNO-TOKEN: \(.*\)$/\1/pI' | tr -d "\r\n")
-    export _H1
-    _debug3 H1 "${_H1}"
-  fi
-
-  response=$(_post "method=login&account=$encoded_username&passwd=$encoded_password&api=SYNO.API.Auth&version=$api_version&enable_syno_token=yes" "$_base_url/webapi/auth.cgi?enable_syno_token=yes")
-  token=$(echo "$response" | grep "synotoken" | sed -n 's/.*"synotoken" *: *"\([^"]*\).*/\1/p')
   _debug3 response "$response"
   _debug token "$token"
 
@@ -96,11 +88,13 @@ synology_dsm_deploy() {
     _err "Check your username and password."
     return 1
   fi
-  sid=$(echo "$response" | grep "sid" | sed -n 's/.*"sid" *: *"\([^"]*\).*/\1/p')
 
-  _H1="X-SYNO-TOKEN: $token"
+  _H1="Cookie: $(echo "$response" | _syno_get_cookie_data "id"); $(echo "$response" | _syno_get_cookie_data "smid")"
+  _H2="X-SYNO-TOKEN: $token"
   export _H1
+  export _H2
   _debug2 H1 "${_H1}"
+  _debug2 H2 "${_H2}"
 
   # Now that we know the username and password are good, save them
   _savedeployconf SYNO_Username "$SYNO_Username"
@@ -108,7 +102,7 @@ synology_dsm_deploy() {
   _savedeployconf SYNO_DID "$SYNO_DID"
 
   _info "Getting certificates in Synology DSM"
-  response=$(_post "api=SYNO.Core.Certificate.CRT&method=list&version=1&_sid=$sid" "$_base_url/webapi/entry.cgi")
+  response=$(_post "api=SYNO.Core.Certificate.CRT&method=list&version=1" "$_base_url/webapi/entry.cgi")
   _debug3 response "$response"
   id=$(echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\"id\":\"\([^\"]*\).*/\1/p")
   _debug2 id "$id"
@@ -121,7 +115,7 @@ synology_dsm_deploy() {
   # we've verified this certificate description is a thing, so save it
   _savedeployconf SYNO_Certificate "$SYNO_Certificate"
 
-  default=""
+  default=false
   if echo "$response" | sed -n "s/.*\"desc\":\"$SYNO_Certificate\",\([^{]*\).*/\1/p" | grep -- 'is_default":true' >/dev/null; then
     default=true
   fi
@@ -141,7 +135,7 @@ synology_dsm_deploy() {
   content="${content%_}" # protect trailing \n
 
   _info "Upload certificate to the Synology DSM"
-  response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token&_sid=$sid" "" "POST" "multipart/form-data; boundary=${delim}")
+  response=$(_post "$content" "$_base_url/webapi/entry.cgi?api=SYNO.Core.Certificate&method=import&version=1&SynoToken=$token" "" "POST" "multipart/form-data; boundary=${delim}")
   _debug3 response "$response"
 
   if ! echo "$response" | grep '"error":' >/dev/null; then

deploy/unifi.sh

@@ -1,43 +1,12 @@
 #!/usr/bin/env sh
 
-# Here is a script to deploy cert on a Unifi Controller or Cloud Key device.
+#Here is a script to deploy cert to unifi server.
-# It supports:
-#   - self-hosted Unifi Controller
-#   - Unifi Cloud Key (Gen1/2/2+)
-#   - Unifi Cloud Key running UnifiOS (v2.0.0+, Gen2/2+ only)
-# Please report bugs to https://github.com/acmesh-official/acme.sh/issues/3359
 
 #returns 0 means success, otherwise error.
 
-# The deploy-hook automatically detects standard Unifi installations
-# for each of the supported environments. Most users should not need
-# to set any of these variables, but if you are running a self-hosted
-# Controller with custom locations, set these as necessary before running
-# the deploy hook. (Defaults shown below.)
-#
-# Settings for Unifi Controller:
-# Location of Java keystore or unifi.keystore.jks file:
 #DEPLOY_UNIFI_KEYSTORE="/usr/lib/unifi/data/keystore"
-# Keystore password (built into Unifi Controller, not a user-set password):
 #DEPLOY_UNIFI_KEYPASS="aircontrolenterprise"
-# Command to restart Unifi Controller:
 #DEPLOY_UNIFI_RELOAD="service unifi restart"
-#
-# Settings for Unifi Cloud Key Gen1 (nginx admin pages):
-# Directory where cloudkey.crt and cloudkey.key live:
-#DEPLOY_UNIFI_CLOUDKEY_CERTDIR="/etc/ssl/private"
-# Command to restart maintenance pages and Controller
-# (same setting as above, default is updated when running on Cloud Key Gen1):
-#DEPLOY_UNIFI_RELOAD="service nginx restart && service unifi restart"
-#
-# Settings for UnifiOS (Cloud Key Gen2):
-# Directory where unifi-core.crt and unifi-core.key live:
-#DEPLOY_UNIFI_CORE_CONFIG="/data/unifi-core/config/"
-# Command to restart unifi-core:
-#DEPLOY_UNIFI_RELOAD="systemctl restart unifi-core"
-#
-# At least one of DEPLOY_UNIFI_KEYSTORE, DEPLOY_UNIFI_CLOUDKEY_CERTDIR,
-# or DEPLOY_UNIFI_CORE_CONFIG must exist to receive the deployed certs.
 
 ########  Public functions #####################
 
@@ -55,160 +24,77 @@ unifi_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _getdeployconf DEPLOY_UNIFI_KEYSTORE
+  if ! _exists keytool; then
-  _getdeployconf DEPLOY_UNIFI_KEYPASS
+    _err "keytool not found"
-  _getdeployconf DEPLOY_UNIFI_CLOUDKEY_CERTDIR
+    return 1
-  _getdeployconf DEPLOY_UNIFI_CORE_CONFIG
+  fi
-  _getdeployconf DEPLOY_UNIFI_RELOAD
 
-  _debug2 DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
+  DEFAULT_UNIFI_KEYSTORE="/usr/lib/unifi/data/keystore"
-  _debug2 DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
+  _unifi_keystore="${DEPLOY_UNIFI_KEYSTORE:-$DEFAULT_UNIFI_KEYSTORE}"
-  _debug2 DEPLOY_UNIFI_CLOUDKEY_CERTDIR "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR"
+  DEFAULT_UNIFI_KEYPASS="aircontrolenterprise"
-  _debug2 DEPLOY_UNIFI_CORE_CONFIG "$DEPLOY_UNIFI_CORE_CONFIG"
+  _unifi_keypass="${DEPLOY_UNIFI_KEYPASS:-$DEFAULT_UNIFI_KEYPASS}"
-  _debug2 DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
+  DEFAULT_UNIFI_RELOAD="service unifi restart"
+  _reload="${DEPLOY_UNIFI_RELOAD:-$DEFAULT_UNIFI_RELOAD}"
 
-  # Space-separated list of environments detected and installed:
+  _debug _unifi_keystore "$_unifi_keystore"
-  _services_updated=""
+  if [ ! -f "$_unifi_keystore" ]; then
-
+    if [ -z "$DEPLOY_UNIFI_KEYSTORE" ]; then
-  # Default reload commands accumulated as we auto-detect environments:
+      _err "unifi keystore is not found, please define DEPLOY_UNIFI_KEYSTORE"
-  _reload_cmd=""
-
-  # Unifi Controller environment (self hosted or any Cloud Key) --
-  # auto-detect by file /usr/lib/unifi/data/keystore:
-  _unifi_keystore="${DEPLOY_UNIFI_KEYSTORE:-/usr/lib/unifi/data/keystore}"
-  if [ -f "$_unifi_keystore" ]; then
-    _info "Installing certificate for Unifi Controller (Java keystore)"
-    _debug _unifi_keystore "$_unifi_keystore"
-    if ! _exists keytool; then
-      _err "keytool not found"
       return 1
-    fi
-    if [ ! -w "$_unifi_keystore" ]; then
-      _err "The file $_unifi_keystore is not writable, please change the permission."
-      return 1
-    fi
-
-    _unifi_keypass="${DEPLOY_UNIFI_KEYPASS:-aircontrolenterprise}"
-
-    _debug "Generate import pkcs12"
-    _import_pkcs12="$(_mktemp)"
-    _toPkcs "$_import_pkcs12" "$_ckey" "$_ccert" "$_cca" "$_unifi_keypass" unifi root
-    # shellcheck disable=SC2181
-    if [ "$?" != "0" ]; then
-      _err "Error generating pkcs12. Please re-run with --debug and report a bug."
-      return 1
-    fi
-
-    _debug "Import into keystore: $_unifi_keystore"
-    if keytool -importkeystore \
-      -deststorepass "$_unifi_keypass" -destkeypass "$_unifi_keypass" -destkeystore "$_unifi_keystore" \
-      -srckeystore "$_import_pkcs12" -srcstoretype PKCS12 -srcstorepass "$_unifi_keypass" \
-      -alias unifi -noprompt; then
-      _debug "Import keystore success!"
-      rm "$_import_pkcs12"
     else
-      _err "Error importing into Unifi Java keystore."
+      _err "It seems that the specified unifi keystore is not valid, please check."
-      _err "Please re-run with --debug and report a bug."
-      rm "$_import_pkcs12"
       return 1
     fi
-
+  fi
-    if systemctl -q is-active unifi; then
+  if [ ! -w "$_unifi_keystore" ]; then
-      _reload_cmd="${_reload_cmd:+$_reload_cmd && }service unifi restart"
+    _err "The file $_unifi_keystore is not writable, please change the permission."
-    fi
-    _services_updated="${_services_updated} unifi"
-    _info "Install Unifi Controller certificate success!"
-  elif [ "$DEPLOY_UNIFI_KEYSTORE" ]; then
-    _err "The specified DEPLOY_UNIFI_KEYSTORE='$DEPLOY_UNIFI_KEYSTORE' is not valid, please check."
     return 1
   fi
 
-  # Cloud Key environment (non-UnifiOS -- nginx serves admin pages) --
+  _info "Generate import pkcs12"
-  # auto-detect by file /etc/ssl/private/cloudkey.key:
+  _import_pkcs12="$(_mktemp)"
-  _cloudkey_certdir="${DEPLOY_UNIFI_CLOUDKEY_CERTDIR:-/etc/ssl/private}"
+  _toPkcs "$_import_pkcs12" "$_ckey" "$_ccert" "$_cca" "$_unifi_keypass" unifi root
-  if [ -f "${_cloudkey_certdir}/cloudkey.key" ]; then
+  if [ "$?" != "0" ]; then
-    _info "Installing certificate for Cloud Key Gen1 (nginx admin pages)"
+    _err "Oops, error creating import pkcs12, please report bug to us."
-    _debug _cloudkey_certdir "$_cloudkey_certdir"
-    if [ ! -w "$_cloudkey_certdir" ]; then
-      _err "The directory $_cloudkey_certdir is not writable; please check permissions."
-      return 1
-    fi
-    # Cloud Key expects to load the keystore from /etc/ssl/private/unifi.keystore.jks.
-    # Normally /usr/lib/unifi/data/keystore is a symlink there (so the keystore was
-    # updated above), but if not, we don't know how to handle this installation:
-    if ! cmp -s "$_unifi_keystore" "${_cloudkey_certdir}/unifi.keystore.jks"; then
-      _err "Unsupported Cloud Key configuration: keystore not found at '${_cloudkey_certdir}/unifi.keystore.jks'"
-      return 1
-    fi
-
-    cat "$_cfullchain" >"${_cloudkey_certdir}/cloudkey.crt"
-    cat "$_ckey" >"${_cloudkey_certdir}/cloudkey.key"
-    (cd "$_cloudkey_certdir" && tar -cf cert.tar cloudkey.crt cloudkey.key unifi.keystore.jks)
-
-    if systemctl -q is-active nginx; then
-      _reload_cmd="${_reload_cmd:+$_reload_cmd && }service nginx restart"
-    fi
-    _info "Install Cloud Key Gen1 certificate success!"
-    _services_updated="${_services_updated} nginx"
-  elif [ "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR" ]; then
-    _err "The specified DEPLOY_UNIFI_CLOUDKEY_CERTDIR='$DEPLOY_UNIFI_CLOUDKEY_CERTDIR' is not valid, please check."
     return 1
   fi
 
-  # UnifiOS environment -- auto-detect by /data/unifi-core/config/unifi-core.key:
+  _info "Modify unifi keystore: $_unifi_keystore"
-  _unifi_core_config="${DEPLOY_UNIFI_CORE_CONFIG:-/data/unifi-core/config}"
+  if keytool -importkeystore \
-  if [ -f "${_unifi_core_config}/unifi-core.key" ]; then
+    -deststorepass "$_unifi_keypass" -destkeypass "$_unifi_keypass" -destkeystore "$_unifi_keystore" \
-    _info "Installing certificate for UnifiOS"
+    -srckeystore "$_import_pkcs12" -srcstoretype PKCS12 -srcstorepass "$_unifi_keypass" \
-    _debug _unifi_core_config "$_unifi_core_config"
+    -alias unifi -noprompt; then
-    if [ ! -w "$_unifi_core_config" ]; then
+    _info "Import keystore success!"
-      _err "The directory $_unifi_core_config is not writable; please check permissions."
+    rm "$_import_pkcs12"
-      return 1
+  else
-    fi
+    _err "Import unifi keystore error, please report bug to us."
-
+    rm "$_import_pkcs12"
-    cat "$_cfullchain" >"${_unifi_core_config}/unifi-core.crt"
-    cat "$_ckey" >"${_unifi_core_config}/unifi-core.key"
-
-    if systemctl -q is-active unifi-core; then
-      _reload_cmd="${_reload_cmd:+$_reload_cmd && }systemctl restart unifi-core"
-    fi
-    _info "Install UnifiOS certificate success!"
-    _services_updated="${_services_updated} unifi-core"
-  elif [ "$DEPLOY_UNIFI_CORE_CONFIG" ]; then
-    _err "The specified DEPLOY_UNIFI_CORE_CONFIG='$DEPLOY_UNIFI_CORE_CONFIG' is not valid, please check."
     return 1
   fi
 
-  if [ -z "$_services_updated" ]; then
+  _info "Run reload: $_reload"
-    # None of the Unifi environments were auto-detected, so no deployment has occurred
+  if eval "$_reload"; then
-    # (and none of DEPLOY_UNIFI_{KEYSTORE,CLOUDKEY_CERTDIR,CORE_CONFIG} were set).
-    _err "Unable to detect Unifi environment in standard location."
-    _err "(This deploy hook must be run on the Unifi device, not a remote machine.)"
-    _err "For non-standard Unifi installations, set DEPLOY_UNIFI_KEYSTORE,"
-    _err "DEPLOY_UNIFI_CLOUDKEY_CERTDIR, and/or DEPLOY_UNIFI_CORE_CONFIG as appropriate."
-    return 1
-  fi
-
-  _reload_cmd="${DEPLOY_UNIFI_RELOAD:-$_reload_cmd}"
-  if [ -z "$_reload_cmd" ]; then
-    _err "Certificates were installed for services:${_services_updated},"
-    _err "but none appear to be active. Please set DEPLOY_UNIFI_RELOAD"
-    _err "to a command that will restart the necessary services."
-    return 1
-  fi
-  _info "Reload services (this may take some time): $_reload_cmd"
-  if eval "$_reload_cmd"; then
     _info "Reload success!"
+    if [ "$DEPLOY_UNIFI_KEYSTORE" ]; then
+      _savedomainconf DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
+    else
+      _cleardomainconf DEPLOY_UNIFI_KEYSTORE
+    fi
+    if [ "$DEPLOY_UNIFI_KEYPASS" ]; then
+      _savedomainconf DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
+    else
+      _cleardomainconf DEPLOY_UNIFI_KEYPASS
+    fi
+    if [ "$DEPLOY_UNIFI_RELOAD" ]; then
+      _savedomainconf DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
+    else
+      _cleardomainconf DEPLOY_UNIFI_RELOAD
+    fi
+    return 0
   else
     _err "Reload error"
     return 1
   fi
-
-  # Successful, so save all (non-default) config:
-  _savedeployconf DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
-  _savedeployconf DEPLOY_UNIFI_KEYPASS "$DEPLOY_UNIFI_KEYPASS"
-  _savedeployconf DEPLOY_UNIFI_CLOUDKEY_CERTDIR "$DEPLOY_UNIFI_CLOUDKEY_CERTDIR"
-  _savedeployconf DEPLOY_UNIFI_CORE_CONFIG "$DEPLOY_UNIFI_CORE_CONFIG"
-  _savedeployconf DEPLOY_UNIFI_RELOAD "$DEPLOY_UNIFI_RELOAD"
-
   return 0
+
 }

deploy/vault.sh

@@ -1,67 +0,0 @@
-#!/usr/bin/env sh
-
-# Here is a script to deploy cert to hashicorp vault using curl
-# (https://www.vaultproject.io/)
-#
-# it requires following environment variables:
-#
-# VAULT_PREFIX - this contains the prefix path in vault
-# VAULT_ADDR - vault requires this to find your vault server
-#
-# additionally, you need to ensure that VAULT_TOKEN is avialable
-# to access the vault server
-
-#returns 0 means success, otherwise error.
-
-########  Public functions #####################
-
-#domain keyfile certfile cafile fullchain
-vault_deploy() {
-
-  _cdomain="$1"
-  _ckey="$2"
-  _ccert="$3"
-  _cca="$4"
-  _cfullchain="$5"
-
-  _debug _cdomain "$_cdomain"
-  _debug _ckey "$_ckey"
-  _debug _ccert "$_ccert"
-  _debug _cca "$_cca"
-  _debug _cfullchain "$_cfullchain"
-
-  # validate required env vars
-  _getdeployconf VAULT_PREFIX
-  if [ -z "$VAULT_PREFIX" ]; then
-    _err "VAULT_PREFIX needs to be defined (contains prefix path in vault)"
-    return 1
-  fi
-  _savedeployconf VAULT_PREFIX "$VAULT_PREFIX"
-
-  _getdeployconf VAULT_ADDR
-  if [ -z "$VAULT_ADDR" ]; then
-    _err "VAULT_ADDR needs to be defined (contains vault connection address)"
-    return 1
-  fi
-  _savedeployconf VAULT_ADDR "$VAULT_ADDR"
-
-  # JSON does not allow multiline strings.
-  # So replacing new-lines with "\n" here
-  _ckey=$(sed -z 's/\n/\\n/g' <"$2")
-  _ccert=$(sed -z 's/\n/\\n/g' <"$3")
-  _cca=$(sed -z 's/\n/\\n/g' <"$4")
-  _cfullchain=$(sed -z 's/\n/\\n/g' <"$5")
-
-  URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain"
-  export _H1="X-Vault-Token: $VAULT_TOKEN"
-
-  if [ -n "$FABIO" ]; then
-    _post "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" "$URL"
-  else
-    _post "{\"value\": \"$_ccert\"}" "$URL/cert.pem"
-    _post "{\"value\": \"$_ckey\"}" "$URL/cert.key"
-    _post "{\"value\": \"$_cca\"}" "$URL/chain.pem"
-    _post "{\"value\": \"$_cfullchain\"}" "$URL/fullchain.pem"
-  fi
-
-}

deploy/vault_cli.sh

@@ -50,12 +50,12 @@ vault_cli_deploy() {
   fi
 
   if [ -n "$FABIO" ]; then
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1
   else
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1
-    $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1
+    $VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1
   fi
 
 }

dnsapi/dns_1984hosting.sh

@@ -40,35 +40,8 @@ dns_1984hosting_add() {
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
-  _debug "Add TXT record $fulldomain with value '$txtvalue'"
+  _1984hosting_add_txt_record "$_domain" "$_sub_domain" "$txtvalue"
-  value="$(printf '%s' "$txtvalue" | _url_encode)"
+  return $?
-  url="https://management.1984hosting.com/domains/entry/"
-
-  postdata="entry=new"
-  postdata="$postdata&type=TXT"
-  postdata="$postdata&ttl=3600"
-  postdata="$postdata&zone=$_domain"
-  postdata="$postdata&host=$_sub_domain"
-  postdata="$postdata&rdata=%22$value%22"
-  _debug2 postdata "$postdata"
-
-  _authpost "$postdata" "$url"
-  response="$(echo "$_response" | _normalizeJson)"
-  _debug2 response "$response"
-
-  if _contains "$response" '"haserrors": true'; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain bad RC from _post"
-    return 1
-  elif _contains "$response" "<html>"; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain. Check $HTTP_HEADER file"
-    return 1
-  elif _contains "$response" '"auth": false'; then
-    _err "1984Hosting failed to add TXT record for $_sub_domain. Invalid or expired cookie"
-    return 1
-  fi
-
-  _info "Added acme challenge TXT record for $fulldomain at 1984Hosting"
-  return 0
 }
 
 #Usage: fulldomain txtvalue
@@ -94,10 +67,57 @@ dns_1984hosting_rm() {
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
+  _1984hosting_delete_txt_record "$_domain" "$_sub_domain"
+  return $?
+}
+
+####################  Private functions below ##################################
+
+# usage _1984hosting_add_txt_record domain subdomain value
+# returns 0 success
+_1984hosting_add_txt_record() {
+  _debug "Add TXT record $1 with value '$3'"
+  domain="$1"
+  subdomain="$2"
+  value="$(printf '%s' "$3" | _url_encode)"
+  url="https://management.1984hosting.com/domains/entry/"
+
+  postdata="entry=new"
+  postdata="$postdata&type=TXT"
+  postdata="$postdata&ttl=3600"
+  postdata="$postdata&zone=$domain"
+  postdata="$postdata&host=$subdomain"
+  postdata="$postdata&rdata=%22$value%22"
+  _debug2 postdata "$postdata"
+
+  _authpost "$postdata" "$url"
+  response="$(echo "$_response" | _normalizeJson)"
+  _debug2 response "$response"
+
+  if _contains "$response" '"haserrors": true'; then
+    _err "1984Hosting failed to add TXT record for $subdomain bad RC from _post"
+    return 1
+  elif _contains "$response" "<html>"; then
+    _err "1984Hosting failed to add TXT record for $subdomain. Check $HTTP_HEADER file"
+    return 1
+  elif _contains "$response" '"auth": false'; then
+    _err "1984Hosting failed to add TXT record for $subdomain. Invalid or expired cookie"
+    return 1
+  fi
+
+  _info "Added acme challenge TXT record for $fulldomain at 1984Hosting"
+  return 0
+}
+
+# usage _1984hosting_delete_txt_record entry_id
+# returns 0 success
+_1984hosting_delete_txt_record() {
   _debug "Delete $fulldomain TXT record"
+  domain="$1"
+  subdomain="$2"
   url="https://management.1984hosting.com/domains"
 
-  _htmlget "$url" "$_domain"
+  _htmlget "$url" "$domain"
   _debug2 _response "$_response"
   zone_id="$(echo "$_response" | _egrep_o 'zone\/[0-9]+')"
   _debug2 zone_id "$zone_id"
@@ -106,7 +126,7 @@ dns_1984hosting_rm() {
     return 1
   fi
 
-  _htmlget "$url/$zone_id" "$_sub_domain"
+  _htmlget "$url/$zone_id" "$subdomain"
   _debug2 _response "$_response"
   entry_id="$(echo "$_response" | _egrep_o 'entry_[0-9]+' | sed 's/entry_//')"
   _debug2 entry_id "$entry_id"
@@ -128,8 +148,6 @@ dns_1984hosting_rm() {
   return 0
 }
 
-####################  Private functions below ##################################
-
 # usage: _1984hosting_login username password
 # returns 0 success
 _1984hosting_login() {

dnsapi/dns_anx.sh

@@ -1,150 +0,0 @@
-#!/usr/bin/env sh
-
-# Anexia CloudDNS acme.sh hook
-# Author: MA
-
-#ANX_Token="xxxx"
-
-ANX_API='https://engine.anexia-it.com/api/clouddns/v1'
-
-########  Public functions #####################
-
-dns_anx_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Using ANX CDNS API"
-
-  ANX_Token="${ANX_Token:-$(_readaccountconf_mutable ANX_Token)}"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  if [ "$ANX_Token" ]; then
-    _saveaccountconf_mutable ANX_Token "$ANX_Token"
-  else
-    _err "You didn't specify a ANEXIA Engine API token."
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  # Always add records, wildcard need two records with the same name
-  _anx_rest POST "zone.json/${_domain}/records" "{\"name\":\"$_sub_domain\",\"type\":\"TXT\",\"rdata\":\"$txtvalue\"}"
-  if _contains "$response" "$txtvalue"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-dns_anx_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Using ANX CDNS API"
-
-  ANX_Token="${ANX_Token:-$(_readaccountconf_mutable ANX_Token)}"
-
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _get_record_id
-
-  if _is_uuid "$_record_id"; then
-    if ! _anx_rest DELETE "zone.json/${_domain}/records/$_record_id"; then
-      _err "Delete record"
-      return 1
-    fi
-  else
-    _info "No record found."
-  fi
-  echo "$response" | tr -d " " | grep \"status\":\"OK\" >/dev/null
-}
-
-####################  Private functions below ##################################
-
-_is_uuid() {
-  pattern='^\{?[A-Z0-9a-z]{8}-[A-Z0-9a-z]{4}-[A-Z0-9a-z]{4}-[A-Z0-9a-z]{4}-[A-Z0-9a-z]{12}\}?$'
-  if echo "$1" | _egrep_o "$pattern" >/dev/null; then
-    return 0
-  fi
-  return 1
-}
-
-_get_record_id() {
-  _debug subdomain "$_sub_domain"
-  _debug domain "$_domain"
-
-  if _anx_rest GET "zone.json/${_domain}/records?name=$_sub_domain&type=TXT"; then
-    _debug response "$response"
-    if _contains "$response" "\"name\":\"$_sub_domain\"" >/dev/null; then
-      _record_id=$(printf "%s\n" "$response" | _egrep_o "\[.\"identifier\":\"[^\"]*\"" | head -n 1 | cut -d : -f 2 | tr -d \")
-    else
-      _record_id=''
-    fi
-  else
-    _err "Search existing record"
-  fi
-}
-
-_anx_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  export _H1="Content-Type: application/json"
-  export _H2="Authorization: Token $ANX_Token"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "${ANX_API}/$ep" "" "$m")"
-  else
-    response="$(_get "${ANX_API}/$ep")"
-  fi
-
-  # shellcheck disable=SC2181
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug response "$response"
-  return 0
-}
-
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  _anx_rest GET "zone.json"
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if _contains "$response" "\"name\":\"$h\""; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      return 0
-    fi
-
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}

dnsapi/dns_arvan.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env sh
 
-#Arvan_Token="Apikey xxxx"
+#Arvan_Token="xxxx"
 
 ARVAN_API_URL="https://napi.arvancloud.com/cdn/4.0/domains"
-#Author: Vahid Fardi
+
+#Author: Ehsan Aliakbar
 #Report Bugs here: https://github.com/Neilpang/acme.sh
 #
 ########  Public functions #####################
@@ -37,7 +38,6 @@ dns_arvan_add() {
   _info "Adding record"
   if _arvan_rest POST "$_domain/dns-records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":{\"text\":\"$txtvalue\"},\"ttl\":120}"; then
     if _contains "$response" "$txtvalue"; then
-      _info "response id is $response"
       _info "Added, OK"
       return 0
     elif _contains "$response" "Record Data is Duplicated"; then
@@ -49,7 +49,7 @@ dns_arvan_add() {
     fi
   fi
   _err "Add txt record error."
-  return 0
+  return 1
 }
 
 #Usage: fulldomain txtvalue
@@ -73,21 +73,33 @@ dns_arvan_rm() {
   _debug _domain "$_domain"
 
   _debug "Getting txt records"
-  _arvan_rest GET "${_domain}/dns-records"
+  shorted_txtvalue=$(printf "%s" "$txtvalue" | cut -d "-" -d "_" -f1)
+  _arvan_rest GET "${_domain}/dns-records?search=$shorted_txtvalue"
+
   if ! printf "%s" "$response" | grep \"current_page\":1 >/dev/null; then
     _err "Error on Arvan Api"
     _err "Please create a github issue with debbug log"
     return 1
   fi
 
-  _record_id=$(echo "$response" | _egrep_o ".\"id\":\"[^\"]*\",\"type\":\"txt\",\"name\":\"_acme-challenge\",\"value\":{\"text\":\"$txtvalue\"}" | cut -d : -f 2 | cut -d , -f 1 | tr -d \")
+  count=$(printf "%s\n" "$response" | _egrep_o "\"total\":[^,]*" | cut -d : -f 2)
-  if ! _arvan_rest "DELETE" "${_domain}/dns-records/${_record_id}"; then
+  _debug count "$count"
-    _err "Error on Arvan Api"
+  if [ "$count" = "0" ]; then
-    return 1
+    _info "Don't need to remove."
+  else
+    record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | head -n 1)
+    _debug "record_id" "$record_id"
+    if [ -z "$record_id" ]; then
+      _err "Can not get record id to remove."
+      return 1
+    fi
+    if ! _arvan_rest "DELETE" "${_domain}/dns-records/$record_id"; then
+      _err "Delete record error."
+      return 1
+    fi
+    _debug "$response"
+    _contains "$response" 'dns record deleted'
   fi
-  _debug "$response"
-  _contains "$response" 'dns record deleted'
-  return 0
 }
 
 ####################  Private functions below ##################################
@@ -99,7 +111,7 @@ dns_arvan_rm() {
 # _domain_id=sdjkglgdfewsdfg
 _get_root() {
   domain=$1
-  i=2
+  i=1
   p=1
   while true; do
     h=$(printf "%s" "$domain" | cut -d . -f $i-100)
@@ -109,11 +121,12 @@ _get_root() {
       return 1
     fi
 
-    if ! _arvan_rest GET "$h"; then
+    if ! _arvan_rest GET "?search=$h"; then
       return 1
     fi
-    if _contains "$response" "\"domain\":\"$h\""; then
+
-      _domain_id=$(echo "$response" | cut -d : -f 3 | cut -d , -f 1 | tr -d \")
+    if _contains "$response" "\"domain\":\"$h\"" || _contains "$response" '"total":1'; then
+      _domain_id=$(echo "$response" | _egrep_o "\[.\"id\":\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d \")
       if [ "$_domain_id" ]; then
         _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
         _domain=$h
@@ -133,6 +146,7 @@ _arvan_rest() {
   data="$3"
 
   token_trimmed=$(echo "$Arvan_Token" | tr -d '"')
+
   export _H1="Authorization: $token_trimmed"
 
   if [ "$mtd" = "DELETE" ]; then
@@ -146,5 +160,4 @@ _arvan_rest() {
   else
     response="$(_get "$ARVAN_API_URL/$ep$data")"
   fi
-  return 0
 }

dnsapi/dns_aurora.sh

@@ -1,171 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#AURORA_Key="sdfsdfsdfljlbjkljlkjsdfoiwje"
-#
-#AURORA_Secret="sdfsdfsdfljlbjkljlkjsdfoiwje"
-
-AURORA_Api="https://api.auroradns.eu"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_aurora_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  AURORA_Key="${AURORA_Key:-$(_readaccountconf_mutable AURORA_Key)}"
-  AURORA_Secret="${AURORA_Secret:-$(_readaccountconf_mutable AURORA_Secret)}"
-
-  if [ -z "$AURORA_Key" ] || [ -z "$AURORA_Secret" ]; then
-    AURORA_Key=""
-    AURORA_Secret=""
-    _err "You didn't specify an Aurora api key and secret yet."
-    _err "You can get yours from here https://cp.pcextreme.nl/auroradns/users."
-    return 1
-  fi
-
-  #save the api key and secret to the account conf file.
-  _saveaccountconf_mutable AURORA_Key "$AURORA_Key"
-  _saveaccountconf_mutable AURORA_Secret "$AURORA_Secret"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _domain_id "$_domain_id"
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _info "Adding record"
-  if _aurora_rest POST "zones/$_domain_id/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":300}"; then
-    if _contains "$response" "$txtvalue"; then
-      _info "Added, OK"
-      return 0
-    elif _contains "$response" "RecordExistsError"; then
-      _info "Already exists, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-#fulldomain txtvalue
-dns_aurora_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  AURORA_Key="${AURORA_Key:-$(_readaccountconf_mutable AURORA_Key)}"
-  AURORA_Secret="${AURORA_Secret:-$(_readaccountconf_mutable AURORA_Secret)}"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _domain_id "$_domain_id"
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting records"
-  _aurora_rest GET "zones/${_domain_id}/records"
-
-  if ! _contains "$response" "$txtvalue"; then
-    _info "Don't need to remove."
-  else
-    records=$(echo "$response" | _normalizeJson | tr -d "[]" | sed "s/},{/}|{/g" | tr "|" "\n")
-    if [ "$(echo "$records" | wc -l)" -le 2 ]; then
-      _err "Can not parse records."
-      return 1
-    fi
-    record_id=$(echo "$records" | grep "\"type\": *\"TXT\"" | grep "\"name\": *\"$_sub_domain\"" | grep "\"content\": *\"$txtvalue\"" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | _head_n 1 | tr -d " ")
-    _debug "record_id" "$record_id"
-    if [ -z "$record_id" ]; then
-      _err "Can not get record id to remove."
-      return 1
-    fi
-    if ! _aurora_rest DELETE "zones/$_domain_id/records/$record_id"; then
-      _err "Delete record error."
-      return 1
-    fi
-  fi
-  return 0
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _aurora_rest GET "zones/$h"; then
-      return 1
-    fi
-
-    if _contains "$response" "\"name\": \"$h\""; then
-      _domain_id=$(echo "$response" | _normalizeJson | tr -d "{}" | tr "," "\n" | grep "\"id\": *\"" | cut -d : -f 2 | tr -d \" | _head_n 1 | tr -d " ")
-      _debug _domain_id "$_domain_id"
-      if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-        _domain=$h
-        return 0
-      fi
-      return 1
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_aurora_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  key_trimmed=$(echo "$AURORA_Key" | tr -d '"')
-  secret_trimmed=$(echo "$AURORA_Secret" | tr -d '"')
-
-  timestamp=$(date -u +"%Y%m%dT%H%M%SZ")
-  signature=$(printf "%s/%s%s" "$m" "$ep" "$timestamp" | _hmac sha256 "$(printf "%s" "$secret_trimmed" | _hex_dump | tr -d " ")" | _base64)
-  authorization=$(printf "AuroraDNSv1 %s" "$(printf "%s:%s" "$key_trimmed" "$signature" | _base64)")
-
-  export _H1="Content-Type: application/json; charset=UTF-8"
-  export _H2="X-AuroraDNS-Date: $timestamp"
-  export _H3="Authorization: $authorization"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$AURORA_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$AURORA_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_constellix.sh

@@ -30,41 +30,16 @@ dns_constellix_add() {
     return 1
   fi
 
-  # The TXT record might already exist when working with wildcard certificates. In that case, update the record by adding the new value.
+  _info "Adding TXT record"
-  _debug "Search TXT record"
+  if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"add\":true,\"set\":{\"name\":\"${_sub_domain}\",\"ttl\":120,\"roundRobin\":[{\"value\":\"${txtvalue}\"}]}}]"; then
-  if _constellix_rest GET "domains/${_domain_id}/records/TXT/search?exact=${_sub_domain}"; then
+    if printf -- "%s" "$response" | grep "{\"success\":\"1 record(s) added, 0 record(s) updated, 0 record(s) deleted\"}" >/dev/null; then
-    if printf -- "%s" "$response" | grep "{\"errors\":\[\"Requested record was not found\"\]}" >/dev/null; then
+      _info "Added"
-      _info "Adding TXT record"
+      return 0
-      if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"add\":true,\"set\":{\"name\":\"${_sub_domain}\",\"ttl\":60,\"roundRobin\":[{\"value\":\"${txtvalue}\"}]}}]"; then
-        if printf -- "%s" "$response" | grep "{\"success\":\"1 record(s) added, 0 record(s) updated, 0 record(s) deleted\"}" >/dev/null; then
-          _info "Added"
-          return 0
-        else
-          _err "Error adding TXT record"
-        fi
-      fi
     else
-      _record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]*" | cut -d ':' -f 2)
+      _err "Error adding TXT record"
-      if _constellix_rest GET "domains/${_domain_id}/records/TXT/${_record_id}"; then
+      return 1
-        _new_rr_values=$(printf "%s\n" "$response" | _egrep_o '"roundRobin":\[[^]]*\]' | sed "s/\]$/,{\"value\":\"${txtvalue}\"}]/")
-        _debug _new_rr_values "$_new_rr_values"
-        _info "Updating TXT record"
-        if _constellix_rest PUT "domains/${_domain_id}/records/TXT/${_record_id}" "{\"name\":\"${_sub_domain}\",\"ttl\":60,${_new_rr_values}}"; then
-          if printf -- "%s" "$response" | grep "{\"success\":\"Record.*updated successfully\"}" >/dev/null; then
-            _info "Updated"
-            return 0
-          elif printf -- "%s" "$response" | grep "{\"errors\":\[\"Contents are identical\"\]}" >/dev/null; then
-            _info "Already exists, no need to update"
-            return 0
-          else
-            _err "Error updating TXT record"
-          fi
-        fi
-      fi
     fi
   fi
-
-  return 1
 }
 
 # Usage: fulldomain txtvalue
@@ -86,26 +61,16 @@ dns_constellix_rm() {
     return 1
   fi
 
-  # The TXT record might have been removed already when working with some wildcard certificates.
+  _info "Removing TXT record"
-  _debug "Search TXT record"
+  if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"delete\":true,\"filter\":{\"field\":\"name\",\"op\":\"eq\",\"value\":\"${_sub_domain}\"}}]"; then
-  if _constellix_rest GET "domains/${_domain_id}/records/TXT/search?exact=${_sub_domain}"; then
+    if printf -- "%s" "$response" | grep "{\"success\":\"0 record(s) added, 0 record(s) updated, 1 record(s) deleted\"}" >/dev/null; then
-    if printf -- "%s" "$response" | grep "{\"errors\":\[\"Requested record was not found\"\]}" >/dev/null; then
       _info "Removed"
       return 0
     else
-      _info "Removing TXT record"
+      _err "Error removing TXT record"
-      if _constellix_rest POST "domains/${_domain_id}/records" "[{\"type\":\"txt\",\"delete\":true,\"filter\":{\"field\":\"name\",\"op\":\"eq\",\"value\":\"${_sub_domain}\"}}]"; then
+      return 1
-        if printf -- "%s" "$response" | grep "{\"success\":\"0 record(s) added, 0 record(s) updated, 1 record(s) deleted\"}" >/dev/null; then
-          _info "Removed"
-          return 0
-        else
-          _err "Error removing TXT record"
-        fi
-      fi
     fi
   fi
-
-  return 1
 }
 
 ####################  Private functions below ##################################
@@ -126,7 +91,7 @@ _get_root() {
     fi
 
     if _contains "$response" "\"name\":\"$h\""; then
-      _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]*" | cut -d ':' -f 2)
+      _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":[0-9]+" | cut -d ':' -f 2)
       if [ "$_domain_id" ]; then
         _sub_domain=$(printf "%s" "$domain" | cut -d '.' -f 1-$p)
         _domain="$h"

dnsapi/dns_desec.sh

@@ -61,7 +61,7 @@ dns_desec_add() {
   fi
   _debug txtvalues "$txtvalues"
   _info "Adding record"
-  body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]"
+  body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":60}]"
 
   if _desec_rest PUT "$REST_API/$DEDYN_NAME/rrsets/" "$body"; then
     if _contains "$response" "$txtvalue"; then
@@ -130,7 +130,7 @@ dns_desec_rm() {
   _debug txtvalues "$txtvalues"
 
   _info "Deleting record"
-  body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]"
+  body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":60}]"
   _desec_rest PUT "$REST_API/$DEDYN_NAME/rrsets/" "$body"
   if [ "$_code" = "200" ]; then
     _info "Deleted, OK"

dnsapi/dns_dp.sh

@@ -89,7 +89,7 @@ add_record() {
 
   _info "Adding record"
 
-  if ! _rest POST "Record.Create" "login_token=$DP_Id,$DP_Key&format=json&lang=en&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=%E9%BB%98%E8%AE%A4"; then
+  if ! _rest POST "Record.Create" "login_token=$DP_Id,$DP_Key&format=json&lang=en&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=默认"; then
     return 1
   fi
 

dnsapi/dns_dpi.sh

@@ -53,7 +53,7 @@ dns_dpi_rm() {
     return 1
   fi
 
-  if ! _rest POST "Record.List" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain"; then
+  if ! _rest POST "Record.List" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain"; then
     _err "Record.Lis error."
     return 1
   fi
@@ -63,19 +63,19 @@ dns_dpi_rm() {
     return 0
   fi
 
-  record_id=$(echo "$response" | tr "{" "\n" | grep -- "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
+  record_id=$(echo "$response" | _egrep_o '{[^{]*"value":"'"$txtvalue"'"' | cut -d , -f 1 | cut -d : -f 2 | tr -d \")
   _debug record_id "$record_id"
   if [ -z "$record_id" ]; then
     _err "Can not get record id."
     return 1
   fi
 
-  if ! _rest POST "Record.Remove" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&record_id=$record_id"; then
+  if ! _rest POST "Record.Remove" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&record_id=$record_id"; then
     _err "Record.Remove error."
     return 1
   fi
 
-  _contains "$response" "Operation successful"
+  _contains "$response" "Action completed successful"
 
 }
 
@@ -89,11 +89,11 @@ add_record() {
 
   _info "Adding record"
 
-  if ! _rest POST "Record.Create" "login_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=default"; then
+  if ! _rest POST "Record.Create" "user_token=$DPI_Id,$DPI_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=default"; then
     return 1
   fi
 
-  _contains "$response" "Operation successful" || _contains "$response" "Domain record already exists"
+  _contains "$response" "Action completed successful" || _contains "$response" "Domain record already exists"
 }
 
 ####################  Private functions below ##################################
@@ -113,11 +113,11 @@ _get_root() {
       return 1
     fi
 
-    if ! _rest POST "Domain.Info" "login_token=$DPI_Id,$DPI_Key&format=json&domain=$h"; then
+    if ! _rest POST "Domain.Info" "user_token=$DPI_Id,$DPI_Key&format=json&domain=$h"; then
       return 1
     fi
 
-    if _contains "$response" "Operation successful"; then
+    if _contains "$response" "Action completed successful"; then
       _domain_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")
       _debug _domain_id "$_domain_id"
       if [ "$_domain_id" ]; then

dnsapi/dns_duckdns.sh

@@ -12,7 +12,7 @@
 
 DuckDNS_API="https://www.duckdns.org/update"
 
-########  Public functions ######################
+########  Public functions #####################
 
 #Usage: dns_duckdns_add _acme-challenge.domain.duckdns.org "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_duckdns_add() {
@@ -96,7 +96,7 @@ dns_duckdns_rm() {
 _duckdns_get_domain() {
 
   # We'll extract the domain/username from full domain
-  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?([a-z0-9-]+\.)+duckdns\.org' | sed -n 's/^\([^.]\{1,\}\.\)*\([a-z0-9-]\{1,\}\)\.duckdns\.org$/\2/p;')"
+  _duckdns_domain="$(printf "%s" "$fulldomain" | _lower_case | _egrep_o '^(_acme-challenge\.)?[a-z0-9-]*\.duckdns\.org' | sed 's/^\(_acme-challenge\.\)\?\([a-z0-9-]*\)\.duckdns\.org/\2/')"
 
   if [ -z "$_duckdns_domain" ]; then
     _err "Error extracting the domain."
@@ -112,21 +112,16 @@ _duckdns_rest() {
   param="$2"
   _debug param "$param"
   url="$DuckDNS_API?$param"
-  if [ -n "$DEBUG" ] && [ "$DEBUG" -gt 0 ]; then
-    url="$url&verbose=true"
-  fi
   _debug url "$url"
 
   # DuckDNS uses GET to update domain info
   if [ "$method" = "GET" ]; then
     response="$(_get "$url")"
-    _debug2 response "$response"
-    if [ -n "$DEBUG" ] && [ "$DEBUG" -gt 0 ] && _contains "$response" "UPDATED" && _contains "$response" "OK"; then
-      response="OK"
-    fi
   else
     _err "Unsupported method"
     return 1
   fi
+
+  _debug2 response "$response"
   return 0
 }

dnsapi/dns_dynv6.sh

@@ -1,41 +1,35 @@
 #!/usr/bin/env sh
 #Author StefanAbl
 #Usage specify a private keyfile to use with dynv6 'export KEY="path/to/keyfile"'
-#or use the HTTP REST API by by specifying a token 'export DYNV6_TOKEN="value"
 #if no keyfile is specified, you will be asked if you want to create one in /home/$USER/.ssh/dynv6 and /home/$USER/.ssh/dynv6.pub
-
-dynv6_api="https://dynv6.com/api/v2"
 ########  Public functions #####################
 # Please Read this guide first: https://github.com/Neilpang/acme.sh/wiki/DNS-API-Dev-Guide
-#Usage: dns_dynv6_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+#Usage: dns_myapi_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_dynv6_add() {
   fulldomain=$1
   txtvalue=$2
   _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
+  _get_keyfile
-  if [ "$dynv6_token" ]; then
+  _info "using keyfile $dynv6_keyfile"
-    _dns_dynv6_add_http
+  _get_domain "$fulldomain"
-    return $?
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+  if ! _contains "$_your_hosts" "$_host"; then
+    _debug "The host is $_host and the record $_record"
+    _debug "Dynv6 returned $_your_hosts"
+    _err "The host $_host does not exist on your dynv6 account"
+    return 1
+  fi
+  _debug "found host on your account"
+  returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
+  _debug "Dynv6 returend this after record was added: $returnval"
+  if _contains "$returnval" "created"; then
+    return 0
+  elif _contains "$returnval" "updated"; then
+    return 0
   else
-    _info "using key file $dynv6_keyfile"
+    _err "Something went wrong! it does not seem like the record was added succesfully"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
-      _err "Host not found on your account"
-      return 1
-    fi
-    _debug "found host on your account"
-    returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
-    _debug "Dynv6 returned this after record was added: $returnval"
-    if _contains "$returnval" "created"; then
-      return 0
-    elif _contains "$returnval" "updated"; then
-      return 0
-    else
-      _err "Something went wrong! it does not seem like the record was added successfully"
-      return 1
-    fi
     return 1
   fi
   return 1
@@ -45,29 +39,28 @@ dns_dynv6_add() {
 dns_dynv6_rm() {
   fulldomain=$1
   txtvalue=$2
-  _info "Using dynv6 API"
+  _info "Using dynv6 api"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
-  _get_authentication
+  _get_keyfile
-  if [ "$dynv6_token" ]; then
+  _info "using keyfile $dynv6_keyfile"
-    _dns_dynv6_rm_http
+  _get_domain "$fulldomain"
-    return $?
+  _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-  else
+  if ! _contains "$_your_hosts" "$_host"; then
-    _info "using key file $dynv6_keyfile"
+    _debug "The host is $_host and the record $_record"
-    _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
+    _debug "Dynv6 returned $_your_hosts"
-    if ! _get_domain "$fulldomain" "$_your_hosts"; then
+    _err "The host $_host does not exist on your dynv6 account"
-      _err "Host not found on your account"
+    return 1
-      return 1
-    fi
-    _debug "found host on your account"
-    _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
-    return 0
   fi
+  _debug "found host on your account"
+  _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
+  return 0
+
 }
 #################### Private functions below ##################################
 #Usage: No Input required
 #returns
-#dynv6_keyfile the path to the new key file that has been generated
+#dynv6_keyfile the path to the new keyfile that has been generated
 _generate_new_key() {
   dynv6_keyfile="$(eval echo ~"$USER")/.ssh/dynv6"
   _info "Path to key file used: $dynv6_keyfile"
@@ -79,207 +72,50 @@ _generate_new_key() {
     return 1
   fi
 }
-
+#Usage: _acme-challenge.www.example.dynv6.net
-#Usage: _acme-challenge.www.example.dynv6.net "$_your_hosts"
-#where _your_hosts is the output of ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts
 #returns
 #_host= example.dynv6.net
 #_record=_acme-challenge.www
 #aborts if not a valid domain
 _get_domain() {
-  #_your_hosts="$(ssh -i ~/.ssh/dynv6.pub api@dynv6.com hosts)"
   _full_domain="$1"
-  _your_hosts="$2"
+  _debug "getting domain for $_full_domain"
-
+  if ! _contains "$_full_domain" 'dynv6.net' && ! _contains "$_full_domain" 'dns.army' && ! _contains "$_full_domain" 'dns.navy' && ! _contains "$_full_domain" 'v6.rocks'; then
-  _your_hosts="$(echo "$_your_hosts" | awk '/\./ {print $1}')"
+    _err "The hosts does not seem to be a dynv6 host"
-  for l in $_your_hosts; do
+    return 1
-    #echo "host: $l"
+  fi
-    if test "${_full_domain#*$l}" != "$_full_domain"; then
+  _record="${_full_domain%.*}"
-      _record="${_full_domain%.$l}"
+  _record="${_record%.*}"
-      _host=$l
+  _record="${_record%.*}"
-      _debug "The host is $_host and the record $_record"
+  _debug "The record we are ging to use is $_record"
-      return 0
+  _host="$_full_domain"
-    fi
+  while [ "$(echo "$_host" | grep -o '\.' | wc -l)" != "2" ]; do
+    _host="${_host#*.}"
   done
-  _err "Either their is no such host on your dnyv6 account or it cannot be accessed with this key"
+  _debug "And the host is $_host"
-  return 1
+  return 0
+
 }
 
 # Usage: No input required
 #returns
 #dynv6_keyfile path to the key that will be used
-_get_authentication() {
+_get_keyfile() {
-  dynv6_token="${DYNV6_TOKEN:-$(_readaccountconf_mutable dynv6_token)}"
+  _debug "get keyfile method called"
-  if [ "$dynv6_token" ]; then
+  dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
-    _debug "Found HTTP Token. Going to use the HTTP API and not the SSH API"
+  _debug Your key is "$dynv6_keyfile"
-    if [ "$DYNV6_TOKEN" ]; then
+  if [ -z "$dynv6_keyfile" ]; then
-      _saveaccountconf_mutable dynv6_token "$dynv6_token"
+    if [ -z "$KEY" ]; then
-    fi
+      _err "You did not specify a key to use with dynv6"
-  else
+      _info "Creating new dynv6 api key to add to dynv6.com"
-    _debug "no HTTP token found. Looking for an SSH key"
+      _generate_new_key
-    dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}"
+      _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
-    _debug "Your key is $dynv6_keyfile"
+      _info "Hit Enter to contiue"
-    if [ -z "$dynv6_keyfile" ]; then
+      read -r _
-      if [ -z "$KEY" ]; then
+      #save the credentials to the account conf file.
-        _err "You did not specify a key to use with dynv6"
+    else
-        _info "Creating new dynv6 API key to add to dynv6.com"
+      dynv6_keyfile="$KEY"
-        _generate_new_key
-        _info "Please add this key to dynv6.com $(cat "$dynv6_keyfile.pub")"
-        _info "Hit Enter to continue"
-        read -r _
-        #save the credentials to the account conf file.
-      else
-        dynv6_keyfile="$KEY"
-      fi
-      _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
     fi
+    _saveaccountconf_mutable dynv6_keyfile "$dynv6_keyfile"
   fi
 }
-
-_dns_dynv6_add_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
-  _set_record TXT "$record" "$txtvalue"
-  if _contains "$response" "$txtvalue"; then
-    _info "Successfully added record"
-    return 0
-  else
-    _err "Something went wrong while adding the record"
-    return 1
-  fi
-}
-
-_dns_dynv6_rm_http() {
-  _debug "Got HTTP token form _get_authentication method. Going to use the HTTP API"
-  if ! _get_zone_id "$fulldomain"; then
-    _err "Could not find a matching zone for $fulldomain. Maybe your HTTP Token is not authorized to access the zone"
-    return 1
-  fi
-  _get_zone_name "$_zone_id"
-  record="${fulldomain%%.$_zone_name}"
-  _get_record_id "$_zone_id" "$record" "$txtvalue"
-  _del_record "$_zone_id" "$_record_id"
-  if [ -z "$response" ]; then
-    _info "Successfully deleted record"
-    return 0
-  else
-    _err "Something went wrong while deleting the record"
-    return 1
-  fi
-}
-
-#get the zoneid for a specifc record or zone
-#usage: _get_zone_id §record
-#where $record is the record to get the id for
-#returns _zone_id the id of the zone
-_get_zone_id() {
-  record="$1"
-  _debug "getting zone id for $record"
-  _dynv6_rest GET zones
-
-  zones="$(echo "$response" | tr '}' '\n' | tr ',' '\n' | grep name | sed 's/\[//g' | tr -d '{' | tr -d '"')"
-  #echo $zones
-
-  selected=""
-  for z in $zones; do
-    z="${z#name:}"
-    _debug zone: "$z"
-    if _contains "$record" "$z"; then
-      _debug "$z found in $record"
-      selected="$z"
-    fi
-  done
-  if [ -z "$selected" ]; then
-    _err "no zone found"
-    return 1
-  fi
-
-  zone_id="$(echo "$response" | tr '}' '\n' | grep "$selected" | tr ',' '\n' | grep id | tr -d '"')"
-  _zone_id="${zone_id#id:}"
-  _debug "zone id: $_zone_id"
-}
-
-_get_zone_name() {
-  _zone_id="$1"
-  _dynv6_rest GET zones/"$_zone_id"
-  _zone_name="$(echo "$response" | tr ',' '\n' | tr -d '{' | grep name | tr -d '"')"
-  _zone_name="${_zone_name#name:}"
-}
-
-#usaage _get_record_id $zone_id $record
-# where zone_id is thevalue returned by _get_zone_id
-# and record ist in the form _acme.www for an fqdn of _acme.www.example.com
-# returns _record_id
-_get_record_id() {
-  _zone_id="$1"
-  record="$2"
-  value="$3"
-  _dynv6_rest GET "zones/$_zone_id/records"
-  if ! _get_record_id_from_response "$response"; then
-    _err "no such record $record found in zone $_zone_id"
-    return 1
-  fi
-}
-
-_get_record_id_from_response() {
-  response="$1"
-  _record_id="$(echo "$response" | tr '}' '\n' | grep "\"name\":\"$record\"" | grep "\"data\":\"$value\"" | tr ',' '\n' | grep id | tr -d '"' | tr -d 'id:')"
-  #_record_id="${_record_id#id:}"
-  if [ -z "$_record_id" ]; then
-    _err "no such record: $record found in zone $_zone_id"
-    return 1
-  fi
-  _debug "record id: $_record_id"
-  return 0
-}
-#usage: _set_record TXT _acme_challenge.www longvalue 12345678
-#zone id is optional can also be set as vairable bevor calling this method
-_set_record() {
-  type="$1"
-  record="$2"
-  value="$3"
-  if [ "$4" ]; then
-    _zone_id="$4"
-  fi
-  data="{\"name\": \"$record\", \"data\": \"$value\", \"type\": \"$type\"}"
-  #data='{ "name": "acme.test.thorn.dynv6.net", "type": "A", "data": "192.168.0.1"}'
-  echo "$data"
-  #"{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"ttl\":120}"
-  _dynv6_rest POST "zones/$_zone_id/records" "$data"
-}
-_del_record() {
-  _zone_id=$1
-  _record_id=$2
-  _dynv6_rest DELETE zones/"$_zone_id"/records/"$_record_id"
-}
-
-_dynv6_rest() {
-  m=$1    #method GET,POST,DELETE or PUT
-  ep="$2" #the endpoint
-  data="$3"
-  _debug "$ep"
-
-  token_trimmed=$(echo "$dynv6_token" | tr -d '"')
-
-  export _H1="Authorization: Bearer $token_trimmed"
-  export _H2="Content-Type: application/json"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$dynv6_api/$ep" "" "$m")"
-  else
-    response="$(_get "$dynv6_api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_edgedns.sh

@@ -1,466 +0,0 @@
-#!/usr/bin/env sh
-
-# Akamai Edge DNS v2  API
-# User must provide Open Edgegrid API credentials to the EdgeDNS installation. The remote user in EdgeDNS must have CRUD access to
-# Edge DNS Zones and Recordsets, e.g. DNS—Zone Record Management authorization
-
-# Report bugs to https://control.akamai.com/apps/support-ui/#/contact-support
-
-# Values to export:
-# --EITHER--
-# *** TBD. NOT IMPLEMENTED YET ***
-# specify Edgegrid credentials file and section
-# AKAMAI_EDGERC=<full file path>
-# AKAMAI_EDGERC_SECTION="default"
-## --OR--
-# specify indiviual credentials
-# export AKAMAI_HOST = <host>
-# export AKAMAI_ACCESS_TOKEN = <access token>
-# export AKAMAI_CLIENT_TOKEN = <client token>
-# export AKAMAI_CLIENT_SECRET = <client secret>
-
-ACME_EDGEDNS_VERSION="0.1.0"
-
-########  Public functions #####################
-
-# Usage: dns_edgedns_add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-#
-dns_edgedns_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug "ENTERING DNS_EDGEDNS_ADD"
-  _debug2 "fulldomain" "$fulldomain"
-  _debug2 "txtvalue" "$txtvalue"
-
-  if ! _EDGEDNS_credentials; then
-    _err "$@"
-    return 1
-  fi
-  if ! _EDGEDNS_getZoneInfo "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug2 "Add: zone" "$zone"
-  acmeRecordURI=$(printf "%s/%s/names/%s/types/TXT" "$edge_endpoint" "$zone" "$fulldomain")
-  _debug3 "Add URL" "$acmeRecordURI"
-  # Get existing TXT record
-  _edge_result=$(_edgedns_rest GET "$acmeRecordURI")
-  _api_status="$?"
-  _debug3 "_edge_result" "$_edge_result"
-  if [ "$_api_status" -ne 0 ]; then
-    if [ "$curResult" = "FATAL" ]; then
-      _err "$(printf "Fatal error: acme API function call : %s" "$retVal")"
-    fi
-    if [ "$_edge_result" != "404" ]; then
-      _err "$(printf "Failure accessing Akamai Edge DNS API Server. Error: %s" "$_edge_result")"
-      return 1
-    fi
-  fi
-  rdata="\"${txtvalue}\""
-  record_op="POST"
-  if [ "$_api_status" -eq 0 ]; then
-    # record already exists. Get existing record data and update
-    record_op="PUT"
-    rdlist="${_edge_result#*\"rdata\":[}"
-    rdlist="${rdlist%%]*}"
-    rdlist=$(echo "$rdlist" | tr -d '"' | tr -d "\\\\")
-    _debug3 "existing TXT found"
-    _debug3 "record data" "$rdlist"
-    # value already there?
-    if _contains "$rdlist" "$txtvalue"; then
-      return 0
-    fi
-    _txt_val=""
-    while [ "$_txt_val" != "$rdlist" ] && [ "${rdlist}" ]; do
-      _txt_val="${rdlist%%,*}"
-      rdlist="${rdlist#*,}"
-      rdata="${rdata},\"${_txt_val}\""
-    done
-  fi
-  # Add the txtvalue TXT Record
-  body="{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"ttl\":600, \"rdata\":"[${rdata}]"}"
-  _debug3 "Add body '${body}'"
-  _edge_result=$(_edgedns_rest "$record_op" "$acmeRecordURI" "$body")
-  _api_status="$?"
-  if [ "$_api_status" -eq 0 ]; then
-    _log "$(printf "Text value %s added to recordset %s" "$txtvalue" "$fulldomain")"
-    return 0
-  else
-    _err "$(printf "error adding TXT record for validation. Error: %s" "$_edge_result")"
-    return 1
-  fi
-}
-
-# Usage: dns_edgedns_rm   _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to delete txt record
-#
-dns_edgedns_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug "ENTERING DNS_EDGEDNS_RM"
-  _debug2 "fulldomain" "$fulldomain"
-  _debug2 "txtvalue" "$txtvalue"
-
-  if ! _EDGEDNS_credentials; then
-    _err "$@"
-    return 1
-  fi
-  if ! _EDGEDNS_getZoneInfo "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-  _debug2 "RM: zone" "${zone}"
-  acmeRecordURI=$(printf "%s/%s/names/%s/types/TXT" "${edge_endpoint}" "$zone" "$fulldomain")
-  _debug3 "RM URL" "$acmeRecordURI"
-  # Get existing TXT record
-  _edge_result=$(_edgedns_rest GET "$acmeRecordURI")
-  _api_status="$?"
-  if [ "$_api_status" -ne 0 ]; then
-    if [ "$curResult" = "FATAL" ]; then
-      _err "$(printf "Fatal error: acme API function call : %s" "$retVal")"
-    fi
-    if [ "$_edge_result" != "404" ]; then
-      _err "$(printf "Failure accessing Akamai Edge DNS API Server. Error: %s" "$_edge_result")"
-      return 1
-    fi
-  fi
-  _debug3 "_edge_result" "$_edge_result"
-  record_op="DELETE"
-  body=""
-  if [ "$_api_status" -eq 0 ]; then
-    # record already exists. Get existing record data and update
-    rdlist="${_edge_result#*\"rdata\":[}"
-    rdlist="${rdlist%%]*}"
-    rdlist=$(echo "$rdlist" | tr -d '"' | tr -d "\\\\")
-    _debug3 "rdlist" "$rdlist"
-    if [ -n "$rdlist" ]; then
-      record_op="PUT"
-      comma=""
-      rdata=""
-      _txt_val=""
-      while [ "$_txt_val" != "$rdlist" ] && [ "$rdlist" ]; do
-        _txt_val="${rdlist%%,*}"
-        rdlist="${rdlist#*,}"
-        _debug3 "_txt_val" "$_txt_val"
-        _debug3 "txtvalue" "$txtvalue"
-        if ! _contains "$_txt_val" "$txtvalue"; then
-          rdata="${rdata}${comma}\"${_txt_val}\""
-          comma=","
-        fi
-      done
-      if [ -z "$rdata" ]; then
-        record_op="DELETE"
-      else
-        # Recreate the txtvalue TXT Record
-        body="{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"ttl\":600, \"rdata\":"[${rdata}]"}"
-        _debug3 "body" "$body"
-      fi
-    fi
-  fi
-  _edge_result=$(_edgedns_rest "$record_op" "$acmeRecordURI" "$body")
-  _api_status="$?"
-  if [ "$_api_status" -eq 0 ]; then
-    _log "$(printf "Text value %s removed from recordset %s" "$txtvalue" "$fulldomain")"
-    return 0
-  else
-    _err "$(printf "error removing TXT record for validation. Error: %s" "$_edge_result")"
-    return 1
-  fi
-}
-
-####################  Private functions below ##################################
-
-_EDGEDNS_credentials() {
-  _debug "GettingEdge DNS credentials"
-  _log "$(printf "ACME DNSAPI Edge DNS version %s" ${ACME_EDGEDNS_VERSION})"
-  args_missing=0
-  if [ -z "$AKAMAI_ACCESS_TOKEN" ]; then
-    AKAMAI_ACCESS_TOKEN=""
-    AKAMAI_CLIENT_TOKEN=""
-    AKAMAI_HOST=""
-    AKAMAI_CLIENT_SECRET=""
-    _err "AKAMAI_ACCESS_TOKEN is missing"
-    args_missing=1
-  fi
-  if [ -z "$AKAMAI_CLIENT_TOKEN" ]; then
-    AKAMAI_ACCESS_TOKEN=""
-    AKAMAI_CLIENT_TOKEN=""
-    AKAMAI_HOST=""
-    AKAMAI_CLIENT_SECRET=""
-    _err "AKAMAI_CLIENT_TOKEN is missing"
-    args_missing=1
-  fi
-  if [ -z "$AKAMAI_HOST" ]; then
-    AKAMAI_ACCESS_TOKEN=""
-    AKAMAI_CLIENT_TOKEN=""
-    AKAMAI_HOST=""
-    AKAMAI_CLIENT_SECRET=""
-    _err "AKAMAI_HOST is missing"
-    args_missing=1
-  fi
-  if [ -z "$AKAMAI_CLIENT_SECRET" ]; then
-    AKAMAI_ACCESS_TOKEN=""
-    AKAMAI_CLIENT_TOKEN=""
-    AKAMAI_HOST=""
-    AKAMAI_CLIENT_SECRET=""
-    _err "AKAMAI_CLIENT_SECRET is missing"
-    args_missing=1
-  fi
-
-  if [ "$args_missing" = 1 ]; then
-    _err "You have not properly specified the EdgeDNS Open Edgegrid API credentials. Please try again."
-    return 1
-  else
-    _saveaccountconf_mutable AKAMAI_ACCESS_TOKEN "$AKAMAI_ACCESS_TOKEN"
-    _saveaccountconf_mutable AKAMAI_CLIENT_TOKEN "$AKAMAI_CLIENT_TOKEN"
-    _saveaccountconf_mutable AKAMAI_HOST "$AKAMAI_HOST"
-    _saveaccountconf_mutable AKAMAI_CLIENT_SECRET "$AKAMAI_CLIENT_SECRET"
-    # Set whether curl should use secure or insecure mode
-  fi
-  export HTTPS_INSECURE=0 # All Edgegrid API calls are secure
-  edge_endpoint=$(printf "https://%s/config-dns/v2/zones" "$AKAMAI_HOST")
-  _debug3 "Edge API Endpoint:" "$edge_endpoint"
-
-}
-
-_EDGEDNS_getZoneInfo() {
-  _debug "Getting Zoneinfo"
-  zoneEnd=false
-  curZone=$1
-  while [ -n "$zoneEnd" ]; do
-    # we can strip the first part of the fulldomain, since its just the _acme-challenge string
-    curZone="${curZone#*.}"
-    # suffix . needed for zone -> domain.tld.
-    # create zone get url
-    get_zone_url=$(printf "%s/%s" "$edge_endpoint" "$curZone")
-    _debug3 "Zone Get: " "${get_zone_url}"
-    curResult=$(_edgedns_rest GET "$get_zone_url")
-    retVal=$?
-    if [ "$retVal" -ne 0 ]; then
-      if [ "$curResult" = "FATAL" ]; then
-        _err "$(printf "Fatal error: acme API function call : %s" "$retVal")"
-      fi
-      if [ "$curResult" != "404" ]; then
-        _err "$(printf "Managed zone validation failed. Error response: %s" "$retVal")"
-        return 1
-      fi
-    fi
-    if _contains "$curResult" "\"zone\":"; then
-      _debug2 "Zone data" "${curResult}"
-      zone=$(echo "${curResult}" | _egrep_o "\"zone\"\\s*:\\s*\"[^\"]*\"" | _head_n 1 | cut -d : -f 2 | tr -d "\"")
-      _debug3 "Zone" "${zone}"
-      zoneEnd=""
-      return 0
-    fi
-
-    if [ "${curZone#*.}" != "$curZone" ]; then
-      _debug3 "$(printf "%s still contains a '.' - so we can check next higher level" "$curZone")"
-    else
-      zoneEnd=true
-      _err "Couldn't retrieve zone data."
-      return 1
-    fi
-  done
-  _err "Failed to  retrieve zone data."
-  return 2
-}
-
-_edgedns_headers=""
-
-_edgedns_rest() {
-  _debug "Handling API Request"
-  m=$1
-  # Assume endpoint is complete path, including query args if applicable
-  ep=$2
-  body_data=$3
-  _edgedns_content_type=""
-  _request_url_path="$ep"
-  _request_body="$body_data"
-  _request_method="$m"
-  _edgedns_headers=""
-  tab=""
-  _edgedns_headers="${_edgedns_headers}${tab}Host: ${AKAMAI_HOST}"
-  tab="\t"
-  # Set in acme.sh _post/_get
-  #_edgedns_headers="${_edgedns_headers}${tab}User-Agent:ACME DNSAPI Edge DNS version ${ACME_EDGEDNS_VERSION}"
-  _edgedns_headers="${_edgedns_headers}${tab}Accept: application/json,*/*"
-  if [ "$m" != "GET" ] && [ "$m" != "DELETE" ]; then
-    _edgedns_content_type="application/json"
-    _debug3 "_request_body" "$_request_body"
-    _body_len=$(echo "$_request_body" | tr -d "\n\r" | awk '{print length}')
-    _edgedns_headers="${_edgedns_headers}${tab}Content-Length: ${_body_len}"
-  fi
-  _edgedns_make_auth_header
-  _edgedns_headers="${_edgedns_headers}${tab}Authorization: ${_signed_auth_header}"
-  _secure_debug2 "Made Auth Header" "$_signed_auth_header"
-  hdr_indx=1
-  work_header="${_edgedns_headers}${tab}"
-  _debug3 "work_header" "$work_header"
-  while [ "$work_header" ]; do
-    entry="${work_header%%\\t*}"
-    work_header="${work_header#*\\t}"
-    export "$(printf "_H%s=%s" "$hdr_indx" "$entry")"
-    _debug2 "Request Header " "$entry"
-    hdr_indx=$((hdr_indx + 1))
-  done
-
-  # clear headers from previous request to avoid getting wrong http code on timeouts
-  : >"$HTTP_HEADER"
-  _debug2 "$ep"
-  if [ "$m" != "GET" ]; then
-    _debug3 "Method data" "$data"
-    # body  url [needbase64] [POST|PUT|DELETE] [ContentType]
-    response=$(_post "$_request_body" "$ep" false "$m" "$_edgedns_content_type")
-  else
-    response=$(_get "$ep")
-  fi
-  _ret="$?"
-  if [ "$_ret" -ne 0 ]; then
-    _err "$(printf "acme.sh API function call failed. Error: %s" "$_ret")"
-    echo "FATAL"
-    return "$_ret"
-  fi
-  _debug2 "response" "${response}"
-  _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-  _debug2 "http response code" "$_code"
-  if [ "$_code" = "200" ] || [ "$_code" = "201" ]; then
-    # All good
-    response="$(echo "${response}" | _normalizeJson)"
-    echo "$response"
-    return 0
-  fi
-
-  if [ "$_code" = "204" ]; then
-    # Success, no body
-    echo "$_code"
-    return 0
-  fi
-
-  if [ "$_code" = "400" ]; then
-    _err "Bad request presented"
-    _log "$(printf "Headers: %s" "$_edgedns_headers")"
-    _log "$(printf "Method: %s" "$_request_method")"
-    _log "$(printf "URL: %s" "$ep")"
-    _log "$(printf "Data: %s" "$data")"
-  fi
-
-  if [ "$_code" = "403" ]; then
-    _err "access denied make sure your Edgegrid cedentials are correct."
-  fi
-
-  echo "$_code"
-  return 1
-}
-
-_edgedns_eg_timestamp() {
-  _debug "Generating signature Timestamp"
-  _debug3 "Retriving ntp time"
-  _timeheaders="$(_get "https://www.ntp.org" "onlyheader")"
-  _debug3 "_timeheaders" "$_timeheaders"
-  _ntpdate="$(echo "$_timeheaders" | grep -i "Date:" | _head_n 1 | cut -d ':' -f 2- | tr -d "\r\n")"
-  _debug3 "_ntpdate" "$_ntpdate"
-  _ntpdate="$(echo "${_ntpdate}" | sed -e 's/^[[:space:]]*//')"
-  _debug3 "_NTPDATE" "$_ntpdate"
-  _ntptime="$(echo "${_ntpdate}" | _head_n 1 | cut -d " " -f 5 | tr -d "\r\n")"
-  _debug3 "_ntptime" "$_ntptime"
-  _eg_timestamp=$(date -u "+%Y%m%dT")
-  _eg_timestamp="$(printf "%s%s+0000" "$_eg_timestamp" "$_ntptime")"
-  _debug "_eg_timestamp" "$_eg_timestamp"
-}
-
-_edgedns_new_nonce() {
-  _debug "Generating Nonce"
-  _nonce=$(echo "EDGEDNS$(_time)" | _digest sha1 hex | cut -c 1-32)
-  _debug3 "_nonce" "$_nonce"
-}
-
-_edgedns_make_auth_header() {
-  _debug "Constructing Auth Header"
-  _edgedns_new_nonce
-  _edgedns_eg_timestamp
-  # "Unsigned authorization header: 'EG1-HMAC-SHA256 client_token=block;access_token=block;timestamp=20200806T14:16:33+0000;nonce=72cde72c-82d9-4721-9854-2ba057929d67;'"
-  _auth_header="$(printf "EG1-HMAC-SHA256 client_token=%s;access_token=%s;timestamp=%s;nonce=%s;" "$AKAMAI_CLIENT_TOKEN" "$AKAMAI_ACCESS_TOKEN" "$_eg_timestamp" "$_nonce")"
-  _secure_debug2 "Unsigned Auth Header: " "$_auth_header"
-
-  _edgedns_sign_request
-  _signed_auth_header="$(printf "%ssignature=%s" "$_auth_header" "$_signed_req")"
-  _secure_debug2 "Signed Auth Header: " "${_signed_auth_header}"
-}
-
-_edgedns_sign_request() {
-  _debug2 "Signing http request"
-  _edgedns_make_data_to_sign "$_auth_header"
-  _secure_debug2 "Returned signed data" "$_mdata"
-  _edgedns_make_signing_key "$_eg_timestamp"
-  _edgedns_base64_hmac_sha256 "$_mdata" "$_signing_key"
-  _signed_req="$_hmac_out"
-  _secure_debug2 "Signed Request" "$_signed_req"
-}
-
-_edgedns_make_signing_key() {
-  _debug2 "Creating sigining key"
-  ts=$1
-  _edgedns_base64_hmac_sha256 "$ts" "$AKAMAI_CLIENT_SECRET"
-  _signing_key="$_hmac_out"
-  _secure_debug2 "Signing Key" "$_signing_key"
-
-}
-
-_edgedns_make_data_to_sign() {
-  _debug2 "Processing data to sign"
-  hdr=$1
-  _secure_debug2 "hdr" "$hdr"
-  _edgedns_make_content_hash
-  path="$(echo "$_request_url_path" | tr -d "\n\r" | sed 's/https\?:\/\///')"
-  path="${path#*$AKAMAI_HOST}"
-  _debug "hier path" "$path"
-  # dont expose headers to sign so use MT string
-  _mdata="$(printf "%s\thttps\t%s\t%s\t%s\t%s\t%s" "$_request_method" "$AKAMAI_HOST" "$path" "" "$_hash" "$hdr")"
-  _secure_debug2 "Data to Sign" "$_mdata"
-}
-
-_edgedns_make_content_hash() {
-  _debug2 "Generating content hash"
-  _hash=""
-  _debug2 "Request method" "${_request_method}"
-  if [ "$_request_method" != "POST" ] || [ -z "$_request_body" ]; then
-    return 0
-  fi
-  _debug2 "Req body" "$_request_body"
-  _edgedns_base64_sha256 "$_request_body"
-  _hash="$_sha256_out"
-  _debug2 "Content hash" "$_hash"
-}
-
-_edgedns_base64_hmac_sha256() {
-  _debug2 "Generating hmac"
-  data=$1
-  key=$2
-  encoded_data="$(echo "$data" | iconv -t utf-8)"
-  encoded_key="$(echo "$key" | iconv -t utf-8)"
-  _secure_debug2 "encoded data" "$encoded_data"
-  _secure_debug2 "encoded key" "$encoded_key"
-
-  encoded_key_hex=$(printf "%s" "$encoded_key" | _hex_dump | tr -d ' ')
-  data_sig="$(echo "$encoded_data" | tr -d "\n\r" | _hmac sha256 "$encoded_key_hex" | _base64)"
-
-  _secure_debug2 "data_sig:" "$data_sig"
-  _hmac_out="$(echo "$data_sig" | tr -d "\n\r" | iconv -f utf-8)"
-  _secure_debug2 "hmac" "$_hmac_out"
-}
-
-_edgedns_base64_sha256() {
-  _debug2 "Creating sha256 digest"
-  trg=$1
-  _secure_debug2 "digest data" "$trg"
-  digest="$(echo "$trg" | tr -d "\n\r" | _digest "sha256")"
-  _sha256_out="$(echo "$digest" | tr -d "\n\r" | iconv -f utf-8)"
-  _secure_debug2 "digest decode" "$_sha256_out"
-}
-
-#_edgedns_parse_edgerc() {
-#  filepath=$1
-#  section=$2
-#}

dnsapi/dns_huaweicloud.sh

@@ -1,275 +0,0 @@
-#!/usr/bin/env sh
-
-# HUAWEICLOUD_Username
-# HUAWEICLOUD_Password
-# HUAWEICLOUD_ProjectID
-
-iam_api="https://iam.myhuaweicloud.com"
-dns_api="https://dns.ap-southeast-1.myhuaweicloud.com" # Should work
-
-########  Public functions #####################
-
-# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-#
-# Ref: https://support.huaweicloud.com/intl/zh-cn/api-dns/zh-cn_topic_0132421999.html
-#
-
-dns_huaweicloud_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  HUAWEICLOUD_Username="${HUAWEICLOUD_Username:-$(_readaccountconf_mutable HUAWEICLOUD_Username)}"
-  HUAWEICLOUD_Password="${HUAWEICLOUD_Password:-$(_readaccountconf_mutable HUAWEICLOUD_Password)}"
-  HUAWEICLOUD_ProjectID="${HUAWEICLOUD_ProjectID:-$(_readaccountconf_mutable HUAWEICLOUD_ProjectID)}"
-
-  # Check information
-  if [ -z "${HUAWEICLOUD_Username}" ] || [ -z "${HUAWEICLOUD_Password}" ] || [ -z "${HUAWEICLOUD_ProjectID}" ]; then
-    _err "Not enough information provided to dns_huaweicloud!"
-    return 1
-  fi
-
-  unset token # Clear token
-  token="$(_get_token "${HUAWEICLOUD_Username}" "${HUAWEICLOUD_Password}" "${HUAWEICLOUD_ProjectID}")"
-  if [ -z "${token}" ]; then # Check token
-    _err "dns_api(dns_huaweicloud): Error getting token."
-    return 1
-  fi
-  _debug "Access token is: ${token}"
-
-  unset zoneid
-  zoneid="$(_get_zoneid "${token}" "${fulldomain}")"
-  if [ -z "${zoneid}" ]; then
-    _err "dns_api(dns_huaweicloud): Error getting zone id."
-    return 1
-  fi
-  _debug "Zone ID is: ${zoneid}"
-
-  _debug "Adding Record"
-  _add_record "${token}" "${fulldomain}" "${txtvalue}"
-  ret="$?"
-  if [ "${ret}" != "0" ]; then
-    _err "dns_api(dns_huaweicloud): Error adding record."
-    return 1
-  fi
-
-  # Do saving work if all succeeded
-  _saveaccountconf_mutable HUAWEICLOUD_Username "${HUAWEICLOUD_Username}"
-  _saveaccountconf_mutable HUAWEICLOUD_Password "${HUAWEICLOUD_Password}"
-  _saveaccountconf_mutable HUAWEICLOUD_ProjectID "${HUAWEICLOUD_ProjectID}"
-  return 0
-}
-
-# Usage: fulldomain txtvalue
-# Used to remove the txt record after validation
-#
-# Ref: https://support.huaweicloud.com/intl/zh-cn/api-dns/dns_api_64005.html
-#
-
-dns_huaweicloud_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  HUAWEICLOUD_Username="${HUAWEICLOUD_Username:-$(_readaccountconf_mutable HUAWEICLOUD_Username)}"
-  HUAWEICLOUD_Password="${HUAWEICLOUD_Password:-$(_readaccountconf_mutable HUAWEICLOUD_Password)}"
-  HUAWEICLOUD_ProjectID="${HUAWEICLOUD_ProjectID:-$(_readaccountconf_mutable HUAWEICLOUD_ProjectID)}"
-
-  # Check information
-  if [ -z "${HUAWEICLOUD_Username}" ] || [ -z "${HUAWEICLOUD_Password}" ] || [ -z "${HUAWEICLOUD_ProjectID}" ]; then
-    _err "Not enough information provided to dns_huaweicloud!"
-    return 1
-  fi
-
-  unset token # Clear token
-  token="$(_get_token "${HUAWEICLOUD_Username}" "${HUAWEICLOUD_Password}" "${HUAWEICLOUD_ProjectID}")"
-  if [ -z "${token}" ]; then # Check token
-    _err "dns_api(dns_huaweicloud): Error getting token."
-    return 1
-  fi
-  _debug "Access token is: ${token}"
-
-  unset zoneid
-  zoneid="$(_get_zoneid "${token}" "${fulldomain}")"
-  if [ -z "${zoneid}" ]; then
-    _err "dns_api(dns_huaweicloud): Error getting zone id."
-    return 1
-  fi
-  _debug "Zone ID is: ${zoneid}"
-
-  # Remove all records
-  # Therotically HuaweiCloud does not allow more than one record set
-  # But remove them recurringly to increase robusty
-  while [ "${record_id}" != "0" ]; do
-    _debug "Removing Record"
-    _rm_record "${token}" "${zoneid}" "${record_id}"
-    record_id="$(_get_recordset_id "${token}" "${fulldomain}" "${zoneid}")"
-  done
-  return 0
-}
-
-###################  Private functions below ##################################
-
-# _get_zoneid
-#
-# _token=$1
-# _domain_string=$2
-#
-# printf "%s" "${_zoneid}"
-_get_zoneid() {
-  _token=$1
-  _domain_string=$2
-  export _H1="X-Auth-Token: ${_token}"
-
-  i=1
-  while true; do
-    h=$(printf "%s" "${_domain_string}" | cut -d . -f $i-100)
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-    _debug "$h"
-    response=$(_get "${dns_api}/v2/zones?name=${h}")
-
-    if _contains "${response}" "id"; then
-      _debug "Get Zone ID Success."
-      _zoneid=$(echo "${response}" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")
-      printf "%s" "${_zoneid}"
-      return 0
-    fi
-
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_get_recordset_id() {
-  _token=$1
-  _domain=$2
-  _zoneid=$3
-  export _H1="X-Auth-Token: ${_token}"
-
-  response=$(_get "${dns_api}/v2/zones/${_zoneid}/recordsets?name=${_domain}")
-  if _contains "${response}" "id"; then
-    _id="$(echo "${response}" | _egrep_o "\"id\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | tr -d " ")"
-    printf "%s" "${_id}"
-    return 0
-  fi
-  printf "%s" "0"
-  return 1
-}
-
-_add_record() {
-  _token=$1
-  _domain=$2
-  _txtvalue=$3
-
-  # Get Existing Records
-  export _H1="X-Auth-Token: ${_token}"
-  response=$(_get "${dns_api}/v2/zones/${zoneid}/recordsets?name=${_domain}")
-
-  _debug2 "${response}"
-  _exist_record=$(echo "${response}" | _egrep_o '"records":[^]]*' | sed 's/\"records\"\:\[//g')
-  _debug "${_exist_record}"
-
-  # Check if record exist
-  # Generate body data
-  if [ -z "${_exist_record}" ]; then
-    _post_body="{
-      \"name\": \"${_domain}.\",
-      \"description\": \"ACME Challenge\",
-      \"type\": \"TXT\",
-      \"ttl\": 1,
-      \"records\": [
-        \"\\\"${_txtvalue}\\\"\"
-      ]
-    }"
-  else
-    _post_body="{
-      \"name\": \"${_domain}.\",
-      \"description\": \"ACME Challenge\",
-      \"type\": \"TXT\",
-      \"ttl\": 1,
-      \"records\": [
-        ${_exist_record},
-        \"\\\"${_txtvalue}\\\"\"
-      ]
-    }"
-  fi
-
-  _record_id="$(_get_recordset_id "${_token}" "${_domain}" "${zoneid}")"
-  _debug "Record Set ID is: ${_record_id}"
-
-  # Remove all records
-  while [ "${_record_id}" != "0" ]; do
-    _debug "Removing Record"
-    _rm_record "${_token}" "${zoneid}" "${_record_id}"
-    _record_id="$(_get_recordset_id "${_token}" "${_domain}" "${zoneid}")"
-  done
-
-  # Add brand new records with all old and new records
-  export _H2="Content-Type: application/json"
-  export _H1="X-Auth-Token: ${_token}"
-
-  _debug2 "${_post_body}"
-  _post "${_post_body}" "${dns_api}/v2/zones/${zoneid}/recordsets" >/dev/null
-  _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-  if [ "$_code" != "202" ]; then
-    _err "dns_huaweicloud: http code ${_code}"
-    return 1
-  fi
-  return 0
-}
-
-# _rm_record $token $zoneid $recordid
-# assume ${dns_api} exist
-# no output
-# return 0
-_rm_record() {
-  _token=$1
-  _zone_id=$2
-  _record_id=$3
-
-  export _H2="Content-Type: application/json"
-  export _H1="X-Auth-Token: ${_token}"
-
-  _post "" "${dns_api}/v2/zones/${_zone_id}/recordsets/${_record_id}" false "DELETE" >/dev/null
-  return $?
-}
-
-_get_token() {
-  _username=$1
-  _password=$2
-  _project=$3
-
-  _debug "Getting Token"
-  body="{
-    \"auth\": {
-      \"identity\": {
-        \"methods\": [
-          \"password\"
-        ],
-        \"password\": {
-          \"user\": {
-            \"name\": \"${_username}\",
-            \"password\": \"${_password}\",
-            \"domain\": {
-              \"name\": \"${_username}\"
-            }
-          }
-        }
-      },
-      \"scope\": {
-        \"project\": {
-          \"id\": \"${_project}\"
-        }
-      }
-    }
-  }"
-  export _H1="Content-Type: application/json;charset=utf8"
-  _post "${body}" "${iam_api}/v3/auth/tokens" >/dev/null
-  _code=$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")
-  _token=$(grep "^X-Subject-Token" "$HTTP_HEADER" | cut -d " " -f 2-)
-  _debug2 "${_code}"
-  printf "%s" "${_token}"
-  return 0
-}

dnsapi/dns_infomaniak.sh

@@ -1,199 +0,0 @@
-#!/usr/bin/env sh
-
-###############################################################################
-# Infomaniak API integration
-#
-# To use this API you need visit the API dashboard of your account
-# once logged into https://manager.infomaniak.com add /api/dashboard to the URL
-#
-# Please report bugs to
-# https://github.com/acmesh-official/acme.sh/issues/3188
-#
-# Note: the URL looks like this:
-# https://manager.infomaniak.com/v3/<account_id>/api/dashboard
-# Then generate a token with the scope Domain
-# this is given as an environment variable INFOMANIAK_API_TOKEN
-###############################################################################
-
-# base variables
-
-DEFAULT_INFOMANIAK_API_URL="https://api.infomaniak.com"
-DEFAULT_INFOMANIAK_TTL=300
-
-########  Public functions #####################
-
-#Usage: dns_infomaniak_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_infomaniak_add() {
-
-  INFOMANIAK_API_TOKEN="${INFOMANIAK_API_TOKEN:-$(_readaccountconf_mutable INFOMANIAK_API_TOKEN)}"
-  INFOMANIAK_API_URL="${INFOMANIAK_API_URL:-$(_readaccountconf_mutable INFOMANIAK_API_URL)}"
-  INFOMANIAK_TTL="${INFOMANIAK_TTL:-$(_readaccountconf_mutable INFOMANIAK_TTL)}"
-
-  if [ -z "$INFOMANIAK_API_TOKEN" ]; then
-    INFOMANIAK_API_TOKEN=""
-    _err "Please provide a valid Infomaniak API token in variable INFOMANIAK_API_TOKEN"
-    return 1
-  fi
-
-  if [ -z "$INFOMANIAK_API_URL" ]; then
-    INFOMANIAK_API_URL="$DEFAULT_INFOMANIAK_API_URL"
-  fi
-
-  if [ -z "$INFOMANIAK_TTL" ]; then
-    INFOMANIAK_TTL="$DEFAULT_INFOMANIAK_TTL"
-  fi
-
-  #save the token to the account conf file.
-  _saveaccountconf_mutable INFOMANIAK_API_TOKEN "$INFOMANIAK_API_TOKEN"
-
-  if [ "$INFOMANIAK_API_URL" != "$DEFAULT_INFOMANIAK_API_URL" ]; then
-    _saveaccountconf_mutable INFOMANIAK_API_URL "$INFOMANIAK_API_URL"
-  fi
-
-  if [ "$INFOMANIAK_TTL" != "$DEFAULT_INFOMANIAK_TTL" ]; then
-    _saveaccountconf_mutable INFOMANIAK_TTL "$INFOMANIAK_TTL"
-  fi
-
-  export _H1="Authorization: Bearer $INFOMANIAK_API_TOKEN"
-  export _H2="Content-Type: application/json"
-
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _info "Infomaniak DNS API"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  fqdn=${fulldomain#_acme-challenge.}
-
-  # guess which base domain to add record to
-  zone_and_id=$(_find_zone "$fqdn")
-  if [ -z "$zone_and_id" ]; then
-    _err "cannot find zone to modify"
-    return 1
-  fi
-  zone=${zone_and_id% *}
-  domain_id=${zone_and_id#* }
-
-  # extract first part of domain
-  key=${fulldomain%.$zone}
-
-  _debug "zone:$zone id:$domain_id key:$key"
-
-  # payload
-  data="{\"type\": \"TXT\", \"source\": \"$key\", \"target\": \"$txtvalue\", \"ttl\": $INFOMANIAK_TTL}"
-
-  # API call
-  response=$(_post "$data" "${INFOMANIAK_API_URL}/1/domain/$domain_id/dns/record")
-  if [ -n "$response" ] && echo "$response" | _contains '"result":"success"'; then
-    _info "Record added"
-    _debug "Response: $response"
-    return 0
-  fi
-  _err "could not create record"
-  _debug "Response: $response"
-  return 1
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_infomaniak_rm() {
-
-  INFOMANIAK_API_TOKEN="${INFOMANIAK_API_TOKEN:-$(_readaccountconf_mutable INFOMANIAK_API_TOKEN)}"
-  INFOMANIAK_API_URL="${INFOMANIAK_API_URL:-$(_readaccountconf_mutable INFOMANIAK_API_URL)}"
-  INFOMANIAK_TTL="${INFOMANIAK_TTL:-$(_readaccountconf_mutable INFOMANIAK_TTL)}"
-
-  if [ -z "$INFOMANIAK_API_TOKEN" ]; then
-    INFOMANIAK_API_TOKEN=""
-    _err "Please provide a valid Infomaniak API token in variable INFOMANIAK_API_TOKEN"
-    return 1
-  fi
-
-  if [ -z "$INFOMANIAK_API_URL" ]; then
-    INFOMANIAK_API_URL="$DEFAULT_INFOMANIAK_API_URL"
-  fi
-
-  if [ -z "$INFOMANIAK_TTL" ]; then
-    INFOMANIAK_TTL="$DEFAULT_INFOMANIAK_TTL"
-  fi
-
-  #save the token to the account conf file.
-  _saveaccountconf_mutable INFOMANIAK_API_TOKEN "$INFOMANIAK_API_TOKEN"
-
-  if [ "$INFOMANIAK_API_URL" != "$DEFAULT_INFOMANIAK_API_URL" ]; then
-    _saveaccountconf_mutable INFOMANIAK_API_URL "$INFOMANIAK_API_URL"
-  fi
-
-  if [ "$INFOMANIAK_TTL" != "$DEFAULT_INFOMANIAK_TTL" ]; then
-    _saveaccountconf_mutable INFOMANIAK_TTL "$INFOMANIAK_TTL"
-  fi
-
-  export _H1="Authorization: Bearer $INFOMANIAK_API_TOKEN"
-  export _H2="ContentType: application/json"
-
-  fulldomain=$1
-  txtvalue=$2
-  _info "Infomaniak DNS API"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  fqdn=${fulldomain#_acme-challenge.}
-
-  # guess which base domain to add record to
-  zone_and_id=$(_find_zone "$fqdn")
-  if [ -z "$zone_and_id" ]; then
-    _err "cannot find zone to modify"
-    return 1
-  fi
-  zone=${zone_and_id% *}
-  domain_id=${zone_and_id#* }
-
-  # extract first part of domain
-  key=${fulldomain%.$zone}
-
-  _debug "zone:$zone id:$domain_id key:$key"
-
-  # find previous record
-  # shellcheck disable=SC1004
-  record_id=$(_get "${INFOMANIAK_API_URL}/1/domain/$domain_id/dns/record" | sed 's/.*"data":\[\(.*\)\]}/\1/; s/},{/}\
-{/g' | sed -n 's/.*"id":"*\([0-9]*\)"*.*"source_idn":"'"$fulldomain"'".*"target_idn":"'"$txtvalue"'".*/\1/p')
-  if [ -z "$record_id" ]; then
-    _err "could not find record to delete"
-    return 1
-  fi
-  _debug "record_id: $record_id"
-
-  # API call
-  response=$(_post "" "${INFOMANIAK_API_URL}/1/domain/$domain_id/dns/record/$record_id" "" DELETE)
-  if [ -n "$response" ] && echo "$response" | _contains '"result":"success"'; then
-    _info "Record deleted"
-    return 0
-  fi
-  _err "could not delete record"
-  return 1
-}
-
-####################  Private functions below ##################################
-
-_get_domain_id() {
-  domain="$1"
-
-  # shellcheck disable=SC1004
-  _get "${INFOMANIAK_API_URL}/1/product?service_name=domain&customer_name=$domain" | sed 's/.*"data":\[{\(.*\)}\]}/\1/; s/,/\
-/g' | sed -n 's/^"id":\(.*\)/\1/p'
-}
-
-_find_zone() {
-  zone="$1"
-
-  # find domain in list, removing . parts sequentialy
-  while _contains "$zone" '\.'; do
-    _debug "testing $zone"
-    id=$(_get_domain_id "$zone")
-    if [ -n "$id" ]; then
-      echo "$zone $id"
-      return
-    fi
-    zone=${zone#*.}
-  done
-}

dnsapi/dns_ionos.sh

@@ -1,162 +0,0 @@
-#!/usr/bin/env sh
-
-# Supports IONOS DNS API Beta v1.0.0
-#
-# Usage:
-#   Export IONOS_PREFIX and IONOS_SECRET before calling acme.sh:
-#
-#   $ export IONOS_PREFIX="..."
-#   $ export IONOS_SECRET="..."
-#
-#   $ acme.sh --issue --dns dns_ionos ...
-
-IONOS_API="https://api.hosting.ionos.com/dns"
-IONOS_ROUTE_ZONES="/v1/zones"
-
-IONOS_TXT_TTL=60 # minimum accepted by API
-IONOS_TXT_PRIO=10
-
-dns_ionos_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _ionos_init; then
-    return 1
-  fi
-
-  _body="[{\"name\":\"$_sub_domain.$_domain\",\"type\":\"TXT\",\"content\":\"$txtvalue\",\"ttl\":$IONOS_TXT_TTL,\"prio\":$IONOS_TXT_PRIO,\"disabled\":false}]"
-
-  if _ionos_rest POST "$IONOS_ROUTE_ZONES/$_zone_id/records" "$_body" && [ -z "$response" ]; then
-    _info "TXT record has been created successfully."
-    return 0
-  fi
-
-  return 1
-}
-
-dns_ionos_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _ionos_init; then
-    return 1
-  fi
-
-  if ! _ionos_get_record "$fulldomain" "$_zone_id" "$txtvalue"; then
-    _err "Could not find _acme-challenge TXT record."
-    return 1
-  fi
-
-  if _ionos_rest DELETE "$IONOS_ROUTE_ZONES/$_zone_id/records/$_record_id" && [ -z "$response" ]; then
-    _info "TXT record has been deleted successfully."
-    return 0
-  fi
-
-  return 1
-}
-
-_ionos_init() {
-  IONOS_PREFIX="${IONOS_PREFIX:-$(_readaccountconf_mutable IONOS_PREFIX)}"
-  IONOS_SECRET="${IONOS_SECRET:-$(_readaccountconf_mutable IONOS_SECRET)}"
-
-  if [ -z "$IONOS_PREFIX" ] || [ -z "$IONOS_SECRET" ]; then
-    _err "You didn't specify an IONOS api prefix and secret yet."
-    _err "Read https://beta.developer.hosting.ionos.de/docs/getstarted to learn how to get a prefix and secret."
-    _err ""
-    _err "Then set them before calling acme.sh:"
-    _err "\$ export IONOS_PREFIX=\"...\""
-    _err "\$ export IONOS_SECRET=\"...\""
-    _err "\$ acme.sh --issue -d ... --dns dns_ionos"
-    return 1
-  fi
-
-  _saveaccountconf_mutable IONOS_PREFIX "$IONOS_PREFIX"
-  _saveaccountconf_mutable IONOS_SECRET "$IONOS_SECRET"
-
-  if ! _get_root "$fulldomain"; then
-    _err "Cannot find this domain in your IONOS account."
-    return 1
-  fi
-}
-
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  if _ionos_rest GET "$IONOS_ROUTE_ZONES"; then
-    response="$(echo "$response" | tr -d "\n")"
-
-    while true; do
-      h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-      if [ -z "$h" ]; then
-        return 1
-      fi
-
-      _zone="$(echo "$response" | _egrep_o "\"name\":\"$h\".*\}")"
-      if [ "$_zone" ]; then
-        _zone_id=$(printf "%s\n" "$_zone" | _egrep_o "\"id\":\"[a-fA-F0-9\-]*\"" | _head_n 1 | cut -d : -f 2 | tr -d '\"')
-        if [ "$_zone_id" ]; then
-          _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-          _domain=$h
-
-          return 0
-        fi
-
-        return 1
-      fi
-
-      p=$i
-      i=$(_math "$i" + 1)
-    done
-  fi
-
-  return 1
-}
-
-_ionos_get_record() {
-  fulldomain=$1
-  zone_id=$2
-  txtrecord=$3
-
-  if _ionos_rest GET "$IONOS_ROUTE_ZONES/$zone_id?recordName=$fulldomain&recordType=TXT"; then
-    response="$(echo "$response" | tr -d "\n")"
-
-    _record="$(echo "$response" | _egrep_o "\"name\":\"$fulldomain\"[^\}]*\"type\":\"TXT\"[^\}]*\"content\":\"\\\\\"$txtrecord\\\\\"\".*\}")"
-    if [ "$_record" ]; then
-      _record_id=$(printf "%s\n" "$_record" | _egrep_o "\"id\":\"[a-fA-F0-9\-]*\"" | _head_n 1 | cut -d : -f 2 | tr -d '\"')
-
-      return 0
-    fi
-  fi
-
-  return 1
-}
-
-_ionos_rest() {
-  method="$1"
-  route="$2"
-  data="$3"
-
-  IONOS_API_KEY="$(printf "%s.%s" "$IONOS_PREFIX" "$IONOS_SECRET")"
-
-  export _H1="X-API-Key: $IONOS_API_KEY"
-
-  if [ "$method" != "GET" ]; then
-    export _H2="Accept: application/json"
-    export _H3="Content-Type: application/json"
-
-    response="$(_post "$data" "$IONOS_API$route" "" "$method" "application/json")"
-  else
-    export _H2="Accept: */*"
-
-    response="$(_get "$IONOS_API$route")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "Error $route"
-    return 1
-  fi
-
-  return 0
-}

dnsapi/dns_ispconfig.sh

@@ -75,7 +75,7 @@ _ISPC_getZoneInfo() {
     # suffix . needed for zone -> domain.tld.
     curData="{\"session_id\":\"${sessionID}\",\"primary_id\":{\"origin\":\"${curZone}.\"}}"
     curResult="$(_post "${curData}" "${ISPC_Api}?dns_zone_get")"
-    _debug "Calling _ISPC_getZoneInfo: '${curData}' '${ISPC_Api}?dns_zone_get'"
+    _debug "Calling _ISPC_getZoneInfo: '${curData}' '${ISPC_Api}?login'"
     _debug "Result of _ISPC_getZoneInfo: '$curResult'"
     if _contains "${curResult}" '"id":"'; then
       zoneFound=true
@@ -110,32 +110,18 @@ _ISPC_getZoneInfo() {
       ;;
     *) _info "Retrieved Zone ID" ;;
     esac
-    sys_userid=$(echo "${curResult}" | _egrep_o "sys_userid.*" | cut -d ':' -f 2 | cut -d '"' -f 2)
+    client_id=$(echo "${curResult}" | _egrep_o "sys_userid.*" | cut -d ':' -f 2 | cut -d '"' -f 2)
-    _debug "SYS User ID: '${sys_userid}'"
+    _debug "Client ID: '${client_id}'"
-    case "${sys_userid}" in
+    case "${client_id}" in
     '' | *[!0-9]*)
-      _err "SYS User ID is not numeric."
+      _err "Client ID is not numeric."
       return 1
       ;;
-    *) _info "Retrieved SYS User ID." ;;
+    *) _info "Retrieved Client ID." ;;
     esac
     zoneFound=""
     zoneEnd=""
   fi
-  # Need to get client_id as it is different from sys_userid
-  curData="{\"session_id\":\"${sessionID}\",\"sys_userid\":\"${sys_userid}\"}"
-  curResult="$(_post "${curData}" "${ISPC_Api}?client_get_id")"
-  _debug "Calling _ISPC_ClientGetID: '${curData}' '${ISPC_Api}?client_get_id'"
-  _debug "Result of _ISPC_ClientGetID: '$curResult'"
-  client_id=$(echo "${curResult}" | _egrep_o "response.*" | cut -d ':' -f 2 | cut -d '"' -f 2 | tr -d '{}')
-  _debug "Client ID: '${client_id}'"
-  case "${client_id}" in
-  '' | *[!0-9]*)
-    _err "Client ID is not numeric."
-    return 1
-    ;;
-  *) _info "Retrieved Client ID." ;;
-  esac
 }
 
 _ISPC_addTxt() {

dnsapi/dns_linode_v4.sh

@@ -106,7 +106,6 @@ dns_linode_v4_rm() {
 ####################  Private functions below ##################################
 
 _Linode_API() {
-  LINODE_V4_API_KEY="${LINODE_V4_API_KEY:-$(_readaccountconf_mutable LINODE_V4_API_KEY)}"
   if [ -z "$LINODE_V4_API_KEY" ]; then
     LINODE_V4_API_KEY=""
 
@@ -116,7 +115,7 @@ _Linode_API() {
     return 1
   fi
 
-  _saveaccountconf_mutable LINODE_V4_API_KEY "$LINODE_V4_API_KEY"
+  _saveaccountconf LINODE_V4_API_KEY "$LINODE_V4_API_KEY"
 }
 
 ####################  Private functions below ##################################

dnsapi/dns_misaka.sh

@@ -47,7 +47,7 @@ dns_misaka_add() {
   if [ "$count" = "0" ]; then
     _info "Adding record"
 
-    if _misaka_rest POST "zones/${_domain}/recordsets/${_sub_domain}/TXT" "{\"records\":[{\"value\":\"\\\"$txtvalue\\\"\"}],\"filters\":[],\"ttl\":1}"; then
+    if _misaka_rest PUT "zones/${_domain}/recordsets/${_sub_domain}/TXT" "{\"records\":[{\"value\":\"\\\"$txtvalue\\\"\"}],\"filters\":[],\"ttl\":1}"; then
       _debug response "$response"
       if _contains "$response" "$_sub_domain"; then
         _info "Added"
@@ -61,7 +61,7 @@ dns_misaka_add() {
   else
     _info "Updating record"
 
-    _misaka_rest PUT "zones/${_domain}/recordsets/${_sub_domain}/TXT?append=true" "{\"records\": [{\"value\": \"\\\"$txtvalue\\\"\"}],\"ttl\":1}"
+    _misaka_rest POST "zones/${_domain}/recordsets/${_sub_domain}/TXT?append=true" "{\"records\": [{\"value\": \"\\\"$txtvalue\\\"\"}],\"ttl\":1}"
     if [ "$?" = "0" ] && _contains "$response" "$_sub_domain"; then
       _info "Updated!"
       #todo: check if the record takes effect

dnsapi/dns_namecheap.sh

@@ -157,7 +157,7 @@ _namecheap_set_publicip() {
 
   if [ -z "$NAMECHEAP_SOURCEIP" ]; then
     _err "No Source IP specified for Namecheap API."
-    _err "Use your public ip address or an url to retrieve it (e.g. https://ifconfig.co/ip) and export it as NAMECHEAP_SOURCEIP"
+    _err "Use your public ip address or an url to retrieve it (e.g. https://ipconfig.co/ip) and export it as NAMECHEAP_SOURCEIP"
     return 1
   else
     _saveaccountconf NAMECHEAP_SOURCEIP "$NAMECHEAP_SOURCEIP"
@@ -175,7 +175,7 @@ _namecheap_set_publicip() {
       _publicip=$(_get "$addr")
     else
       _err "No Source IP specified for Namecheap API."
-      _err "Use your public ip address or an url to retrieve it (e.g. https://ifconfig.co/ip) and export it as NAMECHEAP_SOURCEIP"
+      _err "Use your public ip address or an url to retrieve it (e.g. https://ipconfig.co/ip) and export it as NAMECHEAP_SOURCEIP"
       return 1
     fi
   fi
@@ -208,7 +208,7 @@ _namecheap_parse_host() {
   _hostid=$(echo "$_host" | _egrep_o ' HostId="[^"]*' | cut -d '"' -f 2)
   _hostname=$(echo "$_host" | _egrep_o ' Name="[^"]*' | cut -d '"' -f 2)
   _hosttype=$(echo "$_host" | _egrep_o ' Type="[^"]*' | cut -d '"' -f 2)
-  _hostaddress=$(echo "$_host" | _egrep_o ' Address="[^"]*' | cut -d '"' -f 2 | _xml_decode)
+  _hostaddress=$(echo "$_host" | _egrep_o ' Address="[^"]*' | cut -d '"' -f 2)
   _hostmxpref=$(echo "$_host" | _egrep_o ' MXPref="[^"]*' | cut -d '"' -f 2)
   _hostttl=$(echo "$_host" | _egrep_o ' TTL="[^"]*' | cut -d '"' -f 2)
 
@@ -405,7 +405,3 @@ _namecheap_set_tld_sld() {
   done
 
 }
-
-_xml_decode() {
-  sed 's/"/"/g'
-}

dnsapi/dns_one.sh

@@ -1,9 +1,22 @@
 #!/usr/bin/env sh
-# one.com ui wrapper for acme.sh
+# -*- mode: sh; tab-width: 2; indent-tabs-mode: s; coding: utf-8 -*-
 
+# one.com ui wrapper for acme.sh
+# Author: github: @diseq
+# Created: 2019-02-17
+# Fixed by: @der-berni
+# Modified: 2020-04-07
+#
+#     Use ONECOM_KeepCnameProxy to keep the CNAME DNS record
+#     export ONECOM_KeepCnameProxy="1"
 #
 #     export ONECOM_User="username"
 #     export ONECOM_Password="password"
+#
+# Usage:
+#     acme.sh --issue --dns dns_one -d example.com
+#
+#     only single domain supported atm
 
 dns_one_add() {
   fulldomain=$1
@@ -23,9 +36,27 @@ dns_one_add() {
   subdomain="${_sub_domain}"
   maindomain=${_domain}
 
+  useProxy=0
+  if [ "${_sub_domain}" = "_acme-challenge" ]; then
+    subdomain="proxy${_sub_domain}"
+    useProxy=1
+  fi
+
   _debug subdomain "$subdomain"
   _debug maindomain "$maindomain"
 
+  if [ $useProxy -eq 1 ]; then
+    #Check if the CNAME exists
+    _dns_one_getrecord "CNAME" "$_sub_domain" "$subdomain.$maindomain"
+    if [ -z "$id" ]; then
+      _info "$(__red "Add CNAME Proxy record: '$(__green "\"$_sub_domain\" => \"$subdomain.$maindomain\"")'")"
+      _dns_one_addrecord "CNAME" "$_sub_domain" "$subdomain.$maindomain"
+
+      _info "Not valid yet, let's wait 1 hour to take effect."
+      _sleep 3600
+    fi
+  fi
+
   #Check if the TXT exists
   _dns_one_getrecord "TXT" "$subdomain" "$txtvalue"
   if [ -n "$id" ]; then
@@ -61,8 +92,26 @@ dns_one_rm() {
   subdomain="${_sub_domain}"
   maindomain=${_domain}
 
+  useProxy=0
+  if [ "${_sub_domain}" = "_acme-challenge" ]; then
+    subdomain="proxy${_sub_domain}"
+    useProxy=1
+  fi
+
   _debug subdomain "$subdomain"
   _debug maindomain "$maindomain"
+  if [ $useProxy -eq 1 ]; then
+    if [ "$ONECOM_KeepCnameProxy" = "1" ]; then
+      _info "$(__red "Keeping CNAME Proxy record: '$(__green "\"$_sub_domain\" => \"$subdomain.$maindomain\"")'")"
+    else
+      #Check if the CNAME exists
+      _dns_one_getrecord "CNAME" "$_sub_domain" "$subdomain.$maindomain"
+      if [ -n "$id" ]; then
+        _info "$(__red "Removing CNAME Proxy record: '$(__green "\"$_sub_domain\" => \"$subdomain.$maindomain\"")'")"
+        _dns_one_delrecord "$id"
+      fi
+    fi
+  fi
 
   #Check if the TXT exists
   _dns_one_getrecord "TXT" "$subdomain" "$txtvalue"
@@ -87,7 +136,7 @@ dns_one_rm() {
 # _domain=domain.com
 _get_root() {
   domain="$1"
-  i=1
+  i=2
   p=1
   while true; do
     h=$(printf "%s" "$domain" | cut -d . -f $i-100)
@@ -114,6 +163,8 @@ _get_root() {
 _dns_one_login() {
 
   # get credentials
+  ONECOM_KeepCnameProxy="${ONECOM_KeepCnameProxy:-$(_readaccountconf_mutable ONECOM_KeepCnameProxy)}"
+  ONECOM_KeepCnameProxy="${ONECOM_KeepCnameProxy:-0}"
   ONECOM_User="${ONECOM_User:-$(_readaccountconf_mutable ONECOM_User)}"
   ONECOM_Password="${ONECOM_Password:-$(_readaccountconf_mutable ONECOM_Password)}"
   if [ -z "$ONECOM_User" ] || [ -z "$ONECOM_Password" ]; then
@@ -125,6 +176,7 @@ _dns_one_login() {
   fi
 
   #save the api key and email to the account conf file.
+  _saveaccountconf_mutable ONECOM_KeepCnameProxy "$ONECOM_KeepCnameProxy"
   _saveaccountconf_mutable ONECOM_User "$ONECOM_User"
   _saveaccountconf_mutable ONECOM_Password "$ONECOM_Password"
 

dnsapi/dns_ovh.sh

@@ -248,7 +248,7 @@ _ovh_authentication() {
 # _domain=domain.com
 _get_root() {
   domain=$1
-  i=1
+  i=2
   p=1
   while true; do
     h=$(printf "%s" "$domain" | cut -d . -f $i-100)

dnsapi/dns_pdns.sh

@@ -175,13 +175,13 @@ _get_root() {
   i=1
 
   if _pdns_rest "GET" "/api/v1/servers/$PDNS_ServerId/zones"; then
-    _zones_response=$(echo "$response" | _normalizeJson)
+    _zones_response="$response"
   fi
 
   while true; do
     h=$(printf "%s" "$domain" | cut -d . -f $i-100)
 
-    if _contains "$_zones_response" "\"name\":\"$h.\""; then
+    if _contains "$_zones_response" "\"name\": \"$h.\""; then
       _domain="$h."
       if [ -z "$h" ]; then
         _domain="=2E"

dnsapi/dns_porkbun.sh

@@ -1,157 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#PORKBUN_API_KEY="pk1_0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-#PORKBUN_SECRET_API_KEY="sk1_0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-
-PORKBUN_Api="https://porkbun.com/api/json/v3"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_porkbun_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  PORKBUN_API_KEY="${PORKBUN_API_KEY:-$(_readaccountconf_mutable PORKBUN_API_KEY)}"
-  PORKBUN_SECRET_API_KEY="${PORKBUN_SECRET_API_KEY:-$(_readaccountconf_mutable PORKBUN_SECRET_API_KEY)}"
-
-  if [ -z "$PORKBUN_API_KEY" ] || [ -z "$PORKBUN_SECRET_API_KEY" ]; then
-    PORKBUN_API_KEY=''
-    PORKBUN_SECRET_API_KEY=''
-    _err "You didn't specify a Porkbun api key and secret api key yet."
-    _err "You can get yours from here https://porkbun.com/account/api."
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable PORKBUN_API_KEY "$PORKBUN_API_KEY"
-  _saveaccountconf_mutable PORKBUN_SECRET_API_KEY "$PORKBUN_SECRET_API_KEY"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  # For wildcard cert, the main root domain and the wildcard domain have the same txt subdomain name, so
-  # we can not use updating anymore.
-  #  count=$(printf "%s\n" "$response" | _egrep_o "\"count\":[^,]*" | cut -d : -f 2)
-  #  _debug count "$count"
-  #  if [ "$count" = "0" ]; then
-  _info "Adding record"
-  if _porkbun_rest POST "dns/create/$_domain" "{\"name\":\"$_sub_domain\",\"type\":\"TXT\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-    if _contains "$response" '\"status\":"SUCCESS"'; then
-      _info "Added, OK"
-      return 0
-    elif _contains "$response" "The record already exists"; then
-      _info "Already exists, OK"
-      return 0
-    else
-      _err "Add txt record error. ($response)"
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-#fulldomain txtvalue
-dns_porkbun_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  PORKBUN_API_KEY="${PORKBUN_API_KEY:-$(_readaccountconf_mutable PORKBUN_API_KEY)}"
-  PORKBUN_SECRET_API_KEY="${PORKBUN_SECRET_API_KEY:-$(_readaccountconf_mutable PORKBUN_SECRET_API_KEY)}"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  count=$(echo "$response" | _egrep_o "\"count\": *[^,]*" | cut -d : -f 2 | tr -d " ")
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Don't need to remove."
-  else
-    record_id=$(echo "$response" | tr '{' '\n' | grep "$txtvalue" | cut -d, -f1 | cut -d: -f2 | tr -d \")
-    _debug "record_id" "$record_id"
-    if [ -z "$record_id" ]; then
-      _err "Can not get record id to remove."
-      return 1
-    fi
-    if ! _porkbun_rest POST "dns/delete/$_domain/$record_id"; then
-      _err "Delete record error."
-      return 1
-    fi
-    echo "$response" | tr -d " " | grep '\"status\":"SUCCESS"' >/dev/null
-  fi
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      return 1
-    fi
-
-    if _porkbun_rest POST "dns/retrieve/$h"; then
-      if _contains "$response" "\"status\":\"SUCCESS\""; then
-        _sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")"
-        _domain=$h
-        return 0
-      else
-        _debug "Go to next level of $_domain"
-      fi
-    else
-      _debug "Go to next level of $_domain"
-    fi
-    i=$(_math "$i" + 1)
-  done
-
-  return 1
-}
-
-_porkbun_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  api_key_trimmed=$(echo "$PORKBUN_API_KEY" | tr -d '"')
-  secret_api_key_trimmed=$(echo "$PORKBUN_SECRET_API_KEY" | tr -d '"')
-
-  test -z "$data" && data="{" || data="$(echo $data | cut -d'}' -f1),"
-  data="$data\"apikey\":\"$api_key_trimmed\",\"secretapikey\":\"$secret_api_key_trimmed\"}"
-
-  export _H1="Content-Type: application/json"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$PORKBUN_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$PORKBUN_Api/$ep")"
-  fi
-
-  _sleep 3 # prevent rate limit
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_rackcorp.sh

@@ -1,156 +0,0 @@
-#!/usr/bin/env sh
-
-# Provider: RackCorp (www.rackcorp.com)
-# Author: Stephen Dendtler (sdendtler@rackcorp.com)
-# Report Bugs here: https://github.com/senjoo/acme.sh
-# Alternate email contact: support@rackcorp.com
-#
-# You'll need an API key (Portal: ADMINISTRATION -> API)
-# Set the environment variables as below:
-#
-#    export RACKCORP_APIUUID="UUIDHERE"
-#    export RACKCORP_APISECRET="SECRETHERE"
-#
-
-RACKCORP_API_ENDPOINT="https://api.rackcorp.net/api/rest/v2.4/json.php"
-
-########  Public functions #####################
-
-dns_rackcorp_add() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _debug fulldomain="$fulldomain"
-  _debug txtvalue="$txtvalue"
-
-  if ! _rackcorp_validate; then
-    return 1
-  fi
-
-  _debug "Searching for root zone"
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _lookup "$_lookup"
-  _debug _domain "$_domain"
-
-  _info "Creating TXT record."
-
-  if ! _rackcorp_api dns.record.create "\"name\":\"$_domain\",\"type\":\"TXT\",\"lookup\":\"$_lookup\",\"data\":\"$txtvalue\",\"ttl\":300"; then
-    return 1
-  fi
-
-  return 0
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_rackcorp_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _debug fulldomain="$fulldomain"
-  _debug txtvalue="$txtvalue"
-
-  if ! _rackcorp_validate; then
-    return 1
-  fi
-
-  _debug "Searching for root zone"
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _lookup "$_lookup"
-  _debug _domain "$_domain"
-
-  _info "Creating TXT record."
-
-  if ! _rackcorp_api dns.record.delete "\"name\":\"$_domain\",\"type\":\"TXT\",\"lookup\":\"$_lookup\",\"data\":\"$txtvalue\""; then
-    return 1
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.domain.com
-#returns
-# _lookup=_acme-challenge
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-  if ! _rackcorp_api dns.domain.getall "\"name\":\"$domain\""; then
-    return 1
-  fi
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug searchhost "$h"
-    if [ -z "$h" ]; then
-      _err "Could not find domain for record $domain in RackCorp using the provided credentials"
-      #not valid
-      return 1
-    fi
-
-    _rackcorp_api dns.domain.getall "\"exactName\":\"$h\""
-
-    if _contains "$response" "\"matches\":1"; then
-      if _contains "$response" "\"name\":\"$h\""; then
-        _lookup=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-        _domain="$h"
-        return 0
-      fi
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-
-  return 1
-}
-
-_rackcorp_validate() {
-  RACKCORP_APIUUID="${RACKCORP_APIUUID:-$(_readaccountconf_mutable RACKCORP_APIUUID)}"
-  if [ -z "$RACKCORP_APIUUID" ]; then
-    RACKCORP_APIUUID=""
-    _err "You require a RackCorp API UUID (export RACKCORP_APIUUID=\"<api uuid>\")"
-    _err "Please login to the portal and create an API key and try again."
-    return 1
-  fi
-
-  _saveaccountconf_mutable RACKCORP_APIUUID "$RACKCORP_APIUUID"
-
-  RACKCORP_APISECRET="${RACKCORP_APISECRET:-$(_readaccountconf_mutable RACKCORP_APISECRET)}"
-  if [ -z "$RACKCORP_APISECRET" ]; then
-    RACKCORP_APISECRET=""
-    _err "You require a RackCorp API secret (export RACKCORP_APISECRET=\"<api secret>\")"
-    _err "Please login to the portal and create an API key and try again."
-    return 1
-  fi
-
-  _saveaccountconf_mutable RACKCORP_APISECRET "$RACKCORP_APISECRET"
-
-  return 0
-}
-_rackcorp_api() {
-  _rackcorpcmd=$1
-  _rackcorpinputdata=$2
-  _debug cmd "$_rackcorpcmd $_rackcorpinputdata"
-
-  export _H1="Accept: application/json"
-  response="$(_post "{\"APIUUID\":\"$RACKCORP_APIUUID\",\"APISECRET\":\"$RACKCORP_APISECRET\",\"cmd\":\"$_rackcorpcmd\",$_rackcorpinputdata}" "$RACKCORP_API_ENDPOINT" "" "POST")"
-
-  if [ "$?" != "0" ]; then
-    _err "error $response"
-    return 1
-  fi
-  _debug2 response "$response"
-  if _contains "$response" "\"code\":\"OK\""; then
-    _debug code "OK"
-  else
-    _debug code "FAILED"
-    response=""
-    return 1
-  fi
-  return 0
-}

dnsapi/dns_scaleway.sh

@@ -1,176 +0,0 @@
-#!/usr/bin/env sh
-
-# Scaleway API
-# https://developers.scaleway.com/en/products/domain/dns/api/
-#
-# Requires Scaleway API token set in SCALEWAY_API_TOKEN
-
-########  Public functions #####################
-
-SCALEWAY_API="https://api.scaleway.com/domain/v2beta1"
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_scaleway_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _scaleway_check_config; then
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _info "Adding record"
-  _scaleway_create_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
-  if _contains "$response" "records"; then
-    return 0
-  else
-    _err error "$response"
-    return 1
-  fi
-  _info "Record added."
-
-  return 0
-}
-
-dns_scaleway_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _scaleway_check_config; then
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _info "Deleting record"
-  _scaleway_delete_TXT_record "$_domain" "$_sub_domain" "$txtvalue"
-  if _contains "$response" "records"; then
-    return 0
-  else
-    _err error "$response"
-    return 1
-  fi
-  _info "Record deleted."
-
-  return 0
-}
-
-####################  Private functions below ##################################
-
-_scaleway_check_config() {
-  SCALEWAY_API_TOKEN="${SCALEWAY_API_TOKEN:-$(_readaccountconf_mutable SCALEWAY_API_TOKEN)}"
-  if [ -z "$SCALEWAY_API_TOKEN" ]; then
-    _err "No API key specified for Scaleway API."
-    _err "Create your key and export it as SCALEWAY_API_TOKEN"
-    return 1
-  fi
-  if ! _scaleway_rest GET "dns-zones"; then
-    _err "Invalid API key specified for Scaleway API."
-    return 1
-  fi
-
-  _saveaccountconf_mutable SCALEWAY_API_TOKEN "$SCALEWAY_API_TOKEN"
-
-  return 0
-}
-
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    _scaleway_rest GET "dns-zones/$h/records"
-
-    if ! _contains "$response" "subdomain not found" >/dev/null; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain="$h"
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  _err "Unable to retrive DNS zone matching this domain"
-  return 1
-}
-
-# this function add a TXT record
-_scaleway_create_TXT_record() {
-  txt_zone=$1
-  txt_name=$2
-  txt_value=$3
-
-  _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"add\":{\"records\":[{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\",\"ttl\":60}]}}]}"
-
-  if _contains "$response" "records"; then
-    return 0
-  else
-    _err "error1 $response"
-    return 1
-  fi
-}
-
-# this function delete a TXT record based on name and content
-_scaleway_delete_TXT_record() {
-  txt_zone=$1
-  txt_name=$2
-  txt_value=$3
-
-  _scaleway_rest PATCH "dns-zones/$txt_zone/records" "{\"return_all_records\":false,\"changes\":[{\"delete\":{\"id_fields\":{\"name\":\"$txt_name\",\"data\":\"$txt_value\",\"type\":\"TXT\"}}}]}"
-
-  if _contains "$response" "records"; then
-    return 0
-  else
-    _err "error2 $response"
-    return 1
-  fi
-}
-
-_scaleway_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-  _scaleway_url="$SCALEWAY_API/$ep"
-  _debug2 _scaleway_url "$_scaleway_url"
-  export _H1="x-auth-token: $SCALEWAY_API_TOKEN"
-  export _H2="Accept: application/json"
-  export _H3="Content-Type: application/json"
-
-  if [ "$data" ] || [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$_scaleway_url" "" "$m")"
-  else
-    response="$(_get "$_scaleway_url")"
-  fi
-  if [ "$?" != "0" ] || _contains "$response" "denied_authentication" || _contains "$response" "Method not allowed" || _contains "$response" "json parse error: unexpected EOF"; then
-    _err "error $response"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

dnsapi/dns_servercow.sh

@@ -49,42 +49,16 @@ dns_servercow_add() {
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
-  # check whether a txt record already exists for the subdomain
+  if _servercow_api POST "$_domain" "{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"ttl\":20}"; then
-  if printf -- "%s" "$response" | grep "{\"name\":\"$_sub_domain\",\"ttl\":20,\"type\":\"TXT\"" >/dev/null; then
+    if printf -- "%s" "$response" | grep "ok" >/dev/null; then
-    _info "A txt record with the same name already exists."
+      _info "Added, OK"
-    # trim the string on the left
+      return 0
-    txtvalue_old=${response#*{\"name\":\"$_sub_domain\",\"ttl\":20,\"type\":\"TXT\",\"content\":\"}
+    else
-    # trim the string on the right
+      _err "add txt record error."
-    txtvalue_old=${txtvalue_old%%\"*}
+      return 1
-
-    _debug txtvalue_old "$txtvalue_old"
-
-    _info "Add the new txtvalue to the existing txt record."
-    if _servercow_api POST "$_domain" "{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":[\"$txtvalue\",\"$txtvalue_old\"],\"ttl\":20}"; then
-      if printf -- "%s" "$response" | grep "ok" >/dev/null; then
-        _info "Added additional txtvalue, OK"
-        return 0
-      else
-        _err "add txt record error."
-        return 1
-      fi
     fi
-    _err "add txt record error."
-    return 1
-  else
-    _info "There is no txt record with the name yet."
-    if _servercow_api POST "$_domain" "{\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"ttl\":20}"; then
-      if printf -- "%s" "$response" | grep "ok" >/dev/null; then
-        _info "Added, OK"
-        return 0
-      else
-        _err "add txt record error."
-        return 1
-      fi
-    fi
-    _err "add txt record error."
-    return 1
   fi
+  _err "add txt record error."
 
   return 1
 }

dnsapi/dns_simply.sh

@@ -1,261 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#SIMPLY_AccountName="accountname"
-#
-#SIMPLY_ApiKey="apikey"
-#
-#SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
-SIMPLY_Api_Default="https://api.simply.com/1"
-
-#This is used for determining success of REST call
-SIMPLY_SUCCESS_CODE='"status": 200'
-
-########  Public functions #####################
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_simply_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _simply_load_config; then
-    return 1
-  fi
-
-  _simply_save_config
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _info "Adding record"
-
-  if ! _simply_add_record "$_domain" "$_sub_domain" "$txtvalue"; then
-    _err "Could not add DNS record"
-    return 1
-  fi
-  return 0
-}
-
-dns_simply_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if ! _simply_load_config; then
-    return 1
-  fi
-
-  _simply_save_config
-
-  _debug "First detect the root zone"
-
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug txtvalue "$txtvalue"
-
-  _info "Getting all existing records"
-
-  if ! _simply_get_all_records "$_domain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  records=$(echo "$response" | tr '{' "\n" | grep 'record_id\|type\|data\|\name' | sed 's/\"record_id/;\"record_id/' | tr "\n" ' ' | tr -d ' ' | tr ';' ' ')
-
-  nr_of_deleted_records=0
-  _info "Fetching txt record"
-
-  for record in $records; do
-    _debug record "$record"
-
-    record_data=$(echo "$record" | cut -d "," -f 3 | sed 's/"//g' | grep "data" | cut -d ":" -f 2)
-    record_type=$(echo "$record" | cut -d "," -f 4 | sed 's/"//g' | grep "type" | cut -d ":" -f 2)
-
-    _debug2 record_data "$record_data"
-    _debug2 record_type "$record_type"
-
-    if [ "$record_data" = "$txtvalue" ] && [ "$record_type" = "TXT" ]; then
-
-      record_id=$(echo "$record" | cut -d "," -f 1 | grep "record_id" | cut -d ":" -f 2)
-
-      _info "Deleting record $record"
-      _debug2 record_id "$record_id"
-
-      if [ "$record_id" -gt 0 ]; then
-
-        if ! _simply_delete_record "$_domain" "$_sub_domain" "$record_id"; then
-          _err "Record with id $record_id could not be deleted"
-          return 1
-        fi
-
-        nr_of_deleted_records=1
-        break
-      else
-        _err "Fetching record_id could not be done, this should not happen, exiting function. Failing record is $record"
-        break
-      fi
-    fi
-
-  done
-
-  if [ "$nr_of_deleted_records" -eq 0 ]; then
-    _err "No record deleted, the DNS record needs to be removed manually."
-  else
-    _info "Deleted $nr_of_deleted_records record"
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-
-_simply_load_config() {
-  SIMPLY_Api="${SIMPLY_Api:-$(_readaccountconf_mutable SIMPLY_Api)}"
-  SIMPLY_AccountName="${SIMPLY_AccountName:-$(_readaccountconf_mutable SIMPLY_AccountName)}"
-  SIMPLY_ApiKey="${SIMPLY_ApiKey:-$(_readaccountconf_mutable SIMPLY_ApiKey)}"
-
-  if [ -z "$SIMPLY_Api" ]; then
-    SIMPLY_Api="$SIMPLY_Api_Default"
-  fi
-
-  if [ -z "$SIMPLY_AccountName" ] || [ -z "$SIMPLY_ApiKey" ]; then
-    SIMPLY_AccountName=""
-    SIMPLY_ApiKey=""
-
-    _err "A valid Simply API account and apikey not provided."
-    _err "Please provide a valid API user and try again."
-
-    return 1
-  fi
-
-  return 0
-}
-
-_simply_save_config() {
-  if [ "$SIMPLY_Api" != "$SIMPLY_Api_Default" ]; then
-    _saveaccountconf_mutable SIMPLY_Api "$SIMPLY_Api"
-  fi
-  _saveaccountconf_mutable SIMPLY_AccountName "$SIMPLY_AccountName"
-  _saveaccountconf_mutable SIMPLY_ApiKey "$SIMPLY_ApiKey"
-}
-
-_simply_get_all_records() {
-  domain=$1
-
-  if ! _simply_rest GET "my/products/$domain/dns/records"; then
-    return 1
-  fi
-
-  return 0
-}
-
-_get_root() {
-  domain=$1
-  i=2
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _simply_rest GET "my/products/$h/dns"; then
-      return 1
-    fi
-
-    if ! _contains "$response" "$SIMPLY_SUCCESS_CODE"; then
-      _debug "$h not found"
-    else
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain="$h"
-      return 0
-    fi
-    p="$i"
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_simply_add_record() {
-  domain=$1
-  sub_domain=$2
-  txtval=$3
-
-  data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
-
-  if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
-    _err "Adding record not successfull!"
-    return 1
-  fi
-
-  if ! _contains "$response" "$SIMPLY_SUCCESS_CODE"; then
-    _err "Call to API not sucessfull, see below message for more details"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-_simply_delete_record() {
-  domain=$1
-  sub_domain=$2
-  record_id=$3
-
-  _debug record_id "Delete record with id $record_id"
-
-  if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
-    _err "Deleting record not successfull!"
-    return 1
-  fi
-
-  if ! _contains "$response" "$SIMPLY_SUCCESS_CODE"; then
-    _err "Call to API not sucessfull, see below message for more details"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-_simply_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-
-  _debug2 data "$data"
-  _debug2 ep "$ep"
-  _debug2 m "$m"
-
-  export _H1="Content-Type: application/json"
-
-  if [ "$m" != "GET" ]; then
-    response="$(_post "$data" "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep" "" "$m")"
-  else
-    response="$(_get "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-
-  _debug2 response "$response"
-
-  if _contains "$response" "Invalid account authorization"; then
-    _err "It seems that your api key or accountnumber is not correct."
-    return 1
-  fi
-
-  return 0
-}

dnsapi/dns_websupport.sh

@@ -1,207 +0,0 @@
-#!/usr/bin/env sh
-
-# Acme.sh DNS API wrapper for websupport.sk
-#
-# Original author: trgo.sk (https://github.com/trgosk)
-# Tweaks by: akulumbeg (https://github.com/akulumbeg)
-# Report Bugs here: https://github.com/akulumbeg/acme.sh
-
-# Requirements: API Key and Secret from https://admin.websupport.sk/en/auth/apiKey
-#
-# WS_ApiKey="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-# (called "Identifier" in the WS Admin)
-#
-# WS_ApiSecret="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-# (called "Secret key" in the WS Admin)
-
-WS_Api="https://rest.websupport.sk"
-
-########  Public functions #####################
-
-dns_websupport_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  WS_ApiKey="${WS_ApiKey:-$(_readaccountconf_mutable WS_ApiKey)}"
-  WS_ApiSecret="${WS_ApiSecret:-$(_readaccountconf_mutable WS_ApiSecret)}"
-
-  if [ "$WS_ApiKey" ] && [ "$WS_ApiSecret" ]; then
-    _saveaccountconf_mutable WS_ApiKey "$WS_ApiKey"
-    _saveaccountconf_mutable WS_ApiSecret "$WS_ApiSecret"
-  else
-    WS_ApiKey=""
-    WS_ApiSecret=""
-    _err "You did not specify the API Key and/or API Secret"
-    _err "You can get the API login credentials from https://admin.websupport.sk/en/auth/apiKey"
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  # For wildcard cert, the main root domain and the wildcard domain have the same txt subdomain name, so
-  # we can not use updating anymore.
-  #  count=$(printf "%s\n" "$response" | _egrep_o "\"count\":[^,]*" | cut -d : -f 2)
-  #  _debug count "$count"
-  #  if [ "$count" = "0" ]; then
-  _info "Adding record"
-  if _ws_rest POST "/v1/user/self/zone/$_domain/record" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-    if _contains "$response" "$txtvalue"; then
-      _info "Added, OK"
-      return 0
-    elif _contains "$response" "The record already exists"; then
-      _info "Already exists, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-dns_websupport_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _debug2 fulldomain "$fulldomain"
-  _debug2 txtvalue "$txtvalue"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _ws_rest GET "/v1/user/self/zone/$_domain/record"
-
-  if [ "$(printf "%s" "$response" | tr -d " " | grep -c \"items\")" -lt "1" ]; then
-    _err "Error: $response"
-    return 1
-  fi
-
-  record_line="$(_get_from_array "$response" "$txtvalue")"
-  _debug record_line "$record_line"
-  if [ -z "$record_line" ]; then
-    _info "Don't need to remove."
-  else
-    record_id=$(echo "$record_line" | _egrep_o "\"id\": *[^,]*" | _head_n 1 | cut -d : -f 2 | tr -d \" | tr -d " ")
-    _debug "record_id" "$record_id"
-    if [ -z "$record_id" ]; then
-      _err "Can not get record id to remove."
-      return 1
-    fi
-    if ! _ws_rest DELETE "/v1/user/self/zone/$_domain/record/$record_id"; then
-      _err "Delete record error."
-      return 1
-    fi
-    if [ "$(printf "%s" "$response" | tr -d " " | grep -c \"success\")" -lt "1" ]; then
-      return 1
-    else
-      return 0
-    fi
-  fi
-
-}
-
-####################  Private Functions ##################################
-
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _ws_rest GET "/v1/user/self/zone"; then
-      return 1
-    fi
-
-    if _contains "$response" "\"name\":\"$h\""; then
-      _domain_id=$(echo "$response" | _egrep_o "\[.\"id\": *[^,]*" | _head_n 1 | cut -d : -f 2 | tr -d \" | tr -d " ")
-      if [ "$_domain_id" ]; then
-        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-        _domain=$h
-        return 0
-      fi
-      return 1
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_ws_rest() {
-  me=$1
-  pa="$2"
-  da="$3"
-
-  _debug2 api_key "$WS_ApiKey"
-  _debug2 api_secret "$WS_ApiSecret"
-
-  timestamp=$(_time)
-  datez="$(_utc_date | sed "s/ /T/" | sed "s/$/+0000/")"
-  canonical_request="${me} ${pa} ${timestamp}"
-  signature_hash=$(printf "%s" "$canonical_request" | _hmac sha1 "$(printf "%s" "$WS_ApiSecret" | _hex_dump | tr -d " ")" hex)
-  basicauth="$(printf "%s:%s" "$WS_ApiKey" "$signature_hash" | _base64)"
-
-  _debug2 method "$me"
-  _debug2 path "$pa"
-  _debug2 data "$da"
-  _debug2 timestamp "$timestamp"
-  _debug2 datez "$datez"
-  _debug2 canonical_request "$canonical_request"
-  _debug2 signature_hash "$signature_hash"
-  _debug2 basicauth "$basicauth"
-
-  export _H1="Accept: application/json"
-  export _H2="Content-Type: application/json"
-  export _H3="Authorization: Basic ${basicauth}"
-  export _H4="Date: ${datez}"
-
-  _debug2 H1 "$_H1"
-  _debug2 H2 "$_H2"
-  _debug2 H3 "$_H3"
-  _debug2 H4 "$_H4"
-
-  if [ "$me" != "GET" ]; then
-    _debug2 "${me} $WS_Api${pa}"
-    _debug data "$da"
-    response="$(_post "$da" "${WS_Api}${pa}" "" "$me")"
-  else
-    _debug2 "GET $WS_Api${pa}"
-    response="$(_get "$WS_Api${pa}")"
-  fi
-
-  _debug2 response "$response"
-  return "$?"
-}
-
-_get_from_array() {
-  va="$1"
-  fi="$2"
-  for i in $(echo "$va" | sed "s/{/ /g"); do
-    if _contains "$i" "$fi"; then
-      echo "$i"
-      break
-    fi
-  done
-}

dnsapi/dns_world4you.sh

@@ -1,210 +0,0 @@
-#!/usr/bin/env sh
-
-# World4You - www.world4you.com
-# Lorenz Stechauner, 2020 - https://www.github.com/NerLOR
-
-WORLD4YOU_API="https://my.world4you.com/en"
-PAKETNR=''
-TLD=''
-RECORD=''
-
-################ Public functions ################
-
-# Usage: dns_world4you_add <fqdn> <value>
-dns_world4you_add() {
-  fqdn="$1"
-  value="$2"
-  _info "Using world4you to add record"
-  _debug fulldomain "$fqdn"
-  _debug txtvalue "$value"
-
-  _login
-  if [ "$?" != 0 ]; then
-    return 1
-  fi
-
-  export _H1="Cookie: W4YSESSID=$sessid"
-  form=$(_get "$WORLD4YOU_API/dashboard/paketuebersicht")
-  _get_paketnr "$fqdn" "$form"
-  paketnr="$PAKETNR"
-  if [ -z "$paketnr" ]; then
-    _err "Unable to parse paketnr"
-    return 3
-  fi
-  _debug paketnr "$paketnr"
-
-  export _H1="Cookie: W4YSESSID=$sessid"
-  form=$(_get "$WORLD4YOU_API/$paketnr/dns")
-  formiddp=$(echo "$form" | grep 'AddDnsRecordForm\[uniqueFormIdDP\]' | sed 's/^.*name="AddDnsRecordForm\[uniqueFormIdDP\]" value="\([^"]*\)".*$/\1/')
-  formidttl=$(echo "$form" | grep 'AddDnsRecordForm\[uniqueFormIdTTL\]' | sed 's/^.*name="AddDnsRecordForm\[uniqueFormIdTTL\]" value="\([^"]*\)".*$/\1/')
-  form_token=$(echo "$form" | grep 'AddDnsRecordForm\[_token\]' | sed 's/^.*name="AddDnsRecordForm\[_token\]" value="\([^"]*\)".*$/\1/')
-  if [ -z "$formiddp" ]; then
-    _err "Unable to parse form"
-    return 3
-  fi
-
-  _resethttp
-  export ACME_HTTP_NO_REDIRECTS=1
-  body="AddDnsRecordForm[name]=$RECORD&AddDnsRecordForm[dnsType][type]=TXT&\
-AddDnsRecordForm[value]=$value&AddDnsRecordForm[aktivPaket]=$paketnr&AddDnsRecordForm[uniqueFormIdDP]=$formiddp&\
-AddDnsRecordForm[uniqueFormIdTTL]=$formidttl&AddDnsRecordForm[_token]=$form_token"
-  _info "Adding record..."
-  ret=$(_post "$body" "$WORLD4YOU_API/$paketnr/dns" '' POST 'application/x-www-form-urlencoded')
-  _resethttp
-
-  if _contains "$(_head_n 3 <"$HTTP_HEADER")" '302'; then
-    res=$(_get "$WORLD4YOU_API/$paketnr/dns")
-    if _contains "$res" "successfully"; then
-      return 0
-    else
-      msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/')
-      if _contains "$msg" '^<\!DOCTYPE html>'; then
-        msg='Unknown error'
-      fi
-      _err "Unable to add record: $msg"
-      if _contains "$msg" '^<\!DOCTYPE html>'; then
-        echo "$ret" >'error-01.html'
-        echo "$res" >'error-02.html'
-        _err "View error-01.html and error-02.html for debugging"
-      fi
-      return 1
-    fi
-  else
-    _err "$(_head_n 3 <"$HTTP_HEADER")"
-    _err "View $HTTP_HEADER for debugging"
-    return 1
-  fi
-}
-
-# Usage: dns_world4you_rm <fqdn> <value>
-dns_world4you_rm() {
-  fqdn="$1"
-  value="$2"
-  _info "Using world4you to remove record"
-  _debug fulldomain "$fqdn"
-  _debug txtvalue "$value"
-
-  _login
-  if [ "$?" != 0 ]; then
-    return 1
-  fi
-
-  export _H1="Cookie: W4YSESSID=$sessid"
-  form=$(_get "$WORLD4YOU_API/dashboard/paketuebersicht")
-  _get_paketnr "$fqdn" "$form"
-  paketnr="$PAKETNR"
-  if [ -z "$paketnr" ]; then
-    _err "Unable to parse paketnr"
-    return 3
-  fi
-  _debug paketnr "$paketnr"
-
-  form=$(_get "$WORLD4YOU_API/$paketnr/dns")
-  formiddp=$(echo "$form" | grep 'DeleteDnsRecordForm\[uniqueFormIdDP\]' | sed 's/^.*name="DeleteDnsRecordForm\[uniqueFormIdDP\]" value="\([^"]*\)".*$/\1/')
-  formidttl=$(echo "$form" | grep 'DeleteDnsRecordForm\[uniqueFormIdTTL\]' | sed 's/^.*name="DeleteDnsRecordForm\[uniqueFormIdTTL\]" value="\([^"]*\)".*$/\1/')
-  form_token=$(echo "$form" | grep 'DeleteDnsRecordForm\[_token\]' | sed 's/^.*name="DeleteDnsRecordForm\[_token\]" value="\([^"]*\)".*$/\1/')
-  if [ -z "$formiddp" ]; then
-    _err "Unable to parse form"
-    return 3
-  fi
-
-  recordid=$(printf "TXT:%s.:\"%s\"" "$fqdn" "$value" | _base64)
-  _debug recordid "$recordid"
-
-  _resethttp
-  export ACME_HTTP_NO_REDIRECTS=1
-  body="DeleteDnsRecordForm[recordId]=$recordid&DeleteDnsRecordForm[aktivPaket]=$paketnr&\
-DeleteDnsRecordForm[uniqueFormIdDP]=$formiddp&DeleteDnsRecordForm[uniqueFormIdTTL]=$formidttl&\
-DeleteDnsRecordForm[_token]=$form_token"
-  _info "Removing record..."
-  ret=$(_post "$body" "$WORLD4YOU_API/$paketnr/deleteRecord" '' POST 'application/x-www-form-urlencoded')
-  _resethttp
-
-  if _contains "$(_head_n 3 <"$HTTP_HEADER")" '302'; then
-    res=$(_get "$WORLD4YOU_API/$paketnr/dns")
-    if _contains "$res" "successfully"; then
-      return 0
-    else
-      msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/')
-      if _contains "$msg" '^<\!DOCTYPE html>'; then
-        msg='Unknown error'
-      fi
-      _err "Unable to remove record: $msg"
-      if _contains "$msg" '^<\!DOCTYPE html>'; then
-        echo "$ret" >'error-01.html'
-        echo "$res" >'error-02.html'
-        _err "View error-01.html and error-02.html for debugging"
-      fi
-      return 1
-    fi
-  else
-    _err "$(_head_n 3 <"$HTTP_HEADER")"
-    _err "View $HTTP_HEADER for debugging"
-    return 1
-  fi
-}
-
-################ Private functions ################
-
-# Usage: _login
-_login() {
-  WORLD4YOU_USERNAME="${WORLD4YOU_USERNAME:-$(_readaccountconf_mutable WORLD4YOU_USERNAME)}"
-  WORLD4YOU_PASSWORD="${WORLD4YOU_PASSWORD:-$(_readaccountconf_mutable WORLD4YOU_PASSWORD)}"
-
-  if [ -z "$WORLD4YOU_USERNAME" ] || [ -z "$WORLD4YOU_PASSWORD" ]; then
-    WORLD4YOU_USERNAME=""
-    WORLD4YOU_PASSWORD=""
-    _err "You didn't specify world4you username and password yet."
-    _err "Usage: export WORLD4YOU_USERNAME=<name>"
-    _err "Usage: export WORLD4YOU_PASSWORD=<password>"
-    return 1
-  fi
-
-  _saveaccountconf_mutable WORLD4YOU_USERNAME "$WORLD4YOU_USERNAME"
-  _saveaccountconf_mutable WORLD4YOU_PASSWORD "$WORLD4YOU_PASSWORD"
-
-  _info "Logging in..."
-
-  username="$WORLD4YOU_USERNAME"
-  password="$WORLD4YOU_PASSWORD"
-  csrf_token=$(_get "$WORLD4YOU_API/login" | grep '_csrf_token' | sed 's/^.*<input[^>]*value=\"\([^"]*\)\".*$/\1/')
-  sessid=$(grep 'W4YSESSID' <"$HTTP_HEADER" | sed 's/^.*W4YSESSID=\([^;]*\);.*$/\1/')
-
-  export _H1="Cookie: W4YSESSID=$sessid"
-  export _H2="X-Requested-With: XMLHttpRequest"
-  body="_username=$username&_password=$password&_csrf_token=$csrf_token"
-  ret=$(_post "$body" "$WORLD4YOU_API/login" '' POST 'application/x-www-form-urlencoded')
-  unset _H2
-  _debug ret "$ret"
-  if _contains "$ret" "\"success\":true"; then
-    _info "Successfully logged in"
-    sessid=$(grep 'W4YSESSID' <"$HTTP_HEADER" | sed 's/^.*W4YSESSID=\([^;]*\);.*$/\1/')
-  else
-    _err "Unable to log in: $(echo "$ret" | sed 's/^.*"message":"\([^\"]*\)".*$/\1/')"
-    return 1
-  fi
-}
-
-# Usage _get_paketnr <fqdn> <form>
-_get_paketnr() {
-  fqdn="$1"
-  form="$2"
-
-  domains=$(echo "$form" | grep '^ *[A-Za-z0-9_\.-]*\.[A-Za-z0-9_-]*$' | sed 's/^\s*\(\S*\)$/\1/')
-  domain=''
-  for domain in $domains; do
-    if _contains "$fqdn" "$domain\$"; then
-      break
-    fi
-    domain=''
-  done
-  if [ -z "$domain" ]; then
-    return 1
-  fi
-
-  TLD="$domain"
-  _debug domain "$domain"
-  RECORD=$(echo "$fqdn" | cut -c"1-$((${#fqdn} - ${#TLD} - 1))")
-  PAKETNR=$(echo "$form" | grep "data-textfilter=\".* $domain " | _head_n 1 | sed 's/^.* \([0-9]*\) .*$/\1/')
-  return 0
-}

notify/mail.sh

@@ -79,7 +79,7 @@ mail_send() {
 _mail_bin() {
   _MAIL_BIN=""
 
-  for b in $MAIL_BIN sendmail ssmtp mutt mail msmtp; do
+  for b in "$MAIL_BIN" sendmail ssmtp mutt mail msmtp; do
     if _exists "$b"; then
       _MAIL_BIN="$b"
       break

notify/smtp.sh

@@ -2,398 +2,14 @@
 
 # support smtp
 
-# Please report bugs to https://github.com/acmesh-official/acme.sh/issues/3358
-
-# This implementation uses either curl or Python (3 or 2.7).
-# (See also the "mail" notify hook, which supports other ways to send mail.)
-
-# SMTP_FROM="from@example.com"  # required
-# SMTP_TO="to@example.com"  # required
-# SMTP_HOST="smtp.example.com"  # required
-# SMTP_PORT="25"  # defaults to 25, 465 or 587 depending on SMTP_SECURE
-# SMTP_SECURE="tls"  # one of "none", "ssl" (implicit TLS, TLS Wrapper), "tls" (explicit TLS, STARTTLS)
-# SMTP_USERNAME=""  # set if SMTP server requires login
-# SMTP_PASSWORD=""  # set if SMTP server requires login
-# SMTP_TIMEOUT="30"  # seconds for SMTP operations to timeout
-# SMTP_BIN="/path/to/python_or_curl"  # default finds first of python3, python2.7, python, pypy3, pypy, curl on PATH
-
-SMTP_SECURE_DEFAULT="tls"
-SMTP_TIMEOUT_DEFAULT="30"
-
-# subject content statuscode
 smtp_send() {
-  SMTP_SUBJECT="$1"
+  _subject="$1"
-  SMTP_CONTENT="$2"
+  _content="$2"
-  # UNUSED: _statusCode="$3" # 0: success, 1: error 2($RENEW_SKIP): skipped
+  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
+  _debug "_subject" "$_subject"
+  _debug "_content" "$_content"
+  _debug "_statusCode" "$_statusCode"
 
-  # Load and validate config:
+  _err "Not implemented yet."
-  SMTP_BIN="$(_readaccountconf_mutable_default SMTP_BIN)"
+  return 1
-  if [ -n "$SMTP_BIN" ] && ! _exists "$SMTP_BIN"; then
-    _err "SMTP_BIN '$SMTP_BIN' does not exist."
-    return 1
-  fi
-  if [ -z "$SMTP_BIN" ]; then
-    # Look for a command that can communicate with an SMTP server.
-    # (Please don't add sendmail, ssmtp, mutt, mail, or msmtp here.
-    # Those are already handled by the "mail" notify hook.)
-    for cmd in python3 python2.7 python pypy3 pypy curl; do
-      if _exists "$cmd"; then
-        SMTP_BIN="$cmd"
-        break
-      fi
-    done
-    if [ -z "$SMTP_BIN" ]; then
-      _err "The smtp notify-hook requires curl or Python, but can't find any."
-      _err 'If you have one of them, define SMTP_BIN="/path/to/curl_or_python".'
-      _err 'Otherwise, see if you can use the "mail" notify-hook instead.'
-      return 1
-    fi
-  fi
-  _debug SMTP_BIN "$SMTP_BIN"
-  _saveaccountconf_mutable_default SMTP_BIN "$SMTP_BIN"
-
-  SMTP_FROM="$(_readaccountconf_mutable_default SMTP_FROM)"
-  SMTP_FROM="$(_clean_email_header "$SMTP_FROM")"
-  if [ -z "$SMTP_FROM" ]; then
-    _err "You must define SMTP_FROM as the sender email address."
-    return 1
-  fi
-  if _email_has_display_name "$SMTP_FROM"; then
-    _err "SMTP_FROM must be only a simple email address (sender@example.com)."
-    _err "Change your SMTP_FROM='$SMTP_FROM' to remove the display name."
-    return 1
-  fi
-  _debug SMTP_FROM "$SMTP_FROM"
-  _saveaccountconf_mutable_default SMTP_FROM "$SMTP_FROM"
-
-  SMTP_TO="$(_readaccountconf_mutable_default SMTP_TO)"
-  SMTP_TO="$(_clean_email_header "$SMTP_TO")"
-  if [ -z "$SMTP_TO" ]; then
-    _err "You must define SMTP_TO as the recipient email address(es)."
-    return 1
-  fi
-  if _email_has_display_name "$SMTP_TO"; then
-    _err "SMTP_TO must be only simple email addresses (to@example.com,to2@example.com)."
-    _err "Change your SMTP_TO='$SMTP_TO' to remove the display name(s)."
-    return 1
-  fi
-  _debug SMTP_TO "$SMTP_TO"
-  _saveaccountconf_mutable_default SMTP_TO "$SMTP_TO"
-
-  SMTP_HOST="$(_readaccountconf_mutable_default SMTP_HOST)"
-  if [ -z "$SMTP_HOST" ]; then
-    _err "You must define SMTP_HOST as the SMTP server hostname."
-    return 1
-  fi
-  _debug SMTP_HOST "$SMTP_HOST"
-  _saveaccountconf_mutable_default SMTP_HOST "$SMTP_HOST"
-
-  SMTP_SECURE="$(_readaccountconf_mutable_default SMTP_SECURE "$SMTP_SECURE_DEFAULT")"
-  case "$SMTP_SECURE" in
-  "none") smtp_port_default="25" ;;
-  "ssl") smtp_port_default="465" ;;
-  "tls") smtp_port_default="587" ;;
-  *)
-    _err "Invalid SMTP_SECURE='$SMTP_SECURE'. It must be 'ssl', 'tls' or 'none'."
-    return 1
-    ;;
-  esac
-  _debug SMTP_SECURE "$SMTP_SECURE"
-  _saveaccountconf_mutable_default SMTP_SECURE "$SMTP_SECURE" "$SMTP_SECURE_DEFAULT"
-
-  SMTP_PORT="$(_readaccountconf_mutable_default SMTP_PORT "$smtp_port_default")"
-  case "$SMTP_PORT" in
-  *[!0-9]*)
-    _err "Invalid SMTP_PORT='$SMTP_PORT'. It must be a port number."
-    return 1
-    ;;
-  esac
-  _debug SMTP_PORT "$SMTP_PORT"
-  _saveaccountconf_mutable_default SMTP_PORT "$SMTP_PORT" "$smtp_port_default"
-
-  SMTP_USERNAME="$(_readaccountconf_mutable_default SMTP_USERNAME)"
-  _debug SMTP_USERNAME "$SMTP_USERNAME"
-  _saveaccountconf_mutable_default SMTP_USERNAME "$SMTP_USERNAME"
-
-  SMTP_PASSWORD="$(_readaccountconf_mutable_default SMTP_PASSWORD)"
-  _secure_debug SMTP_PASSWORD "$SMTP_PASSWORD"
-  _saveaccountconf_mutable_default SMTP_PASSWORD "$SMTP_PASSWORD"
-
-  SMTP_TIMEOUT="$(_readaccountconf_mutable_default SMTP_TIMEOUT "$SMTP_TIMEOUT_DEFAULT")"
-  _debug SMTP_TIMEOUT "$SMTP_TIMEOUT"
-  _saveaccountconf_mutable_default SMTP_TIMEOUT "$SMTP_TIMEOUT" "$SMTP_TIMEOUT_DEFAULT"
-
-  SMTP_X_MAILER="$(_clean_email_header "$PROJECT_NAME $VER --notify-hook smtp")"
-
-  # Run with --debug 2 (or above) to echo the transcript of the SMTP session.
-  # Careful: this may include SMTP_PASSWORD in plaintext!
-  if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_2" ]; then
-    SMTP_SHOW_TRANSCRIPT="True"
-  else
-    SMTP_SHOW_TRANSCRIPT=""
-  fi
-
-  SMTP_SUBJECT=$(_clean_email_header "$SMTP_SUBJECT")
-  _debug SMTP_SUBJECT "$SMTP_SUBJECT"
-  _debug SMTP_CONTENT "$SMTP_CONTENT"
-
-  # Send the message:
-  case "$(basename "$SMTP_BIN")" in
-  curl) _smtp_send=_smtp_send_curl ;;
-  py*) _smtp_send=_smtp_send_python ;;
-  *)
-    _err "Can't figure out how to invoke '$SMTP_BIN'."
-    _err "Check your SMTP_BIN setting."
-    return 1
-    ;;
-  esac
-
-  if ! smtp_output="$($_smtp_send)"; then
-    _err "Error sending message with $SMTP_BIN."
-    if [ -n "$smtp_output" ]; then
-      _err "$smtp_output"
-    fi
-    return 1
-  fi
-
-  return 0
-}
-
-# Strip CR and NL from text to prevent MIME header injection
-# text
-_clean_email_header() {
-  printf "%s" "$(echo "$1" | tr -d "\r\n")"
-}
-
-# Simple check for display name in an email address (< > or ")
-# email
-_email_has_display_name() {
-  _email="$1"
-  expr "$_email" : '^.*[<>"]' >/dev/null
-}
-
-##
-## curl smtp sending
-##
-
-# Send the message via curl using SMTP_* variables
-_smtp_send_curl() {
-  # Build curl args in $@
-  case "$SMTP_SECURE" in
-  none)
-    set -- --url "smtp://${SMTP_HOST}:${SMTP_PORT}"
-    ;;
-  ssl)
-    set -- --url "smtps://${SMTP_HOST}:${SMTP_PORT}"
-    ;;
-  tls)
-    set -- --url "smtp://${SMTP_HOST}:${SMTP_PORT}" --ssl-reqd
-    ;;
-  *)
-    # This will only occur if someone adds a new SMTP_SECURE option above
-    # without updating this code for it.
-    _err "Unhandled SMTP_SECURE='$SMTP_SECURE' in _smtp_send_curl"
-    _err "Please re-run with --debug and report a bug."
-    return 1
-    ;;
-  esac
-
-  set -- "$@" \
-    --upload-file - \
-    --mail-from "$SMTP_FROM" \
-    --max-time "$SMTP_TIMEOUT"
-
-  # Burst comma-separated $SMTP_TO into individual --mail-rcpt args.
-  _to="${SMTP_TO},"
-  while [ -n "$_to" ]; do
-    _rcpt="${_to%%,*}"
-    _to="${_to#*,}"
-    set -- "$@" --mail-rcpt "$_rcpt"
-  done
-
-  _smtp_login="${SMTP_USERNAME}:${SMTP_PASSWORD}"
-  if [ "$_smtp_login" != ":" ]; then
-    set -- "$@" --user "$_smtp_login"
-  fi
-
-  if [ "$SMTP_SHOW_TRANSCRIPT" = "True" ]; then
-    set -- "$@" --verbose
-  else
-    set -- "$@" --silent --show-error
-  fi
-
-  raw_message="$(_smtp_raw_message)"
-
-  _debug2 "curl command:" "$SMTP_BIN" "$*"
-  _debug2 "raw_message:\n$raw_message"
-
-  echo "$raw_message" | "$SMTP_BIN" "$@"
-}
-
-# Output an RFC-822 / RFC-5322 email message using SMTP_* variables.
-# (This assumes variables have already been cleaned for use in email headers.)
-_smtp_raw_message() {
-  echo "From: $SMTP_FROM"
-  echo "To: $SMTP_TO"
-  echo "Subject: $(_mime_encoded_word "$SMTP_SUBJECT")"
-  echo "Date: $(_rfc2822_date)"
-  echo "Content-Type: text/plain; charset=utf-8"
-  echo "X-Mailer: $SMTP_X_MAILER"
-  echo
-  echo "$SMTP_CONTENT"
-}
-
-# Convert text to RFC-2047 MIME "encoded word" format if it contains non-ASCII chars
-# text
-_mime_encoded_word() {
-  _text="$1"
-  # (regex character ranges like [a-z] can be locale-dependent; enumerate ASCII chars to avoid that)
-  _ascii='] $`"'"[!#%&'()*+,./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ~^_abcdefghijklmnopqrstuvwxyz{|}~-"
-  if expr "$_text" : "^.*[^$_ascii]" >/dev/null; then
-    # At least one non-ASCII char; convert entire thing to encoded word
-    printf "%s" "=?UTF-8?B?$(printf "%s" "$_text" | _base64)?="
-  else
-    # Just printable ASCII, no conversion needed
-    printf "%s" "$_text"
-  fi
-}
-
-# Output current date in RFC-2822 Section 3.3 format as required in email headers
-# (e.g., "Mon, 15 Feb 2021 14:22:01 -0800")
-_rfc2822_date() {
-  # Notes:
-  #   - this is deliberately not UTC, because it "SHOULD express local time" per spec
-  #   - the spec requires weekday and month in the C locale (English), not localized
-  #   - this date format specifier has been tested on Linux, Mac, Solaris and FreeBSD
-  _old_lc_time="$LC_TIME"
-  LC_TIME=C
-  date +'%a, %-d %b %Y %H:%M:%S %z'
-  LC_TIME="$_old_lc_time"
-}
-
-##
-## Python smtp sending
-##
-
-# Send the message via Python using SMTP_* variables
-_smtp_send_python() {
-  _debug "Python version" "$("$SMTP_BIN" --version 2>&1)"
-
-  # language=Python
-  "$SMTP_BIN" <<PYTHON
-# This code is meant to work with either Python 2.7.x or Python 3.4+.
-try:
-    try:
-        from email.message import EmailMessage
-        from email.policy import default as email_policy_default
-    except ImportError:
-        # Python 2 (or < 3.3)
-        from email.mime.text import MIMEText as EmailMessage
-        email_policy_default = None
-    from email.utils import formatdate as rfc2822_date
-    from smtplib import SMTP, SMTP_SSL, SMTPException
-    from socket import error as SocketError
-except ImportError as err:
-    print("A required Python standard package is missing. This system may have"
-          " a reduced version of Python unsuitable for sending mail: %s" % err)
-    exit(1)
-
-show_transcript = """$SMTP_SHOW_TRANSCRIPT""" == "True"
-
-smtp_host = """$SMTP_HOST"""
-smtp_port = int("""$SMTP_PORT""")
-smtp_secure = """$SMTP_SECURE"""
-username = """$SMTP_USERNAME"""
-password = """$SMTP_PASSWORD"""
-timeout=int("""$SMTP_TIMEOUT""")  # seconds
-x_mailer="""$SMTP_X_MAILER"""
-
-from_email="""$SMTP_FROM"""
-to_emails="""$SMTP_TO"""  # can be comma-separated
-subject="""$SMTP_SUBJECT"""
-content="""$SMTP_CONTENT"""
-
-try:
-    msg = EmailMessage(policy=email_policy_default)
-    msg.set_content(content)
-except (AttributeError, TypeError):
-    # Python 2 MIMEText
-    msg = EmailMessage(content)
-msg["Subject"] = subject
-msg["From"] = from_email
-msg["To"] = to_emails
-msg["Date"] = rfc2822_date(localtime=True)
-msg["X-Mailer"] = x_mailer
-
-smtp = None
-try:
-    if smtp_secure == "ssl":
-        smtp = SMTP_SSL(smtp_host, smtp_port, timeout=timeout)
-    else:
-        smtp = SMTP(smtp_host, smtp_port, timeout=timeout)
-    smtp.set_debuglevel(show_transcript)
-    if smtp_secure == "tls":
-        smtp.starttls()
-    if username or password:
-        smtp.login(username, password)
-    smtp.sendmail(msg["From"], msg["To"].split(","), msg.as_string())
-
-except SMTPException as err:
-    # Output just the error (skip the Python stack trace) for SMTP errors
-    print("Error sending: %r" % err)
-    exit(1)
-
-except SocketError as err:
-    print("Error connecting to %s:%d: %r" % (smtp_host, smtp_port, err))
-    exit(1)
-
-finally:
-    if smtp is not None:
-        smtp.quit()
-PYTHON
-}
-
-##
-## Conf helpers
-##
-
-#_readaccountconf_mutable_default name default_value
-# Given a name like MY_CONF:
-#   - if MY_CONF is set and non-empty, output $MY_CONF
-#   - if MY_CONF is set _empty_, output $default_value
-#     (lets user `export MY_CONF=` to clear previous saved value
-#     and return to default, without user having to know default)
-#   - otherwise if _readaccountconf_mutable MY_CONF is non-empty, return that
-#     (value of SAVED_MY_CONF from account.conf)
-#   - otherwise output $default_value
-_readaccountconf_mutable_default() {
-  _name="$1"
-  _default_value="$2"
-
-  eval "_value=\"\$$_name\""
-  eval "_name_is_set=\"\${${_name}+true}\""
-  # ($_name_is_set is "true" if $$_name is set to anything, including empty)
-  if [ -z "${_value}" ] && [ "${_name_is_set:-}" != "true" ]; then
-    _value="$(_readaccountconf_mutable "$_name")"
-  fi
-  if [ -z "${_value}" ]; then
-    _value="$_default_value"
-  fi
-  printf "%s" "$_value"
-}
-
-#_saveaccountconf_mutable_default name value default_value base64encode
-# Like _saveaccountconf_mutable, but if value is default_value
-# then _clearaccountconf_mutable instead
-_saveaccountconf_mutable_default() {
-  _name="$1"
-  _value="$2"
-  _default_value="$3"
-  _base64encode="$4"
-
-  if [ "$_value" != "$_default_value" ]; then
-    _saveaccountconf_mutable "$_name" "$_value" "$_base64encode"
-  else
-    _clearaccountconf_mutable "$_name"
-  fi
 }

notify/telegram.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env sh
-
-#Support Telegram Bots
-
-#TELEGRAM_BOT_APITOKEN=""
-#TELEGRAM_BOT_CHATID=""
-
-telegram_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_statusCode" "$_statusCode"
-
-  TELEGRAM_BOT_APITOKEN="${TELEGRAM_BOT_APITOKEN:-$(_readaccountconf_mutable TELEGRAM_BOT_APITOKEN)}"
-  if [ -z "$TELEGRAM_BOT_APITOKEN" ]; then
-    TELEGRAM_BOT_APITOKEN=""
-    _err "You didn't specify a Telegram BOT API Token TELEGRAM_BOT_APITOKEN yet."
-    return 1
-  fi
-  _saveaccountconf_mutable TELEGRAM_BOT_APITOKEN "$TELEGRAM_BOT_APITOKEN"
-
-  TELEGRAM_BOT_CHATID="${TELEGRAM_BOT_CHATID:-$(_readaccountconf_mutable TELEGRAM_BOT_CHATID)}"
-  if [ -z "$TELEGRAM_BOT_CHATID" ]; then
-    TELEGRAM_BOT_CHATID=""
-    _err "You didn't specify a Telegram Chat id TELEGRAM_BOT_CHATID yet."
-    return 1
-  fi
-  _saveaccountconf_mutable TELEGRAM_BOT_CHATID "$TELEGRAM_BOT_CHATID"
-
-  _content="$(printf "%s" "$_content" | sed -e 's/*/\\\\*/')"
-  _content="$(printf "*%s*\n%s" "$_subject" "$_content" | _json_encode)"
-  _data="{\"text\": \"$_content\", "
-  _data="$_data\"chat_id\": \"$TELEGRAM_BOT_CHATID\", "
-  _data="$_data\"parse_mode\": \"markdown\", "
-  _data="$_data\"disable_web_page_preview\": \"1\"}"
-
-  _debug "$_data"
-
-  export _H1="Content-Type: application/json"
-  _telegram_bot_url="https://api.telegram.org/bot${TELEGRAM_BOT_APITOKEN}/sendMessage"
-  if _post "$_data" "$_telegram_bot_url" >/dev/null; then
-    # shellcheck disable=SC2154
-    _message=$(printf "%s\n" "$response" | sed -n 's/.*"ok":\([^,]*\).*/\1/p')
-    if [ "$_message" = "true" ]; then
-      _info "telegram send success."
-      return 0
-    fi
-  fi
-  _err "telegram send error."
-  _err "$response"
-  return 1
-}