Skip to content

Allow to login using a SUB-AUTH-ID. #12

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

Open
rei-ifesca wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow to login using a SUB-AUTH-ID. #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fedef6
Allow to login using an SUB-AUTH-ID.
rei-ifesca Feb 14, 2019
8851fdc
Remove trailing spaces
rei-ifesca Feb 14, 2019
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
35 changes: 22 additions & 13 deletions bin/cloudns_api.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@ function print_usage() {
builtin echo ""
builtin echo " Environment:"
builtin echo " Ensure that the following two environment variables are exported:"
builtin echo " CLOUDNS_API_ID - your ClouDNS API ID (auth-id)"
builtin echo " CLOUDNS_PASSWORD - your ClouDNS API password (auth-password)"
builtin echo " CLOUDNS_API_ID - your ClouDNS API ID (auth-id)"
builtin echo " CLOUDNS_API_SUB_ID - your ClouDNS API Sub-Auth-ID (sub-auth-id) [optional]. If set, it will be used as the prefered auth ID."
builtin echo " CLOUDNS_PASSWORD - your ClouDNS API password (auth-password)"
} >&2
}

function check_jq() {

if ! which jq >/dev/null 2>&1; then
print_error "This program requires jq to be installed. Install it."
exit 1
Expand Down Expand Up @@ -130,7 +131,11 @@ function process_arguments() {

function check_environment_variables() {
local ERROR_COUNT=0
local REQUIRED_VARIABLES=( CLOUDNS_API_ID CLOUDNS_PASSWORD )
if [ -n CLOUDNS_API_SUB_ID ]; then
local REQUIRED_VARIABLES=( CLOUDNS_API_SUB_ID CLOUDNS_PASSWORD )
else
local REQUIRED_VARIABLES=( CLOUDNS_API_ID CLOUDNS_PASSWORD )
fi
for REQUIRED_VARIABLE in ${REQUIRED_VARIABLES[@]}; do
if $( builtin eval test -z \${${REQUIRED_VARIABLE}} ); then
print_error "Environment variable \${${REQUIRED_VARIABLE}} unset"
Expand All @@ -143,7 +148,11 @@ function check_environment_variables() {
}

function set_auth_post_data() {
AUTH_POST_DATA="-d auth-id=${CLOUDNS_API_ID} -d auth-password=${CLOUDNS_PASSWORD}"
if [ -n CLOUDNS_API_SUB_ID ]; then
AUTH_POST_DATA="-d sub-auth-id=${CLOUDNS_API_SUB_ID} -d auth-password=${CLOUDNS_PASSWORD}"
else
AUTH_POST_DATA="-d auth-id=${CLOUDNS_API_ID} -d auth-password=${CLOUDNS_PASSWORD}"
fi
}

function test_api_url() {
Expand All @@ -162,7 +171,7 @@ function do_login() {
return 0 ;;
* ) print_error "Login failed"
exit 1 ;;
esac
esac
}

function do_tests() {
Expand Down Expand Up @@ -535,7 +544,7 @@ function set_soa() {
fi
;;
esac
done
done
if [ "${CHANGED}" -eq "0" ]; then
print_timestamp "Nothing has changed - no need to modify" && exit 0
fi
Expand Down Expand Up @@ -948,7 +957,7 @@ function add_record() {
print_timestamp "Record successfully added with id [${ID}]"
else
print_error "Unexpected response while adding record" && exit 1
fi
fi
}

function check_ipv4_address() {
Expand Down Expand Up @@ -1000,7 +1009,7 @@ function validate_rr_value() {
fi
else
return 1
fi
fi
;;
"host" ) builtin echo "${VALUE}" | grep -Eqs '^[a-zA-Z0-9\._@-]+$'
return $?
Expand Down Expand Up @@ -1077,7 +1086,7 @@ function delete_record() {
local ID=${ID_V}
unset ID_K ID_V ID_KV
local RECORD_LIST=$( list_records ${ZONE} showid=true )
local TARGET_RECORD
local TARGET_RECORD
TARGET_RECORD=$( builtin echo "${RECORD_LIST}" | grep "^.*; id=${ID}$" )
if [ "$?" -ne "0" ]; then
print_error "No record found with id [${ID}] in zone [${ZONE}]"
Expand Down Expand Up @@ -1148,7 +1157,7 @@ function modify_record() {
else
print_error "id must be an integer value" && exit 1
fi
;;
;;
"host" ) if validate_rr_value host null "${VALUE}"; then
RR_HOST="${VALUE}"
else
Expand Down Expand Up @@ -1198,12 +1207,12 @@ function modify_record() {
# depending upon the record type being modified, and the modifications being made
# we *do*, however, need RR_ID set, at least
if [ -z "${RR_ID}" ]; then print_error "id=<value> not passed" && exit 1; fi
# first, we need to try to get a record with this id, to pre-populate some
# first, we need to try to get a record with this id, to pre-populate some
# variables which we may overwrite with user supplied key=value pairs, if they
# are set. The ClouDNS API has no way of retrieving a record by id. So, we use
# list_records ${ZONE} showid=true and sift through the output.
local RECORD_LIST=$( list_records ${ZONE} showid=true )
local TARGET_RECORD
local TARGET_RECORD
TARGET_RECORD=$( builtin echo "${RECORD_LIST}" | grep "^.*; id=${RR_ID}$" )
if [ "$?" -ne "0" ]; then
print_error "No record found with id [${RR_ID}] in zone [${ZONE}]"
Expand Down