diff --git a/include/assume_role b/include/assume_role index cba07ef5..9e43c0b3 100644 --- a/include/assume_role +++ b/include/assume_role @@ -64,6 +64,7 @@ assume_role(){ export AWS_ACCESS_KEY_ID=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.AccessKeyId') export AWS_SECRET_ACCESS_KEY=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SecretAccessKey') export AWS_SESSION_TOKEN=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SessionToken') + export AWS_SESSION_EXPIRATION=$(convert_date_to_timestamp "$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.Expiration')") rm -fr $TEMP_STS_ASSUMED_FILE } diff --git a/include/os_detector b/include/os_detector index af962d4c..a99ad45f 100644 --- a/include/os_detector +++ b/include/os_detector @@ -108,6 +108,14 @@ bsd_get_iso8601_timestamp() { "$DATE_CMD" -u +"%Y-%m-%dT%H:%M:%SZ" } +gnu_convert_date_to_timestamp() { + date -d "$1" +%s +} + +bsd_convert_date_to_timestamp() { + date -j -f "%Y-%m-%dT%H:%M:%SZ" "$1" "+%s" +} + gnu_test_tcp_connectivity() { HOST=$1 PORT=$2 @@ -154,6 +162,9 @@ if [ "$OSTYPE" == "linux-gnu" ] || [ "$OSTYPE" == "linux-musl" ]; then test_tcp_connectivity() { gnu_test_tcp_connectivity "$1" "$2" "$3" } + convert_date_to_timestamp() { + gnu_convert_date_to_timestamp "$1" + } elif [[ "$OSTYPE" == "darwin"* ]]; then # BSD/OSX commands compatibility TEMP_REPORT_FILE=$(mktemp -t prowler.cred_report-XXXXXX) @@ -189,6 +200,9 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then get_iso8601_timestamp() { gnu_get_iso8601_timestamp } + convert_date_to_timestamp() { + gnu_convert_date_to_timestamp "$1" + } else how_older_from_today() { bsd_how_older_from_today "$1" @@ -208,6 +222,9 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then get_iso8601_timestamp() { bsd_get_iso8601_timestamp } + convert_date_to_timestamp() { + bsd_convert_date_to_timestamp "$1" + } fi if "$BASE64_CMD" --version >/dev/null 2>&1 ; then decode_report() { @@ -248,6 +265,9 @@ elif [[ "$OSTYPE" == "cygwin" ]]; then test_tcp_connectivity() { gnu_test_tcp_connectivity "$1" "$2" "$3" } + convert_date_to_timestamp() { + gnu_convert_date_to_timestamp "$1" + } else echo "Unknown Operating System! Valid \$OSTYPE: linux-gnu, linux-musl, darwin* or cygwin" echo "Found: $OSTYPE"