diff options
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/ci/secure_file_uploader.rb | 2 | ||||
| -rw-r--r-- | app/uploaders/metric_image_uploader.rb | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/uploaders/ci/secure_file_uploader.rb b/app/uploaders/ci/secure_file_uploader.rb index 514d88dd177..8aa624d6b30 100644 --- a/app/uploaders/ci/secure_file_uploader.rb +++ b/app/uploaders/ci/secure_file_uploader.rb @@ -10,7 +10,7 @@ module Ci encrypt(key: :key) def key - OpenSSL::HMAC.digest('SHA256', Gitlab::Application.secrets.db_key_base, model.project_id.to_s) + Digest::SHA256.digest model.key_data end def checksum diff --git a/app/uploaders/metric_image_uploader.rb b/app/uploaders/metric_image_uploader.rb new file mode 100644 index 00000000000..0826bb251e4 --- /dev/null +++ b/app/uploaders/metric_image_uploader.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class MetricImageUploader < GitlabUploader # rubocop:disable Gitlab/NamespacedClass + include RecordsUploads::Concern + include ObjectStorage::Concern + prepend ObjectStorage::Extension::RecordsUploads + include UploaderHelper + + private + + def dynamic_segment + File.join(model.class.underscore, mounted_as.to_s, model.id.to_s) + end + + class << self + def default_store + object_store_enabled? ? ObjectStorage::Store::REMOTE : ObjectStorage::Store::LOCAL + end + end +end |