Commit b6ddf37d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/attr-encrypted-ee-issue' into 'master'

fix attr_encrypted in EE

Same MR as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4963/ for CE - but EE has some extra attributes missing.

Fixes #19073

See merge request !502
parents 80a16d49 b7f8512c
...@@ -2,6 +2,9 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -2,6 +2,9 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.10.0 (unreleased) v 8.10.0 (unreleased)
v 8.9.3 (unreleased)
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
v 8.9.1 v 8.9.1
- Improve Geo documentation. !431 - Improve Geo documentation. !431
- Fix remote mirror stuck on started issue. !491 - Fix remote mirror stuck on started issue. !491
......
...@@ -13,6 +13,7 @@ module Ci ...@@ -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
......
...@@ -12,6 +12,7 @@ class PagesDomain < ActiveRecord::Base ...@@ -12,6 +12,7 @@ class PagesDomain < ActiveRecord::Base
attr_encrypted :key, attr_encrypted :key,
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'
......
...@@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base ...@@ -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 RemoteMirror < ActiveRecord::Base ...@@ -25,6 +25,7 @@ class RemoteMirror < 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'
belongs_to :project belongs_to :project
......
...@@ -25,6 +25,7 @@ class User < ActiveRecord::Base ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment