From 4258403ffbcec758fb4cbdc2c0801d83779d56a2 Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 21:44:41 +0200 Subject: [PATCH 1/6] Fixed TXT record name in dns_desec.sh Fix for the FQDN being truncated in the TXT record name being generated for the DNS-01 challenge at DESEC.io. See https://github.com/acmesh-official/acme.sh/issues/2180#issuecomment-2267646131 for details. --- dnsapi/dns_desec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsapi/dns_desec.sh b/dnsapi/dns_desec.sh index 0d6a6c2f..c74e244f 100644 --- a/dnsapi/dns_desec.sh +++ b/dnsapi/dns_desec.sh @@ -59,7 +59,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\":\"$_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]" if _desec_rest PUT "$REST_API/$_domain/rrsets/" "$body"; then if _contains "$response" "$txtvalue"; then From 1efb89c1bfa2b570cd37f76345f239b4c1b2320e Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 22:45:30 +0200 Subject: [PATCH 2/6] Create main.yml macos Workflow --- .github/workflows/main.yml | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..0911c446 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,58 @@ +name: MacOS +on: + push: + branches: + - '*' + paths: + - '*.sh' + - '.github/workflows/MacOS.yml' + + pull_request: + branches: + - dev + paths: + - '*.sh' + - '.github/workflows/MacOS.yml' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + + + +jobs: + MacOS: + strategy: + matrix: + include: + - TEST_ACME_Server: "LetsEncrypt.org_test" + CA_ECDSA: "" + CA: "" + CA_EMAIL: "" + TEST_PREFERRED_CHAIN: (STAGING) + #- TEST_ACME_Server: "ZeroSSL.com" + # CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA" + # CA: "ZeroSSL RSA Domain Secure Site CA" + # CA_EMAIL: "githubtest@acme.sh" + # TEST_PREFERRED_CHAIN: "" + runs-on: macos-latest + env: + TEST_LOCAL: 1 + TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }} + CA_ECDSA: ${{ matrix.CA_ECDSA }} + CA: ${{ matrix.CA }} + CA_EMAIL: ${{ matrix.CA_EMAIL }} + TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }} + steps: + - uses: actions/checkout@v4 + - name: Install tools + run: brew install socat + - name: Clone acmetest + run: | + cd .. \ + && git clone --depth=1 https://github.com/acmesh-official/acmetest.git \ + && cp -r acme.sh acmetest/ + - name: Run acmetest + run: | + cd ../acmetest \ + && sudo --preserve-env ./letest.sh From cf965cdad16c73678b1fba57c251de0f80ac02e3 Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 23:00:49 +0200 Subject: [PATCH 3/6] Revert "Create main.yml macos Workflow" This reverts commit 1efb89c1bfa2b570cd37f76345f239b4c1b2320e. --- .github/workflows/main.yml | 58 -------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 0911c446..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: MacOS -on: - push: - branches: - - '*' - paths: - - '*.sh' - - '.github/workflows/MacOS.yml' - - pull_request: - branches: - - dev - paths: - - '*.sh' - - '.github/workflows/MacOS.yml' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - - - -jobs: - MacOS: - strategy: - matrix: - include: - - TEST_ACME_Server: "LetsEncrypt.org_test" - CA_ECDSA: "" - CA: "" - CA_EMAIL: "" - TEST_PREFERRED_CHAIN: (STAGING) - #- TEST_ACME_Server: "ZeroSSL.com" - # CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA" - # CA: "ZeroSSL RSA Domain Secure Site CA" - # CA_EMAIL: "githubtest@acme.sh" - # TEST_PREFERRED_CHAIN: "" - runs-on: macos-latest - env: - TEST_LOCAL: 1 - TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }} - CA_ECDSA: ${{ matrix.CA_ECDSA }} - CA: ${{ matrix.CA }} - CA_EMAIL: ${{ matrix.CA_EMAIL }} - TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }} - steps: - - uses: actions/checkout@v4 - - name: Install tools - run: brew install socat - - name: Clone acmetest - run: | - cd .. \ - && git clone --depth=1 https://github.com/acmesh-official/acmetest.git \ - && cp -r acme.sh acmetest/ - - name: Run acmetest - run: | - cd ../acmetest \ - && sudo --preserve-env ./letest.sh From f8083aaff2fc960e75ef76c36351ca3278f12763 Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 23:13:05 +0200 Subject: [PATCH 4/6] changed runner for macos workflow --- .github/workflows/MacOS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index f5d73ec9..900eec5f 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -35,7 +35,7 @@ jobs: # CA: "ZeroSSL RSA Domain Secure Site CA" # CA_EMAIL: "githubtest@acme.sh" # TEST_PREFERRED_CHAIN: "" - runs-on: macos-latest + runs-on: mac env: TEST_LOCAL: 1 TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }} From 132757ce8ef0117b41a7f8c8f7c68d8f024f0222 Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 23:14:44 +0200 Subject: [PATCH 5/6] Revert "Fixed TXT record name in dns_desec.sh" This reverts commit 4258403ffbcec758fb4cbdc2c0801d83779d56a2. --- dnsapi/dns_desec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsapi/dns_desec.sh b/dnsapi/dns_desec.sh index c74e244f..0d6a6c2f 100644 --- a/dnsapi/dns_desec.sh +++ b/dnsapi/dns_desec.sh @@ -59,7 +59,7 @@ dns_desec_add() { fi _debug txtvalues "$txtvalues" _info "Adding record" - body="[{\"subname\":\"$_sub_domain\":\"$_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]" + body="[{\"subname\":\"$_sub_domain\", \"type\":\"TXT\", \"records\":[$txtvalues], \"ttl\":3600}]" if _desec_rest PUT "$REST_API/$_domain/rrsets/" "$body"; then if _contains "$response" "$txtvalue"; then From 5400e42c3c790d373321a95de7b012d68d3f1814 Mon Sep 17 00:00:00 2001 From: JNail Date: Sun, 4 Aug 2024 23:17:37 +0200 Subject: [PATCH 6/6] Revert "changed runner for macos workflow" This reverts commit f8083aaff2fc960e75ef76c36351ca3278f12763. --- .github/workflows/MacOS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 900eec5f..f5d73ec9 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -35,7 +35,7 @@ jobs: # CA: "ZeroSSL RSA Domain Secure Site CA" # CA_EMAIL: "githubtest@acme.sh" # TEST_PREFERRED_CHAIN: "" - runs-on: mac + runs-on: macos-latest env: TEST_LOCAL: 1 TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}