Merge branch 'fix/attr-encrypted-issue' into 'master'
Fix encrypted data backwards compatibility after upgrading attr_encrypted gem Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073 See merge request !4963
This commit is contained in:
commit
2c3f3cb392
|
@ -15,6 +15,9 @@ v 8.10.0 (unreleased)
|
||||||
- Add API endpoint for a group issues !4520 (mahcsig)
|
- Add API endpoint for a group issues !4520 (mahcsig)
|
||||||
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
|
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
|
||||||
|
|
||||||
|
v 8.9.3 (unreleased)
|
||||||
|
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
|
||||||
|
|
||||||
v 8.9.2
|
v 8.9.2
|
||||||
- Fix visibility of snippets when searching.
|
- Fix visibility of snippets when searching.
|
||||||
- Fix an information disclosure when requesting access to a group containing private projects.
|
- Fix an information disclosure when requesting access to a group containing private projects.
|
||||||
|
|
|
@ -13,6 +13,7 @@ module Ci
|
||||||
|
|
||||||
attr_encrypted :value,
|
attr_encrypted :value,
|
||||||
mode: :per_attribute_iv_and_salt,
|
mode: :per_attribute_iv_and_salt,
|
||||||
|
insecure_mode: true,
|
||||||
key: Gitlab::Application.secrets.db_key_base,
|
key: Gitlab::Application.secrets.db_key_base,
|
||||||
algorithm: 'aes-256-cbc'
|
algorithm: 'aes-256-cbc'
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base
|
||||||
marshal: true,
|
marshal: true,
|
||||||
encode: true,
|
encode: true,
|
||||||
mode: :per_attribute_iv_and_salt,
|
mode: :per_attribute_iv_and_salt,
|
||||||
|
insecure_mode: true,
|
||||||
algorithm: 'aes-256-cbc'
|
algorithm: 'aes-256-cbc'
|
||||||
|
|
||||||
serialize :data, JSON
|
serialize :data, JSON
|
||||||
|
|
|
@ -25,6 +25,7 @@ class User < ActiveRecord::Base
|
||||||
attr_encrypted :otp_secret,
|
attr_encrypted :otp_secret,
|
||||||
key: Gitlab::Application.config.secret_key_base,
|
key: Gitlab::Application.config.secret_key_base,
|
||||||
mode: :per_attribute_iv_and_salt,
|
mode: :per_attribute_iv_and_salt,
|
||||||
|
insecure_mode: true,
|
||||||
algorithm: 'aes-256-cbc'
|
algorithm: 'aes-256-cbc'
|
||||||
|
|
||||||
devise :two_factor_authenticatable,
|
devise :two_factor_authenticatable,
|
||||||
|
|
Loading…
Reference in New Issue