Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-10 15:05:22 +0300
committerNick Thomas <nick@gitlab.com>2018-10-01 17:33:36 +0300
commitfb48eaba4600c1e0e36afae6ec7638d52265a62c (patch)
treecc4d0c6799d7dd4a45aa55b8f0a59ccd3ef37753 /app/models/hooks
parent1b7fd53ae37bb7836e7fd3be80077717d1b3cd4d (diff)
Encrypt webhook tokens and URLs in the database
Diffstat (limited to 'app/models/hooks')
-rw-r--r--app/models/hooks/web_hook.rb44
1 files changed, 44 insertions, 0 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 771a61b090f..68ba4b213b2 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -3,6 +3,16 @@
class WebHook < ActiveRecord::Base
include Sortable
+ attr_encrypted :token,
+ mode: :per_attribute_iv,
+ algorithm: 'aes-256-gcm',
+ key: Settings.attr_encrypted_db_key_base_truncated
+
+ attr_encrypted :url,
+ mode: :per_attribute_iv,
+ algorithm: 'aes-256-gcm',
+ key: Settings.attr_encrypted_db_key_base_truncated
+
has_many :web_hook_logs, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
validates :url, presence: true, public_url: { allow_localhost: lambda(&:allow_local_requests?),
@@ -27,4 +37,38 @@ class WebHook < ActiveRecord::Base
def allow_local_requests?
false
end
+
+ # In 11.4, the web_hooks table has both `token` and `encrypted_token` fields.
+ # Ensure that the encrypted version always takes precedence if present.
+ alias_method :attr_encrypted_token, :token
+ def token
+ attr_encrypted_token.presence || read_attribute(:token)
+ end
+
+ # In 11.4, the web_hooks table has both `token` and `encrypted_token` fields.
+ # Pending a background migration to encrypt all fields, we should just clear
+ # the unencrypted value whenever the new value is set.
+ alias_method :'attr_encrypted_token=', :'token='
+ def token=(value)
+ self.attr_encrypted_token = value
+
+ write_attribute(:token, nil)
+ end
+
+ # In 11.4, the web_hooks table has both `url` and `encrypted_url` fields.
+ # Ensure that the encrypted version always takes precedence if present.
+ alias_method :attr_encrypted_url, :url
+ def url
+ attr_encrypted_url.presence || read_attribute(:url)
+ end
+
+ # In 11.4, the web_hooks table has both `url` and `encrypted_url` fields.
+ # Pending a background migration to encrypt all fields, we should just clear
+ # the unencrypted value whenever the new value is set.
+ alias_method :'attr_encrypted_url=', :'url='
+ def url=(value)
+ self.attr_encrypted_url = value
+
+ write_attribute(:url, nil)
+ end
end