-
Notifications
You must be signed in to change notification settings - Fork 828
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: UAA delete user endpoint returns false error during upgrade canary deployment #2790
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
28 changes: 28 additions & 0 deletions
28
...src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_108__Restore_MFA_Tables.sql
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,28 @@ | ||
-- | ||
-- These tables were previously dropped in https://github.com/cloudfoundry/uaa/pull/2717 | ||
-- Restoring them here due to https://github.com/cloudfoundry/uaa/issues/2789 | ||
-- Can consider dropping these again in the future (e.g. at UAA V78/79, when most users | ||
-- will no longer experience issue #2789) | ||
-- | ||
|
||
CREATE TABLE mfa_providers ( | ||
id CHAR(36) NOT NULL PRIMARY KEY, | ||
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, | ||
lastmodified TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, | ||
identity_zone_id varchar(36) NOT NULL, | ||
name varchar(255) NOT NULL, | ||
type varchar(255) NOT NULL, | ||
config LONGVARCHAR | ||
); | ||
|
||
CREATE TABLE user_google_mfa_credentials ( | ||
user_id VARCHAR(36) NOT NULL, | ||
secret_key VARCHAR(255) NOT NULL, | ||
validation_code INTEGER, | ||
scratch_codes VARCHAR(255) NOT NULL, | ||
mfa_provider_id CHAR(36) NOT NULL, | ||
zone_id CHAR(36) NOT NULL, | ||
encryption_key_label VARCHAR(255), | ||
encrypted_validation_code VARCHAR(255) NULL, | ||
PRIMARY KEY (user_id,mfa_provider_id) | ||
); |
27 changes: 27 additions & 0 deletions
27
.../src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_108__Restore_MFA_Tables.sql
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,27 @@ | ||
-- | ||
-- These tables were previously dropped in https://github.com/cloudfoundry/uaa/pull/2717 | ||
-- Restoring them here due to https://github.com/cloudfoundry/uaa/issues/2789 | ||
-- Can consider dropping these again in the future (e.g. at UAA V78/79, when most users | ||
-- will no longer experience issue #2789) | ||
-- | ||
|
||
CREATE TABLE IF NOT EXISTS `mfa_providers` ( | ||
`id` varchar(36) NOT NULL, | ||
`created` TIMESTAMP default current_timestamp NOT NULL, | ||
`lastModified` TIMESTAMP null, | ||
`identity_zone_id` varchar(36) NOT NULL, | ||
`name` varchar(255) NOT NULL, | ||
`type` varchar(255) NOT NULL, | ||
`config` longtext | ||
); | ||
|
||
CREATE TABLE IF NOT EXISTS `user_google_mfa_credentials` ( | ||
`user_id` VARCHAR(36) NOT NULL, | ||
`secret_key` VARCHAR(255) NOT NULL, | ||
`validation_code` INTEGER NULL, | ||
`scratch_codes` VARCHAR(255) NOT NULL, | ||
`mfa_provider_id` CHAR(36) NOT NULL, | ||
`zone_id` CHAR(36) NOT NULL, | ||
`encryption_key_label` VARCHAR(255), | ||
`encrypted_validation_code` VARCHAR(255) NULL | ||
); |
29 changes: 29 additions & 0 deletions
29
...main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_108__Restore_MFA_Tables.sql
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,29 @@ | ||
-- | ||
-- These tables were previously dropped in https://github.com/cloudfoundry/uaa/pull/2717 | ||
-- Restoring them here due to https://github.com/cloudfoundry/uaa/issues/2789 | ||
-- | ||
-- Can consider dropping these again in the future (e.g. at UAA V78/79, when most users | ||
-- will no longer experience issue #2789) | ||
-- | ||
|
||
CREATE TABLE IF NOT EXISTS mfa_providers ( | ||
id VARCHAR(36) NOT NULL PRIMARY KEY, | ||
created TIMESTAMP default current_timestamp NOT NULL, | ||
lastModified TIMESTAMP null, | ||
identity_zone_id VARCHAR(36) NOT NULL, | ||
name VARCHAR(255) NOT NULL, | ||
type VARCHAR(255) NOT NULL, | ||
config TEXT | ||
); | ||
|
||
CREATE TABLE IF NOT EXISTS user_google_mfa_credentials ( | ||
user_id VARCHAR(36) NOT NULL PRIMARY KEY, | ||
secret_key VARCHAR(255) NOT NULL, | ||
validation_code INTEGER, | ||
scratch_codes VARCHAR(255) NOT NULL, | ||
mfa_provider_id CHAR(36) NOT NULL, | ||
zone_id CHAR(36) NOT NULL, | ||
encryption_key_label VARCHAR(255), | ||
encrypted_validation_code VARCHAR(255) NULL | ||
); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
4_108 is now used from recent merge, so if you want this please incr. number