penguin/s3-arch-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some MacOS inconsistency

Browse Source
This commit is contained in:
斟酌 鵬兄
2022-11-14 20:27:47 +08:00
parent 8ab60370a0
commit 5d2acc0710
6 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch_upload_aws4.sh
View File

@@ -36,11 +36,14 @@ if [ -z "$ARCH_S3_BUCKET_URL" ]; then
exit 1
fi
BUCKET_NAME=$( echo -n $ARCH_S3_BUCKET_URL | cut -d'.' -f1 )
SERVICE=$( echo -n $ARCH_S3_BUCKET_URL | cut -d'.' -f2 )
REGION=$( echo -n $ARCH_S3_BUCKET_URL | cut -d'.' -f3 )
ACCESS_KEY=$( echo -n $ARCH_S3_AUTH | cut -d':' -f1 )
SECRET_KEY=$( echo -n $ARCH_S3_AUTH | cut -d':' -f2 )
function _str { printf "%s" $@; }
function _stre { printf $@; }
BUCKET_NAME=$( _str $ARCH_S3_BUCKET_URL | cut -d'.' -f1 )
SERVICE=$( _str $ARCH_S3_BUCKET_URL | cut -d'.' -f2 )
REGION=$( _str $ARCH_S3_BUCKET_URL | cut -d'.' -f3 )
ACCESS_KEY=$( _str $ARCH_S3_AUTH | cut -d':' -f1 )
SECRET_KEY=$( _str $ARCH_S3_AUTH | cut -d':' -f2 )
BUCKET_URL=$ARCH_S3_BUCKET_URL
@@ -72,9 +75,9 @@ _C="$_C\n$_FILE_SHA"
_S="AWS4-HMAC-SHA256"
_S="$_S\n$_DTIME"
_S="$_S\n$_DATE/$REGION/$SERVICE/aws4_request"
_S="$_S\n$( echo -ne "$_C" | sha256sum | cut -d' ' -f1 )"
_S="$_S\n$( _stre "$_C" | sha256sum | cut -d' ' -f1 )"
function _HMAC { echo -ne "$2" | openssl dgst -sha256 -hex -mac HMAC -macopt "$1" | cut -d' ' -f2; }
function _HMAC { _stre "$2" | openssl dgst -sha256 -hex -mac HMAC -macopt "$1" | cut -d' ' -f2; }
SIG=$( _HMAC "key:AWS4$SECRET_KEY" "$_DATE" )
SIG=$( _HMAC "hexkey:$SIG" "$REGION" )