Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
a199fc61
Unverified
Commit
a199fc61
authored
Jul 24, 2021
by
neil
Committed by
GitHub
Jul 24, 2021
Browse files
Merge pull request #3621 from acmesh-official/dev
sync
parents
15c68c95
655e34b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
a199fc61
...
...
@@ -4207,6 +4207,10 @@ issue() {
if
[
-z
"
$_ACME_IS_RENEW
"
]
;
then
_initpath
"
$_main_domain
"
"
$_key_length
"
mkdir
-p
"
$DOMAIN_PATH
"
else
Le_OrderFinalize
=
""
Le_LinkOrder
=
""
Le_LinkCert
=
""
fi
if
_hasfield
"
$_web_roots
"
"
$W_DNS
"
&&
[
-z
"
$FORCE_DNS_MANUAL
"
]
;
then
...
...
dnsapi/dns_infoblox.sh
View file @
a199fc61
...
...
@@ -9,7 +9,6 @@ dns_infoblox_add() {
## Nothing to see here, just some housekeeping
fulldomain
=
$1
txtvalue
=
$2
baseurlnObject
=
"https://
$Infoblox_Server
/wapi/v2.2.2/record:txt?name=
$fulldomain
&text=
$txtvalue
&view=
$Infoblox_View
"
_info
"Using Infoblox API"
_debug fulldomain
"
$fulldomain
"
...
...
@@ -19,12 +18,13 @@ dns_infoblox_add() {
if
[
-z
"
$Infoblox_Creds
"
]
||
[
-z
"
$Infoblox_Server
"
]
;
then
Infoblox_Creds
=
""
Infoblox_Server
=
""
_err
"You didn't specify the credentials
,
server
or infoblox view yet
(Infoblox_Creds
,
Infoblox_Server
and Infoblox_View
)."
_err
"Please set them via EXPORT
([
username:password
], [ip or
hostname
])
and try again."
_err
"You didn't specify the
Infoblox
credentials
or
server (Infoblox_Creds
;
Infoblox_Server)."
_err
"Please set them via EXPORT
Infoblox_Creds=
username:password
or EXPORT Infoblox_server=ip/
hostname and try again."
return
1
fi
if
[
-z
"
$Infoblox_View
"
]
;
then
_info
"No Infoblox_View set, using fallback value 'default'"
Infoblox_View
=
"default"
fi
...
...
@@ -33,6 +33,9 @@ dns_infoblox_add() {
_saveaccountconf Infoblox_Server
"
$Infoblox_Server
"
_saveaccountconf Infoblox_View
"
$Infoblox_View
"
## URLencode Infoblox View to deal with e.g. spaces
Infoblox_ViewEncoded
=
$(
printf
"%b"
"
$Infoblox_View
"
| _url_encode
)
## Base64 encode the credentials
Infoblox_CredsEncoded
=
$(
printf
"%b"
"
$Infoblox_Creds
"
| _base64
)
...
...
@@ -40,11 +43,14 @@ dns_infoblox_add() {
export
_H1
=
"Accept-Language:en-US"
export
_H2
=
"Authorization: Basic
$Infoblox_CredsEncoded
"
## Construct the request URL
baseurlnObject
=
"https://
$Infoblox_Server
/wapi/v2.2.2/record:txt?name=
$fulldomain
&text=
$txtvalue
&view=
${
Infoblox_ViewEncoded
}
"
## Add the challenge record to the Infoblox grid member
result
=
"
$(
_post
""
"
$baseurlnObject
"
""
"POST"
)
"
## Let's see if we get something intelligible back from the unit
if
[
"
$(
echo
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
if
[
"
$(
echo
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$
{
Infoblox_View
Encoded
}
"
)
"
]
;
then
_info
"Successfully created the txt record"
return
0
else
...
...
@@ -65,6 +71,9 @@ dns_infoblox_rm() {
_debug fulldomain
"
$fulldomain
"
_debug txtvalue
"
$txtvalue
"
## URLencode Infoblox View to deal with e.g. spaces
Infoblox_ViewEncoded
=
$(
printf
"%b"
"
$Infoblox_View
"
| _url_encode
)
## Base64 encode the credentials
Infoblox_CredsEncoded
=
"
$(
printf
"%b"
"
$Infoblox_Creds
"
| _base64
)
"
...
...
@@ -73,18 +82,18 @@ dns_infoblox_rm() {
export
_H2
=
"Authorization: Basic
$Infoblox_CredsEncoded
"
## Does the record exist? Let's check.
baseurlnObject
=
"https://
$Infoblox_Server
/wapi/v2.2.2/record:txt?name=
$fulldomain
&text=
$txtvalue
&view=
$Infoblox_View
&_return_type=xml-pretty"
baseurlnObject
=
"https://
$Infoblox_Server
/wapi/v2.2.2/record:txt?name=
$fulldomain
&text=
$txtvalue
&view=
$
{
Infoblox_View
Encoded
}
&_return_type=xml-pretty"
result
=
"
$(
_get
"
$baseurlnObject
"
)
"
## Let's see if we get something intelligible back from the grid
if
[
"
$(
echo
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
if
[
"
$(
echo
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$
{
Infoblox_View
Encoded
}
"
)
"
]
;
then
## Extract the object reference
objRef
=
"
$(
printf
"%b"
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
objRef
=
"
$(
printf
"%b"
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$
{
Infoblox_View
Encoded
}
"
)
"
objRmUrl
=
"https://
$Infoblox_Server
/wapi/v2.2.2/
$objRef
"
## Delete them! All the stale records!
rmResult
=
"
$(
_post
""
"
$objRmUrl
"
""
"DELETE"
)
"
## Let's see if that worked
if
[
"
$(
echo
"
$rmResult
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
if
[
"
$(
echo
"
$rmResult
"
| _egrep_o
"record:txt/.*:.*/
$
{
Infoblox_View
Encoded
}
"
)
"
]
;
then
_info
"Successfully deleted
$objRef
"
return
0
else
...
...
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