Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dns_cyon plugin #6184

Merged
merged 7 commits into from
Jan 4, 2025
Merged

Update dns_cyon plugin #6184

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0241552
update dns_cyon for updated field names and add validation
Jan 1, 2025
524b40b
adhere to shell formatting
Jan 1, 2025
6328496
run tests
Jan 1, 2025
0e4fd52
run tests
Jan 1, 2025
04aefbf
moved the env change check to its own function
Jan 2, 2025
b29d17f
changed char class for compatibility with openbsd
Jan 3, 2025
1b12305
also updated the other validation functions
Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions dnsapi/dns_cyon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,8 @@ _cyon_change_domain_env() {

if ! _cyon_check_if_2fa_missed "${domain_env_response}"; then return 1; fi

domain_env_success="$(printf "%s" "${domain_env_response}" | _egrep_o '"authenticated":\w*' | cut -d : -f 2)"

# Bail if domain environment change fails.
if [ "${domain_env_success}" != "true" ]; then
if [ "$(printf "%s" "${domain_env_response}" | _cyon_get_environment_change_status)" != "true" ]; then
_err " $(printf "%s" "${domain_env_response}" | _cyon_get_response_message)"
_err ""
return 1
Expand All @@ -232,7 +230,7 @@ _cyon_add_txt() {
_info " - Adding DNS TXT entry..."

add_txt_url="https://my.cyon.ch/domain/dnseditor/add-record-async"
add_txt_data="zone=${fulldomain_idn}.&ttl=900&type=TXT&value=${txtvalue}"
add_txt_data="name=${fulldomain_idn}.&ttl=900&type=TXT&dnscontent=${txtvalue}"

add_txt_response="$(_post "$add_txt_data" "$add_txt_url")"
_debug add_txt_response "${add_txt_response}"
Expand All @@ -241,9 +239,10 @@ _cyon_add_txt() {

add_txt_message="$(printf "%s" "${add_txt_response}" | _cyon_get_response_message)"
add_txt_status="$(printf "%s" "${add_txt_response}" | _cyon_get_response_status)"
add_txt_validation="$(printf "%s" "${add_txt_response}" | _cyon_get_validation_status)"

# Bail if adding TXT entry fails.
if [ "${add_txt_status}" != "true" ]; then
if [ "${add_txt_status}" != "true" ] || [ "${add_txt_validation}" != "true" ]; then
_err " ${add_txt_message}"
_err ""
return 1
Expand Down Expand Up @@ -305,13 +304,21 @@ _cyon_get_response_message() {
}

_cyon_get_response_status() {
_egrep_o '"status":\w*' | cut -d : -f 2
_egrep_o '"status":[a-zA-z0-9]*' | cut -d : -f 2
}

_cyon_get_validation_status() {
_egrep_o '"valid":[a-zA-z0-9]*' | cut -d : -f 2
}

_cyon_get_response_success() {
_egrep_o '"onSuccess":"[^"]*"' | cut -d : -f 2 | tr -d '"'
}

_cyon_get_environment_change_status() {
_egrep_o '"authenticated":[a-zA-z0-9]*' | cut -d : -f 2
}

_cyon_check_if_2fa_missed() {
# Did we miss the 2FA?
if test "${1#*multi_factor_form}" != "${1}"; then
Expand Down
Loading