From 1a163243ec280f0d776d838ddfebac57db5c75b5 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Sun, 22 Nov 2020 12:19:52 +0800
Subject: [PATCH 1/3] fix
https://github.com/acmesh-official/acme.sh/issues/3259
---
dnsapi/dns_dpi.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dnsapi/dns_dpi.sh b/dnsapi/dns_dpi.sh
index 831150a9..9cbf4d51 100755
--- 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
From cc8f2afce9ed2009565f65fa81369d7a96f18d74 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Sun, 22 Nov 2020 21:41:22 +0800
Subject: [PATCH 2/3] fix for Solaris, and add Solaris to Github actions
---
.github/workflows/DNS.yml | 37 +++++++++++++++++++++++++++++++
.github/workflows/LetsEncrypt.yml | 26 ++++++++++++++++++++++
acme.sh | 4 ++--
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/DNS.yml b/.github/workflows/DNS.yml
index 748628dd..5dc2d453 100644
--- a/.github/workflows/DNS.yml
+++ b/.github/workflows/DNS.yml
@@ -208,5 +208,42 @@ jobs:
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.1
+ 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
diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index 16b7e779..8d0c4eb0 100644
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -119,3 +119,29 @@ jobs:
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.1
+ with:
+ envs: 'TEST_LOCAL TestingDomain'
+ nat: |
+ "8080": "80"
+ prepare: pkgutil -y -i socat curl
+ run: |
+ cd ../acmetest && ./letest.sh
+
diff --git a/acme.sh b/acme.sh
index 1e4b1152..e549f7c8 100755
--- 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
From 349429b76e534313a4989794707fc1463399cfb2 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Sun, 22 Nov 2020 21:55:55 +0800
Subject: [PATCH 3/3] fix solaris badge
---
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 7215785c..cd747666 100644
--- a/README.md
+++ b/README.md
@@ -60,10 +60,10 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
|1|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Mac OSX
|2|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Windows (cygwin with curl, openssl and crontab included)
|3|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|FreeBSD
-|4|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)| Ubuntu
-|5|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|pfsense
-|6|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|OpenBSD
-|7|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|SunOS/Solaris
+|4|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Solaris
+|5|[](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)| Ubuntu
+|6|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|pfsense
+|7|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|OpenBSD
|8|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
|9|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
|10|[](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE