Merge branch 'master' of github.com:NerLOR/acme.sh

diff --git a/.github/workflows/DNS.yml b/.github/workflows/DNS.yml
index 748628dde346c87625d00714f697a15256a9562e..5dc2d453469f62eb5e86616174c515168129b7f3 100644 (file)
--- a/.github/workflows/DNS.yml
+++ b/.github/workflows/DNS.yml
@@ -208,5 +208,42 @@ jobs:
           cd ../acmetest\r
           ./letest.sh\r
 \r
+  Solaris:\r
+    runs-on: macos-latest\r
+    needs: FreeBSD\r
+    env:\r
+      TEST_DNS : ${{ secrets.TEST_DNS }}\r
+      TestingDomain: ${{ secrets.TestingDomain }}\r
+      TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}\r
+      TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}\r
+      CASE: le_test_dnsapi\r
+      TEST_LOCAL: 1\r
+      DEBUG: 1\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - name: Clone acmetest\r
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
+    - uses: vmactions/solaris-vm@v0.0.1\r
+      with:\r
+        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}}'\r
+        prepare: pkgutil -y -i socat curl\r
+        run: |\r
+          if [ "${{ secrets.TokenName1}}" ] ; then\r
+            export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}\r
+          fi\r
+          if [ "${{ secrets.TokenName2}}" ] ; then\r
+            export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}\r
+          fi\r
+          if [ "${{ secrets.TokenName3}}" ] ; then\r
+            export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}\r
+          fi\r
+          if [ "${{ secrets.TokenName4}}" ] ; then\r
+            export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}\r
+          fi\r
+          if [ "${{ secrets.TokenName5}}" ] ; then\r
+            export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}\r
+          fi\r
+          cd ../acmetest\r
+          ./letest.sh\r
 \r
         \r

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index 16b7e779c4691681fe99d14cba9f78e43d3506c8..8d0c4eb01f4ef0457431913e01adef0f6112895b 100644 (file)
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -119,3 +119,29 @@ jobs:
         run: |\r
           cd ../acmetest && ./letest.sh\r
 \r
+  Solaris:\r
+    runs-on: macos-latest\r
+    needs: FreeBSD\r
+    env:\r
+      NGROK_TOKEN : ${{ secrets.NGROK_TOKEN }}\r
+      TEST_LOCAL: 1\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - uses: vmactions/ngrok-tunnel@v0.0.1\r
+      id: ngrok\r
+      with:\r
+        protocol: http\r
+        port: 8080\r
+    - name: Set envs\r
+      run: echo "TestingDomain=${{steps.ngrok.outputs.server}}" >> $GITHUB_ENV\r
+    - name: Clone acmetest\r
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
+    - uses: vmactions/solaris-vm@v0.0.1\r
+      with:\r
+        envs: 'TEST_LOCAL TestingDomain'\r
+        nat: |\r
+          "8080": "80"\r
+        prepare: pkgutil -y -i socat curl\r
+        run: |\r
+          cd ../acmetest && ./letest.sh\r
+\r

diff --git a/README.md b/README.md
index 7215785c184c0c2d73a3449a99c97bbf80bfb05a..cd747666786464cb8ac0310d44ed82e327fe7cd5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -60,10 +60,10 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
 |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
 |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)
 |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
-|4|[![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/pfsense.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|pfsense
-|6|[![](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/solaris.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|SunOS/Solaris
+|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
+|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
+|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
 |8|[![](https://acmesh-official.github.io/acmetest/status/debian-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
 |9|[![](https://acmesh-official.github.io/acmetest/status/centos-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
 |10|[![](https://acmesh-official.github.io/acmetest/status/opensuse-leap-latest.svg)](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE

diff --git a/acme.sh b/acme.sh
index 1e4b115292127a95ee58f75c6eb7c4a6b4f5f544..e549f7c8e40cf173b196d513f22ee00b0888619f 100755 (executable)
--- a/acme.sh
+++ b/acme.sh
@@ -2086,7 +2086,7 @@ _send_signed_request() {
 
     _debug2 original "$response"
     if echo "$responseHeaders" | grep -i "Content-Type: *application/json" >/dev/null 2>&1; then
-      response="$(echo "$response" | _normalizeJson | _json_decode)"
+      response="$(echo "$response" | _json_decode | _normalizeJson)"
     fi
     _debug2 response "$response"
 
@@ -5823,7 +5823,7 @@ _deactivate() {
     _URL_NAME="uri"
   fi
 
-  entries="$(echo "$response" | tr '][' '=' | _egrep_o "challenges\": *=[^=]*=" | tr '}{' '\n' | grep "\"status\": *\"valid\"")"
+  entries="$(echo "$response" | tr '][' '==' | _egrep_o "challenges\": *=[^=]*=" | tr '}{' '\n' | grep "\"status\": *\"valid\"")"
   if [ -z "$entries" ]; then
     _info "No valid entries found."
     if [ -z "$thumbprint" ]; then

diff --git a/dnsapi/dns_dpi.sh b/dnsapi/dns_dpi.sh
index 831150a9da3d83ba946f5ea10c9bf5249d07199f..9cbf4d519ddfcbc360b6aede5538d502cfb86f7e 100755 (executable)
--- a/dnsapi/dns_dpi.sh
+++ b/dnsapi/dns_dpi.sh
@@ -75,7 +75,7 @@ dns_dpi_rm() {
     return 1
   fi
 
-  _contains "$response" "Action completed successful"
+  _contains "$response" "Operation successful"
 
 }
 
@@ -93,7 +93,7 @@ add_record() {
     return 1
   fi
 
-  _contains "$response" "Action completed successful" || _contains "$response" "Domain record already exists"
+  _contains "$response" "Operation successful" || _contains "$response" "Domain record already exists"
 }
 
 ####################  Private functions below ##################################
@@ -117,7 +117,7 @@ _get_root() {
       return 1
     fi
 
-    if _contains "$response" "Action completed successful"; then
+    if _contains "$response" "Operation 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