Merge "Support base64 padding in federated tokens"

This commit is contained in:
Jenkins 2015-09-21 21:58:31 +00:00 committed by Gerrit Code Review
commit 97df8c7319

View File

@ -72,7 +72,7 @@ if [ "$?" != "0" ]; then
echo "Could not obtain IdP token, did you forget to import your openrc file? See token.json and error.log for details." echo "Could not obtain IdP token, did you forget to import your openrc file? See token.json and error.log for details."
exit 1 exit 1
fi fi
IDP_TOKEN=`grep X-Subject-Token token.txt | grep -Po ': .*' | grep -Po '[a-zA-Z0-9-_]*'` IDP_TOKEN=`grep X-Subject-Token token.txt | grep -Po ': .*' | grep -Po '[a-zA-Z0-9-_%]*'`
echo - Obtained IdP token. echo - Obtained IdP token.
# obtain the service provider URLs # obtain the service provider URLs
@ -106,7 +106,7 @@ if [ "$?" != "0" ] || ! grep -q X-Subject-Token unscoped.txt; then
echo Could not obtain unscoped token from service provider. See unscoped.txt and error.log for details. echo Could not obtain unscoped token from service provider. See unscoped.txt and error.log for details.
exit 1 exit 1
fi fi
UNSCOPED_TOKEN=`grep X-Subject-Token unscoped.txt | grep -Po ': .*' | grep -Po '[a-zA-Z0-9-_]*'` UNSCOPED_TOKEN=`grep X-Subject-Token unscoped.txt | grep -Po ': .*' | grep -Po '[a-zA-Z0-9-_%]*'`
echo - Obtained unscoped token from SP: $UNSCOPED_TOKEN echo - Obtained unscoped token from SP: $UNSCOPED_TOKEN
echo '- Domains available at sp: ' echo '- Domains available at sp: '