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
7fae5553
Unverified
Commit
7fae5553
authored
Mar 10, 2022
by
neil
Committed by
GitHub
Mar 10, 2022
Browse files
Merge pull request #3977 from gabbe/Encode_password
Accept some special characters in password and some error handling
parents
e58b00d9
6ead0198
Changes
1
Hide whitespace changes
Inline
Side-by-side
dnsapi/dns_loopia.sh
View file @
7fae5553
...
...
@@ -32,8 +32,12 @@ dns_loopia_add() {
_info
"Adding record"
_loopia_add_sub_domain
"
$_domain
"
"
$_sub_domain
"
_loopia_add_record
"
$_domain
"
"
$_sub_domain
"
"
$txtvalue
"
if
!
_loopia_add_sub_domain
"
$_domain
"
"
$_sub_domain
"
;
then
return
1
fi
if
!
_loopia_add_record
"
$_domain
"
"
$_sub_domain
"
"
$txtvalue
"
;
then
return
1
fi
}
...
...
@@ -70,12 +74,13 @@ dns_loopia_rm() {
<value><string>%s</string></value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
"
$_domain
"
"
$_sub_domain
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
"
$_domain
"
"
$_sub_domain
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
if
!
_contains
"
$response
"
"OK"
;
then
_err
"Error could not get txt records"
err_response
=
$(
echo
"
$response
"
|
grep
-oPm1
"(?<=<string>)[^<]+"
)
_err
"Error could not get txt records:
$err_response
"
return
1
fi
}
...
...
@@ -101,6 +106,12 @@ _loopia_load_config() {
return
1
fi
if
_contains
"
$LOOPIA_Password
"
"'"
||
_contains
"
$LOOPIA_Password
"
'"'
;
then
_err
"Password contains quoute or double quoute and this is not supported by dns_loopia.sh"
return
1
fi
Encoded_Password
=
$(
_xml_encode
"
$LOOPIA_Password
"
)
return
0
}
...
...
@@ -133,11 +144,12 @@ _loopia_get_records() {
<value><string>%s</string></value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
"
$domain
"
"
$sub_domain
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
"
$domain
"
"
$sub_domain
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
if
!
_contains
"
$response
"
"<array>"
;
then
_err
"Error"
err_response
=
$(
echo
"
$response
"
|
grep
-oPm1
"(?<=<string>)[^<]+"
)
_err
"Error:
$err_response
"
return
1
fi
return
0
...
...
@@ -162,7 +174,7 @@ _get_root() {
<value><string>%s</string></value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
while
true
;
do
...
...
@@ -228,12 +240,13 @@ _loopia_add_record() {
</value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
"
$domain
"
"
$sub_domain
"
"
$txtval
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
"
$domain
"
"
$sub_domain
"
"
$txtval
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
if
!
_contains
"
$response
"
"OK"
;
then
_err
"Error"
err_response
=
$(
echo
"
$response
"
|
grep
-oPm1
"(?<=<string>)[^<]+"
)
_err
"Error:
$err_response
"
return
1
fi
return
0
...
...
@@ -257,7 +270,7 @@ _sub_domain_exists() {
<value><string>%s</string></value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
"
$domain
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
"
$domain
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
...
...
@@ -292,13 +305,22 @@ _loopia_add_sub_domain() {
<value><string>%s</string></value>
</param>
</params>
</methodCall>'
"
$LOOPIA_User
"
"
$
LOOPIA
_Password
"
"
$domain
"
"
$sub_domain
"
)
</methodCall>'
"
$LOOPIA_User
"
"
$
Encoded
_Password
"
"
$domain
"
"
$sub_domain
"
)
response
=
"
$(
_post
"
$xml_content
"
"
$LOOPIA_Api
"
""
"POST"
)
"
if
!
_contains
"
$response
"
"OK"
;
then
_err
"Error"
err_response
=
$(
echo
"
$response
"
|
grep
-oPm1
"(?<=<string>)[^<]+"
)
_err
"Error:
$err_response
"
return
1
fi
return
0
}
_xml_encode
()
{
encoded_string
=
$1
encoded_string
=
$(
echo
"
$encoded_string
"
|
sed
's/&/\&/'
)
encoded_string
=
$(
echo
"
$encoded_string
"
|
sed
's/</\</'
)
encoded_string
=
$(
echo
"
$encoded_string
"
|
sed
's/>/\>/'
)
printf
"%s"
"
$encoded_string
"
}
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