Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
856e7705
Commit
856e7705
authored
Jan 10, 2022
by
neil
Browse files
Merge branch '3870' into dev
parents
2ce145f3
d42feae0
Changes
2
Hide whitespace changes
Inline
Side-by-side
.github/workflows/Ubuntu.yml
View file @
856e7705
...
...
@@ -30,6 +30,20 @@ jobs:
CA
:
"
ZeroSSL
RSA
Domain
Secure
Site
CA"
CA_EMAIL
:
"
githubtest@acme.sh"
TEST_PREFERRED_CHAIN
:
"
"
-
TEST_ACME_Server
:
"
https://localhost:9000/acme/acme/directory"
CA_ECDSA
:
"
Smallstep
Intermediate
CA"
CA
:
"
Smallstep
Intermediate
CA"
CA_EMAIL
:
"
"
TEST_PREFERRED_CHAIN
:
"
"
NO_REVOKE
:
1
-
TEST_ACME_Server
:
"
https://localhost:9000/acme/acme/directory"
CA_ECDSA
:
"
Smallstep
Intermediate
CA"
CA
:
"
Smallstep
Intermediate
CA"
CA_EMAIL
:
"
"
TEST_PREFERRED_CHAIN
:
"
"
NO_REVOKE
:
1
TEST_IPCERT
:
1
TestingDomain
:
"
172.17.0.1"
runs-on
:
ubuntu-latest
env
:
...
...
@@ -40,10 +54,25 @@ jobs:
CA_EMAIL
:
${{ matrix.CA_EMAIL }}
NO_ECC_384
:
${{ matrix.NO_ECC_384 }}
TEST_PREFERRED_CHAIN
:
${{ matrix.TEST_PREFERRED_CHAIN }}
NO_REVOKE
:
${{ matrix.NO_REVOKE }}
TEST_IPCERT
:
${{ matrix.TEST_IPCERT }}
TestingDomain
:
${{ matrix.TestingDomain }}
steps
:
-
uses
:
actions/checkout@v2
-
name
:
Install tools
run
:
sudo apt-get install -y socat
-
name
:
Start StepCA
if
:
${{ matrix.TEST_ACME_Server=='https://localhost:9000/acme/acme/directory' }}
run
:
|
docker run --rm -d \
-p 9000:9000 \
-e "DOCKER_STEPCA_INIT_NAME=Smallstep" \
-e "DOCKER_STEPCA_INIT_DNS_NAMES=localhost,$(hostname -f)" \
--name stepca \
smallstep/step-ca \
&& sleep 5 && docker exec stepca step ca provisioner add acme --type ACME \
&& docker exec stepca kill -1 1 \
&& docker exec stepca cat /home/step/certs/root_ca.crt | sudo bash -c "cat - >>/etc/ssl/certs/ca-certificates.crt"
-
name
:
Clone acmetest
run
:
|
cd .. \
...
...
acme.sh
View file @
856e7705
...
...
@@ -1272,9 +1272,17 @@ _createcsr() {
_csr_cn="$(_idn "$domain")"
_debug2 _csr_cn "$_csr_cn"
if _contains "$(uname -a)" "MINGW"; then
${
ACME_OPENSSL_BIN
:-
openssl
}
req
-new
-sha256
-key
"
$csrkey
"
-subj
"//CN=
$_csr_cn
"
-config
"
$csrconf
"
-out
"
$csr
"
if _isIP "$_csr_cn"; then
${ACME_OPENSSL_BIN:-openssl} req -new -sha256 -key "$csrkey" -subj "//O=$PROJECT_NAME" -config "$csrconf" -out "$csr"
else
${ACME_OPENSSL_BIN:-openssl} req -new -sha256 -key "$csrkey" -subj "//CN=$_csr_cn" -config "$csrconf" -out "$csr"
fi
else
${
ACME_OPENSSL_BIN
:-
openssl
}
req
-new
-sha256
-key
"
$csrkey
"
-subj
"/CN=
$_csr_cn
"
-config
"
$csrconf
"
-out
"
$csr
"
if _isIP "$_csr_cn"; then
${ACME_OPENSSL_BIN:-openssl} req -new -sha256 -key "$csrkey" -subj "/O=$PROJECT_NAME" -config "$csrconf" -out "$csr"
else
${ACME_OPENSSL_BIN:-openssl} req -new -sha256 -key "$csrkey" -subj "/CN=$_csr_cn" -config "$csrconf" -out "$csr"
fi
fi
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment