diff --git a/api/server/config.yml b/api/server/config.yml index 07f95c0..2378701 100755 --- a/api/server/config.yml +++ b/api/server/config.yml @@ -16,8 +16,8 @@ api: CORS: max_age: 300 allowed_origins: - - "http://*" - - "https://*" + - "https://sendico.io" + - "https://app.sendico.io" allowed_methods: - "GET" - "POST" diff --git a/ci/scripts/common/bump_version.sh b/ci/scripts/common/bump_version.sh index b17d240..c179872 100755 --- a/ci/scripts/common/bump_version.sh +++ b/ci/scripts/common/bump_version.sh @@ -67,9 +67,33 @@ if [ -z "${BRANCH}" ] || [ "${BRANCH}" = "HEAD" ]; then BRANCH="$(git rev-parse --abbrev-ref HEAD)" fi +REMOTE_URL="${CI_REPO_REMOTE:-${WOODPECKER_GIT_REMOTE:-${DRONE_REMOTE_URL:-}}}" +if [ -z "${REMOTE_URL}" ]; then + REMOTE_URL="$(git config --get remote.origin.url 2>/dev/null || true)" +fi + +# Normalize machine to a bare hostname so .netrc matches HTTPS requests. +normalize_machine() { + value="$1" + if [ -z "${value}" ]; then + printf '%s' "" + return + fi + printf '%s' "${value}" | sed -E ' + s#^[[:alpha:]][[:alnum:]+.-]*://##; + s#^[^@]*@##; + s#/.*$##; + ' +} + NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-${DRONE_NETRC_MACHINE:-}}}" NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${DRONE_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-${DRONE_NETRC_LOGIN:-}}}}}}" NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-${DRONE_NETRC_PASSWORD:-}}}" +NETRC_MACHINE="$(normalize_machine "${NETRC_MACHINE}")" +if [ -z "${NETRC_MACHINE}" ] && [ -n "${REMOTE_URL}" ]; then + NETRC_MACHINE="$(normalize_machine "${REMOTE_URL}")" +fi + if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then NETRC_FILE="${HOME:-/root}/.netrc" { @@ -81,7 +105,6 @@ if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASS echo "[bump-version] configured credentials for ${NETRC_MACHINE}" fi -REMOTE_URL="${CI_REPO_REMOTE:-${WOODPECKER_GIT_REMOTE:-${DRONE_REMOTE_URL:-}}}" if [ -n "${REMOTE_URL}" ]; then git remote set-url origin "${REMOTE_URL}" fi