actions/cascading-pr
1
0
Fork 0
mirror of https://code.forgejo.org/actions/cascading-pr.git synced 2025-07-22 07:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: upgrade forgejo-curl.sh

Browse source
This commit is contained in:
Earl Warren 2025-07-20 10:24:40 +02:00
parent 2b01e2dc4f
commit d7e60d3ba3
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
4 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.forgejo/workflows/integration.yml
View file

@ -27,6 +27,7 @@ jobs:
runner_config=/tmp/runner-config.yaml runner_config=/tmp/runner-config.yaml
sed -e 's|file: .runner|file: ${{ steps.forgejo.outputs.runner-file }}|' < tests/runner-config.yaml > $runner_config sed -e 's|file: .runner|file: ${{ steps.forgejo.outputs.runner-file }}|' < tests/runner-config.yaml > $runner_config
FORGEJO_RUNNER_CONFIG=$runner_config forgejo-runner.sh reload FORGEJO_RUNNER_CONFIG=$runner_config forgejo-runner.sh reload
export PATH=$(pwd):$PATH
tests/run.sh --verbose --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }} tests/run.sh --verbose --host_port ${{ steps.forgejo.outputs.host-port }} --url ${{ steps.forgejo.outputs.url }} --token ${{ steps.forgejo.outputs.token }}
- name: full logs - name: full logs

4
cascading-pr.sh
View file

@ -14,7 +14,7 @@ function repo_login() {
local direction="$1" local direction="$1"
local repo=${options[${direction}_repo]} local repo=${options[${direction}_repo]}
( (
export DOT=$TMPDIR/$repo export DOT_FORGEJO_CURL=$TMPDIR/$repo
forgejo-curl.sh logout forgejo-curl.sh logout
forgejo-curl.sh --token "${options[${direction}_token]}" login "${options[${direction}_url]}" forgejo-curl.sh --token "${options[${direction}_token]}" login "${options[${direction}_url]}"
) )
@ -23,7 +23,7 @@ function repo_login() {
function repo_curl() { function repo_curl() {
local repo=$1 local repo=$1
shift shift
DOT=$TMPDIR/$repo forgejo-curl.sh "$@" DOT_FORGEJO_CURL=$TMPDIR/$repo forgejo-curl.sh "$@"
} }
function default_branch() { function default_branch() {

241
forgejo-curl.sh
View file

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
VERSION=1.0.0 VERSION=1.0.1
SELF_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
VERBOSE=false VERBOSE=false
DEBUG=false DEBUG=false
: ${EXIT_ON_ERROR:=true} : ${EXIT_ON_ERROR:=true}
: ${TOKEN_NAME:=forgejo-curl} : ${TOKEN_NAME:=forgejo-curl}
: ${DOT:=$HOME/.forgejo-curl} : ${DOT_FORGEJO_CURL:=$HOME/.forgejo-curl}
: ${DOT:=$DOT_FORGEJO_CURL}
function debug() { function debug() {
DEBUG=true DEBUG=true
@ -28,8 +29,8 @@ function log_error() {
} }
function log_verbose() { function log_verbose() {
if $VERBOSE; then if $VERBOSE ; then
log "$@" log "$@"
fi fi
} }
@ -39,20 +40,20 @@ function log_info() {
function fatal_error() { function fatal_error() {
log_error "$@" log_error "$@"
if $EXIT_ON_ERROR; then if $EXIT_ON_ERROR ; then
exit 1 exit 1
else else
return 1 return 1
fi fi
} }
function dot_ensure() { function dot_ensure() {
mkdir -p $DOT mkdir -p $DOT_FORGEJO_CURL
} }
HEADER_JSON='-H Content-Type:application/json' HEADER_JSON='-H Content-Type:application/json'
HEADER_TOKEN="-H @$DOT/header-token" HEADER_TOKEN="-H @$DOT_FORGEJO_CURL/header-token"
HEADER_CSRF="-H @$DOT/header-csrf" HEADER_CSRF="-H @$DOT_FORGEJO_CURL/header-csrf"
function api() { function api() {
client $HEADER_TOKEN "$@" client $HEADER_TOKEN "$@"
@ -66,44 +67,41 @@ function login_api() {
local user="$1" password="$2" token="$3" scopes="${4:-[\"all\"]}" url="$5" local user="$1" password="$2" token="$3" scopes="${4:-[\"all\"]}" url="$5"
dot_ensure dot_ensure
if test -s $DOT/token; then if test -s $DOT_FORGEJO_CURL/token ; then
log_info "already logged in, ignored" log_info "already logged in, ignored"
return return
fi fi
if test -z "$token"; then if test -z "$token" ; then
log_verbose curl -sS -X DELETE --user "${user}:${password}" "${url}/api/v1/users/$user/tokens/${TOKEN_NAME}" -o /dev/null -w "%{http_code}" log_verbose curl -sS -X DELETE --user "${user}:${password}" "${url}/api/v1/users/$user/tokens/${TOKEN_NAME}" -o /dev/null -w "%{http_code}"
local basic="${user:-unknown}:${password:-unknown}" local basic="${user:-unknown}:${password:-unknown}"
local status=$(curl -sS -X DELETE --user "${basic}" "${url}/api/v1/users/$user/tokens/${TOKEN_NAME}" -o /dev/null -w "%{http_code}") local status=$(curl -sS -X DELETE --user "${basic}" "${url}/api/v1/users/$user/tokens/${TOKEN_NAME}" -o /dev/null -w "%{http_code}")
if test "${status}" != 404 -a "${status}" != 204; then if test "${status}" != 404 -a "${status}" != 204 ; then
fatal_error permission denied, the user or password are probably incorrect, try again with --verbose fatal_error permission denied, the user or password are probably incorrect, try again with --verbose
return 1 return 1
fi fi
token=$(client $HEADER_JSON --user "${basic}" --data-raw '{"name":"'${TOKEN_NAME}'","scopes":'${scopes}'}' "${url}/api/v1/users/${user}/tokens" | jq --raw-output .sha1) token=$(client $HEADER_JSON --user "${basic}" --data-raw '{"name":"'${TOKEN_NAME}'","scopes":'${scopes}'}' "${url}/api/v1/users/${user}/tokens" | jq --raw-output .sha1)
fi fi
if [[ "$token" =~ ^@ ]]; then if [[ "$token" =~ ^@ ]] ; then
cp "${token##@}" $DOT/token cp "${token##@}" $DOT_FORGEJO_CURL/token
else else
echo "$token" >$DOT/token echo "$token" > $DOT_FORGEJO_CURL/token
fi fi
( ( echo -n "Authorization: token " ; cat $DOT_FORGEJO_CURL/token ) > $DOT_FORGEJO_CURL/header-token
echo -n "Authorization: token "
cat $DOT/token
) >$DOT/header-token
# #
# Verify it works # Verify the token works
# #
local status=$(api -w "%{http_code}" -o /dev/null "${url}/api/v1/user") local status=$(api -w "%{http_code}" -o /dev/null "${url}/api/v1/user")
if test "${status}" != 200; then if test "${status}" != 200 ; then
fatal_error "${url}/api/v1/user returns status code '${status}', the token is invalid, $0 logout and login again" fatal_error "${url}/api/v1/user returns status code '${status}', the token is invalid, $0 logout and login again"
return 1 return 1
fi fi
} }
function client() { function client() {
log_verbose curl --cookie $DOT/cookies -f -sS "$@" log_verbose curl --cookie $DOT_FORGEJO_CURL/cookies -f -sS "$@"
if ! curl --cookie $DOT/cookies -f -sS "$@"; then if ! curl --cookie $DOT_FORGEJO_CURL/cookies -f -sS "$@" ; then
fatal_error fatal_error
fi fi
} }
@ -112,19 +110,19 @@ function web() {
} }
function client_update_cookies() { function client_update_cookies() {
log_verbose curl --cookie-jar $DOT/cookies --cookie $DOT/cookies -w "%{http_code}" -f -sS "$@" log_verbose curl --cookie-jar $DOT_FORGEJO_CURL/cookies --cookie $DOT_FORGEJO_CURL/cookies -w "%{http_code}" -f -sS "$@"
local status=$(curl --cookie-jar $DOT/cookies --cookie $DOT/cookies -w "%{http_code}" -f -sS "$@") local status=$(curl --cookie-jar $DOT_FORGEJO_CURL/cookies --cookie $DOT_FORGEJO_CURL/cookies -w "%{http_code}" -f -sS "$@")
if ! test "${status}" = 200 -o "${status}" = 303; then if ! test "${status}" = 200 -o "${status}" = 303 ; then
fatal_error fatal_error
fi fi
} }
function login_client() { function login_client() {
local user="$1" password="$2" url="$3" local user="$1" password="$2" url="$3"
if test -z "$password"; then if test -z "$password" ; then
log_verbose "no password, web will not be authenticated" log_verbose "no password, web will not be authenticated"
return return
fi fi
dot_ensure dot_ensure
@ -135,23 +133,23 @@ function login_client() {
# #
# The login stores a cookie # The login stores a cookie
# #
client_update_cookies -X POST --data "user_name=${user}" --data "password=${password}" "${url}/user/login" -o $DOT/login.html client_update_cookies -X POST --data "user_name=${user}" --data "password=${password}" "${url}/user/login" -o $DOT_FORGEJO_CURL/login.html
# #
# Get the CSRF for reuse by other requests # Get the CSRF for reuse by other requests
# #
client_update_cookies -o /dev/null "${url}/user/login" client_update_cookies -o /dev/null "${url}/user/login"
local csrf=$(sed -n -e '/csrf/s/.*csrf\t//p' $DOT/cookies) local csrf=$(sed -n -e '/csrf/s/.*csrf\t//p' $DOT_FORGEJO_CURL/cookies)
echo "X-Csrf-Token: $csrf" >$DOT/header-csrf echo "X-Csrf-Token: $csrf" > $DOT_FORGEJO_CURL/header-csrf
# #
# Verify it works # Verify it works
# #
local status=$(web -o /dev/null -w "%{http_code}" "${url}/user/settings") local status=$(web -o /dev/null -w "%{http_code}" "${url}/user/settings")
if test "${status}" != 200; then if test "${status}" != 200 ; then
grep -C 1 flash-error $DOT/login.html grep -C 1 flash-error $DOT_FORGEJO_CURL/login.html
if ${DEBUG}; then if ${DEBUG} ; then
cat $DOT/login.html cat $DOT_FORGEJO_CURL/login.html
fi fi
fatal_error login failed, the user or password are probably incorrect, try again with --verbose fatal_error login failed, the user or password are probably incorrect, try again with --verbose
fi fi
} }
@ -162,12 +160,13 @@ function login() {
} }
function logout() { function logout() {
rm -f $DOT/* rm -f $DOT_FORGEJO_CURL/*
if test -d $DOT; then if test -d $DOT_FORGEJO_CURL ; then
rmdir $DOT rmdir $DOT_FORGEJO_CURL
fi fi
} }
function usage() { function usage() {
cat >&2 <<EOF cat >&2 <<EOF
forgejo-curl.sh - thin curl wrapper that helps with Forgejo authentication forgejo-curl.sh - thin curl wrapper that helps with Forgejo authentication
@ -187,9 +186,9 @@ LOGIN AND TOKEN
The web endpoints that require authentication will be given a cookie The web endpoints that require authentication will be given a cookie
and CSRF token created using the the --user and --password credentials and CSRF token created using the the --user and --password credentials
On a successful login the credentials are stored in the $DOT On a successful login the credentials are stored in the $DOT_FORGEJO_CURL
directory to be used by the web, api, api_json commands. The logout directory to be used by the web, api, api_json commands. The logout
command removes the $DOT directory. command removes the $DOT_FORGEJO_CURL directory.
If the argument of --token starts with @, it is used as a filename If the argument of --token starts with @, it is used as a filename
from which the token will be read. from which the token will be read.
@ -271,69 +270,69 @@ function main() {
local command=login user password token scopes local command=login user password token scopes
while true; do while true; do
case "$1" in case "$1" in
--verbose) --verbose)
shift shift
verbose verbose
;; ;;
--debug) --debug)
shift shift
debug debug
;; ;;
--user) --user)
shift shift
user="$1" user="$1"
shift shift
;; ;;
--password) --password)
shift shift
password="$1" password="$1"
shift shift
;; ;;
--token) --token)
shift shift
token="$1" token="$1"
shift shift
;; ;;
--scopes) --scopes)
shift shift
scopes="$1" scopes="$1"
shift shift
;; ;;
login) login)
shift shift
login "$user" "$password" "$token" "$scopes" "$1" login "$user" "$password" "$token" "$scopes" "$1"
return 0 return 0
;; ;;
logout) logout)
shift shift
logout logout
return 0 return 0
;; ;;
web) web)
shift shift
web "$@" web "$@"
return 0 return 0
;; ;;
api) api)
shift shift
api "$@" api "$@"
return 0 return 0
;; ;;
api_json) api_json)
shift shift
api_json "$@" api_json "$@"
return 0 return 0
;; ;;
--version) --version)
echo "forgejo-curl.sh version $VERSION" echo "forgejo-curl.sh version $VERSION"
return 0 return 0
;; ;;
--help | *) --help|*)
usage usage
return 1 return 1
;; ;;
esac esac
done done
} }

4
tests/run.sh
View file

@ -18,7 +18,7 @@ function push_self() {
function user_login() { function user_login() {
local username=$1 local username=$1
( (
export DOT=$TMPDIR/$username export DOT_FORGEJO_CURL=$TMPDIR/$username
forgejo-curl.sh logout forgejo-curl.sh logout
forgejo-curl.sh --user $username --password "${options[password]}" login ${options[url]} forgejo-curl.sh --user $username --password "${options[password]}" login ${options[url]}
) )
@ -27,7 +27,7 @@ function user_login() {
function user_curl() { function user_curl() {
local username=$1 local username=$1
shift shift
DOT=$TMPDIR/$username forgejo-curl.sh "$@" DOT_FORGEJO_CURL=$TMPDIR/$username forgejo-curl.sh "$@"
} }
function user_token() { function user_token() {