-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
client: Fix sql migration step for oidc (ory#919)
A bug was introduced in beta.5 which caused the SQL migrations to fail if data existed in the database already. This patch resolves that and adds test cases for the migration steps by adding data after each migration. Closes ory#918 Signed-off-by: arekkas <[email protected]>
- Loading branch information
Showing
4 changed files
with
305 additions
and
59 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * Copyright © 2015-2018 Aeneas Rekkas <[email protected]> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * @author Aeneas Rekkas <[email protected]> | ||
| * @Copyright 2017-2018 Aeneas Rekkas <[email protected]> | ||
| * @license Apache-2.0 | ||
| */ | ||
|
|
||
| package client_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "testing" | ||
|
|
||
| "github.com/jmoiron/sqlx" | ||
| "github.com/ory/fosite" | ||
| "github.com/ory/hydra/client" | ||
| "github.com/ory/sqlcon/dockertest" | ||
| "github.com/rubenv/sql-migrate" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| var createClientMigrations = []*migrate.Migration{ | ||
| { | ||
| Id: "1-data", | ||
| Up: []string{ | ||
| `INSERT INTO hydra_client (id, client_name, client_secret, redirect_uris, grant_types, response_types, scope, owner, policy_uri, tos_uri, client_uri, logo_uri, contacts, public) VALUES ('1-data', 'some-client', 'abcdef', 'http://localhost|http://google', 'authorize_code|implicit', 'token|id_token', 'foo|bar', 'aeneas', 'http://policy', 'http://tos', 'http://client', 'http://logo', 'aeneas|foo', true)`, | ||
| }, | ||
| Down: []string{ | ||
| `DELETE FROM hydra_client WHERE id='1-data'`, | ||
| }, | ||
| }, | ||
| { | ||
| Id: "2-data", | ||
| Up: []string{ | ||
| `INSERT INTO hydra_client (id, client_name, client_secret, redirect_uris, grant_types, response_types, scope, owner, policy_uri, tos_uri, client_uri, logo_uri, contacts, public, client_secret_expires_at) VALUES ('2-data', 'some-client', 'abcdef', 'http://localhost|http://google', 'authorize_code|implicit', 'token|id_token', 'foo|bar', 'aeneas', 'http://policy', 'http://tos', 'http://client', 'http://logo', 'aeneas|foo', true, 0)`, | ||
| }, | ||
| Down: []string{ | ||
| `DELETE FROM hydra_client WHERE id='2-data'`, | ||
| }, | ||
| }, | ||
| { | ||
| Id: "3-data", | ||
| Up: []string{ | ||
| `INSERT INTO hydra_client (id, client_name, client_secret, redirect_uris, grant_types, response_types, scope, owner, policy_uri, tos_uri, client_uri, logo_uri, contacts, public, client_secret_expires_at, sector_identifier_uri, jwks, jwks_uri, token_endpoint_auth_method, request_uris, request_object_signing_alg, userinfo_signed_response_alg) VALUES ('3-data', 'some-client', 'abcdef', 'http://localhost|http://google', 'authorize_code|implicit', 'token|id_token', 'foo|bar', 'aeneas', 'http://policy', 'http://tos', 'http://client', 'http://logo', 'aeneas|foo', true, 0, 'http://sector', '{"keys": []}', 'http://jwks', 'client_secret', 'http://uri1|http://uri2', 'rs256', 'rs526')`, | ||
| }, | ||
| Down: []string{ | ||
| `DELETE FROM hydra_client WHERE id='3-data'`, | ||
| }, | ||
| }, | ||
| { | ||
| Id: "4-data", | ||
| Up: []string{ | ||
| `INSERT INTO hydra_client (id, client_name, client_secret, redirect_uris, grant_types, response_types, scope, owner, policy_uri, tos_uri, client_uri, logo_uri, contacts, public, client_secret_expires_at, sector_identifier_uri, jwks, jwks_uri, token_endpoint_auth_method, request_uris, request_object_signing_alg, userinfo_signed_response_alg) VALUES ('4-data', 'some-client', 'abcdef', 'http://localhost|http://google', 'authorize_code|implicit', 'token|id_token', 'foo|bar', 'aeneas', 'http://policy', 'http://tos', 'http://client', 'http://logo', 'aeneas|foo', true, 0, 'http://sector', '{"keys": []}', 'http://jwks', 'client_secret', 'http://uri1|http://uri2', 'rs256', 'rs526')`, | ||
| }, | ||
| Down: []string{ | ||
| `DELETE FROM hydra_client WHERE id='4-data'`, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| var migrations = map[string]*migrate.MemoryMigrationSource{ | ||
| "mysql": { | ||
| Migrations: []*migrate.Migration{ | ||
| {Id: "0-data", Up: []string{"DROP TABLE IF EXISTS hydra_client"}}, | ||
| client.Migrations["mysql"].Migrations[0], | ||
| createClientMigrations[0], | ||
| client.Migrations["mysql"].Migrations[1], | ||
| createClientMigrations[1], | ||
| client.Migrations["mysql"].Migrations[2], | ||
| createClientMigrations[2], | ||
| client.Migrations["mysql"].Migrations[3], | ||
| createClientMigrations[3], | ||
| }, | ||
| }, | ||
| "postgres": { | ||
| Migrations: []*migrate.Migration{ | ||
| {Id: "0-data", Up: []string{"DROP TABLE IF EXISTS hydra_client"}}, | ||
| client.Migrations["postgres"].Migrations[0], | ||
| createClientMigrations[0], | ||
| client.Migrations["postgres"].Migrations[1], | ||
| createClientMigrations[1], | ||
| client.Migrations["postgres"].Migrations[2], | ||
| createClientMigrations[2], | ||
| client.Migrations["postgres"].Migrations[3], | ||
| createClientMigrations[3], | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| func TestMigrations(t *testing.T) { | ||
| var dbs = map[string]*sqlx.DB{} | ||
| if testing.Short() { | ||
| return | ||
| } | ||
|
|
||
| dockertest.Parallel([]func(){ | ||
| func() { | ||
| db, err := dockertest.ConnectToTestPostgreSQL() | ||
| if err != nil { | ||
| log.Fatalf("Could not connect to database: %v", err) | ||
| } | ||
| dbs["postgres"] = db | ||
| }, | ||
| func() { | ||
| db, err := dockertest.ConnectToTestMySQL() | ||
| if err != nil { | ||
| log.Fatalf("Could not connect to database: %v", err) | ||
| } | ||
| dbs["mysql"] = db | ||
| }, | ||
| }) | ||
|
|
||
| for k, db := range dbs { | ||
| t.Run(fmt.Sprintf("database=%s", k), func(t *testing.T) { | ||
| migrate.SetTable("hydra_client_migration_integration") | ||
| for step := range migrations[k].Migrations { | ||
| t.Run(fmt.Sprintf("step=%d", step), func(t *testing.T) { | ||
| n, err := migrate.ExecMax(db.DB, db.DriverName(), migrations[k], migrate.Up, 1) | ||
| require.NoError(t, err) | ||
| require.Equal(t, n, 1) | ||
| }) | ||
| } | ||
|
|
||
| for _, key := range []string{"1-data", "2-data", "3-data", "4-data"} { | ||
| t.Run("client="+key, func(t *testing.T) { | ||
| s := &client.SQLManager{DB: db, Hasher: &fosite.BCrypt{WorkFactor: 4}} | ||
| c, err := s.GetConcreteClient(key) | ||
| require.NoError(t, err) | ||
| assert.EqualValues(t, c.ID, key) | ||
| }) | ||
| } | ||
|
|
||
| for step := range migrations[k].Migrations { | ||
| t.Run(fmt.Sprintf("step=%d", step), func(t *testing.T) { | ||
| n, err := migrate.ExecMax(db.DB, db.DriverName(), migrations[k], migrate.Down, 1) | ||
| require.NoError(t, err) | ||
| require.Equal(t, n, 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
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.