-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 1646-escape-or-reject-special-characters-in-…
…user-provided-strings
- Loading branch information
Showing
16 changed files
with
317 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| __VERSION__ = "2.5.0a0" | ||
| __VERSION__ = "2.5.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,115 @@ | ||
| #!/bin/bash | ||
|
|
||
| AUTHORIZATION_URL=$(curl --silent \ | ||
| http://127.0.0.1:8001/auth/dexidp/authorize/ \ | ||
| | jq -r ".authorization_url" | ||
| ) | ||
| # --- Functions | ||
|
|
||
| TOKEN=$( | ||
| curl -L --silent --output /dev/null --cookie-jar - "$AUTHORIZATION_URL" \ | ||
| | grep "fastapiusersauth" | awk '{print $NF}' | ||
| ) | ||
| oauth_login(){ | ||
| AUTHORIZATION_URL=$(curl --silent \ | ||
| http://127.0.0.1:8001/auth/dexidp/authorize/ \ | ||
| | jq -r ".authorization_url" | ||
| ) | ||
| TOKEN_OAUTH=$( | ||
| curl -L --silent --output /dev/null --cookie-jar - "$AUTHORIZATION_URL" \ | ||
| | grep "fastapiusersauth" | awk '{print $NF}' | ||
| ) | ||
| echo $TOKEN_OAUTH | ||
| } | ||
|
|
||
| standard_login(){ | ||
| # $1: username | ||
| # $2: password | ||
| TOKEN=$(curl --silent -X POST \ | ||
| http://127.0.0.1:8001/auth/token/login/ \ | ||
| -H "Content-Type: application/x-www-form-urlencoded" \ | ||
| -d "username=$1&password=$2" | jq -r ".access_token" | ||
| ) | ||
| echo $TOKEN | ||
| } | ||
|
|
||
| assert_users_and_oauth() { | ||
| # $1 desired number of users | ||
| # $2 desired number of oauth accounts | ||
| USERS=$(sqlite3 $SQLITE_PATH "SELECT * FROM user_oauth;" | wc -l) | ||
| OAUTH_ACCOUNTS=$(sqlite3 $SQLITE_PATH "SELECT * FROM oauthaccount;" | wc -l) | ||
| if [ "$USERS" -ne "$1" ] || [ "$OAUTH_ACCOUNTS" -ne "$2" ]; then | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| assert_email_and_id(){ | ||
| # $1 access token | ||
| # $2 desired email | ||
| # $3 desired user id | ||
| USER=$( | ||
| curl --silent -H "Authorization: Bearer $1" \ | ||
| http://127.0.0.1:8001/auth/current-user/ | ||
| ) | ||
| EMAIL=$(echo $USER | jq -r ".email") | ||
| ID=$(echo $USER | jq -r ".id") | ||
| if [ "$EMAIL" != "$2" ]; then | ||
| exit 1 | ||
| fi | ||
| if [ "$ID" != "$3" ]; then | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| # --- Test | ||
|
|
||
|
|
||
| # Register "kilgore@kilgore.trout" (the user from Dex) as regular account. | ||
| SUPERUSER_TOKEN=$(standard_login "admin@fractal.xy" "1234") | ||
|
|
||
| assert_users_and_oauth 1 0 | ||
| curl -X POST \ | ||
| http://127.0.0.1:8001/auth/register/ \ | ||
| -H "Content-Type: application/json" \ | ||
| -H "Authorization: Bearer $SUPERUSER_TOKEN" \ | ||
| -d '{"email": "kilgore@kilgore.trout", "password": "kilgore"}' | ||
| assert_users_and_oauth 2 0 | ||
|
|
||
| WHOAMI=$( | ||
| curl --silent -H "Authorization: Bearer $TOKEN" \ | ||
| http://127.0.0.1:8001/auth/current-user/ | ||
| # Login with "kilgore@kilgore.trout" with standard login. | ||
| USER_TOKEN=$(standard_login "kilgore@kilgore.trout" "kilgore") | ||
| USER_ID=$( | ||
| curl --silent -H "Authorization: Bearer $USER_TOKEN" \ | ||
| http://127.0.0.1:8001/auth/current-user/ | jq -r ".id" | ||
| ) | ||
|
|
||
| EXPECTED_USER='{"id":2,"email":"kilgore@kilgore.trout","is_active":true,"is_superuser":false,"is_verified":false,"slurm_user":null,"cache_dir":null,"username":null,"slurm_accounts":[],"group_ids":null,"group_names":null}' | ||
| assert_email_and_id $USER_TOKEN "kilgore@kilgore.trout" $USER_ID | ||
|
|
||
| # First oauth login: | ||
| # - create "kilgore@kilgore.trout" oauth account, | ||
| # - associate by email with existing user. | ||
| USER_TOKEN_OAUTH=$(oauth_login) | ||
|
|
||
| assert_users_and_oauth 2 1 | ||
| assert_email_and_id $USER_TOKEN_OAUTH "kilgore@kilgore.trout" $USER_ID | ||
|
|
||
| # Change email into "kilgore@fractal.xy". | ||
| curl -X PATCH \ | ||
| "http://127.0.0.1:8001/auth/users/$USER_ID/" \ | ||
| -H "Content-Type: application/json" \ | ||
| -H "Authorization: Bearer $SUPERUSER_TOKEN" \ | ||
| -d '{"email": "kilgore@fractal.xy"}' | ||
|
|
||
| # Test I can login as "kilgore@fractal.xy" with both standard and oauth login. | ||
| USER_TOKEN=$(standard_login "kilgore@fractal.xy" "kilgore") | ||
| assert_email_and_id $USER_TOKEN "kilgore@fractal.xy" $USER_ID | ||
|
|
||
| USER_TOKEN_OAUTH=$(oauth_login) | ||
| assert_email_and_id $USER_TOKEN_OAUTH "kilgore@fractal.xy" $USER_ID | ||
|
|
||
| # Remove all oauth accounts from db. | ||
| assert_users_and_oauth 2 1 | ||
| sqlite3 $SQLITE_PATH "DELETE FROM oauthaccount;" | ||
| assert_users_and_oauth 2 0 | ||
|
|
||
| # Test I can login as "kilgore@fractal.xy" with standard login. | ||
| USER_TOKEN=$(standard_login "kilgore@fractal.xy" "kilgore") | ||
| assert_email_and_id $USER_TOKEN "kilgore@fractal.xy" $USER_ID | ||
|
|
||
| # Using oauth login creates another user: "kilgore@kilgore.trout". | ||
| assert_users_and_oauth 2 0 | ||
| USER_TOKEN_OAUTH=$(oauth_login) | ||
| assert_users_and_oauth 3 1 | ||
|
|
||
| # Assert that WHOAMI is equal to EXPECTED_USER | ||
| diff <(echo $WHOAMI | jq --sort-keys .) <(echo $EXPECTED_USER | jq --sort-keys .) | ||
| if [ "$?" != "0" ]; then | ||
| exit 1 | ||
| fi | ||
| assert_email_and_id $USER_TOKEN_OAUTH "kilgore@kilgore.trout" $((USER_ID+1)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.