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
768e9f4c
Unverified
Commit
768e9f4c
authored
Jan 16, 2021
by
neil
Committed by
GitHub
Jan 16, 2021
Browse files
Merge pull request #3365 from pssara/hotfix/dns_ispconfig.sh-3239-2696
Fixed issue 3239 and 2696 with ISP config
parents
62c776d9
464022be
Changes
1
Show whitespace changes
Inline
Side-by-side
dnsapi/dns_ispconfig.sh
View file @
768e9f4c
...
@@ -75,7 +75,7 @@ _ISPC_getZoneInfo() {
...
@@ -75,7 +75,7 @@ _ISPC_getZoneInfo() {
# suffix . needed for zone -> domain.tld.
# suffix . needed for zone -> domain.tld.
curData
=
"{
\"
session_id
\"
:
\"
${
sessionID
}
\"
,
\"
primary_id
\"
:{
\"
origin
\"
:
\"
${
curZone
}
.
\"
}}"
curData
=
"{
\"
session_id
\"
:
\"
${
sessionID
}
\"
,
\"
primary_id
\"
:{
\"
origin
\"
:
\"
${
curZone
}
.
\"
}}"
curResult
=
"
$(
_post
"
${
curData
}
"
"
${
ISPC_Api
}
?dns_zone_get"
)
"
curResult
=
"
$(
_post
"
${
curData
}
"
"
${
ISPC_Api
}
?dns_zone_get"
)
"
_debug
"Calling _ISPC_getZoneInfo: '
${
curData
}
' '
${
ISPC_Api
}
?
login
'"
_debug
"Calling _ISPC_getZoneInfo: '
${
curData
}
' '
${
ISPC_Api
}
?
dns_zone_get
'"
_debug
"Result of _ISPC_getZoneInfo: '
$curResult
'"
_debug
"Result of _ISPC_getZoneInfo: '
$curResult
'"
if
_contains
"
${
curResult
}
"
'"id":"'
;
then
if
_contains
"
${
curResult
}
"
'"id":"'
;
then
zoneFound
=
true
zoneFound
=
true
...
@@ -110,7 +110,24 @@ _ISPC_getZoneInfo() {
...
@@ -110,7 +110,24 @@ _ISPC_getZoneInfo() {
;;
;;
*
)
_info
"Retrieved Zone ID"
;;
*
)
_info
"Retrieved Zone ID"
;;
esac
esac
client_id
=
$(
echo
"
${
curResult
}
"
| _egrep_o
"sys_userid.*"
|
cut
-d
':'
-f
2 |
cut
-d
'"'
-f
2
)
sys_userid
=
$(
echo
"
${
curResult
}
"
| _egrep_o
"sys_userid.*"
|
cut
-d
':'
-f
2 |
cut
-d
'"'
-f
2
)
_debug
"SYS User ID: '
${
sys_userid
}
'"
case
"
${
sys_userid
}
"
in
''
|
*
[!
0-9]
*
)
_err
"SYS User ID is not numeric."
return
1
;;
*
)
_info
"Retrieved SYS User ID."
;;
esac
zoneFound
=
""
zoneEnd
=
""
fi
# Need to get client_id as it is different from sys_userid
curData
=
"{
\"
session_id
\"
:
\"
${
sessionID
}
\"
,
\"
sys_userid
\"
:
\"
${
sys_userid
}
\"
}"
curResult
=
"
$(
_post
"
${
curData
}
"
"
${
ISPC_Api
}
?client_get_id"
)
"
_debug
"Calling _ISPC_ClientGetID: '
${
curData
}
' '
${
ISPC_Api
}
?client_get_id'"
_debug
"Result of _ISPC_ClientGetID: '
$curResult
'"
client_id
=
$(
echo
"
${
curResult
}
"
| _egrep_o
"response.*"
|
cut
-d
':'
-f
2 |
cut
-d
'"'
-f
2 |
tr
-d
'{}'
)
_debug
"Client ID: '
${
client_id
}
'"
_debug
"Client ID: '
${
client_id
}
'"
case
"
${
client_id
}
"
in
case
"
${
client_id
}
"
in
''
|
*
[!
0-9]
*
)
''
|
*
[!
0-9]
*
)
...
@@ -119,9 +136,6 @@ _ISPC_getZoneInfo() {
...
@@ -119,9 +136,6 @@ _ISPC_getZoneInfo() {
;;
;;
*
)
_info
"Retrieved Client ID."
;;
*
)
_info
"Retrieved Client ID."
;;
esac
esac
zoneFound
=
""
zoneEnd
=
""
fi
}
}
_ISPC_addTxt
()
{
_ISPC_addTxt
()
{
...
...
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