activestorage 6.1.6 → 7.0.0.alpha1

data/lib/active_storage/service/gcs_service.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 gem "google-cloud-storage", "~> 1.11"
+require "google/apis/iamcredentials_v1"
 require "google/cloud/storage"
 
 module ActiveStorage
   # Wraps the Google Cloud Storage as an Active Storage service. See ActiveStorage::Service for the generic API
   # documentation that applies to all services.
   class Service::GCSService < Service
+    class MetadataServerError < ActiveStorage::Error; end
+    class MetadataServerNotFoundError < ActiveStorage::Error; end
+
     def initialize(public: false, **config)
       @config = config
       @public = public
@@ -19,7 +23,7 @@ module ActiveStorage
         # binary and attachment when the file's content type requires it. The only way to force them is to
         # store them as object's metadata.
         content_disposition = content_disposition_with(type: disposition, filename: filename) if disposition && filename
-        bucket.create_file(io, key, md5: checksum, content_type: content_type, content_disposition: content_disposition)
+        bucket.create_file(io, key, md5: checksum, cache_control: @config[:cache_control], content_type: content_type, content_disposition: content_disposition)
       rescue Google::Cloud::InvalidArgumentError
         raise ActiveStorage::IntegrityError
       end
@@ -84,7 +88,31 @@ module ActiveStorage
 
     def url_for_direct_upload(key, expires_in:, checksum:, **)
       instrument :url, key: key do |payload|
-        generated_url = bucket.signed_url key, method: "PUT", expires: expires_in, content_md5: checksum
+        headers = {}
+        version = :v2
+
+        if @config[:cache_control].present?
+          headers["Cache-Control"] = @config[:cache_control]
+          # v2 signing doesn't support non `x-goog-` headers. Only switch to v4 signing
+          # if necessary for back-compat; v4 limits the expiration of the URL to 7 days
+          # whereas v2 has no limit
+          version = :v4
+        end
+
+        args = {
+          content_md5: checksum,
+          expires: expires_in,
+          headers: headers,
+          method: "PUT",
+          version: version,
+        }
+
+        if @config[:iam]
+          args[:issuer] = issuer
+          args[:signer] = signer
+        end
+
+        generated_url = bucket.signed_url(key, **args)
 
         payload[:url] = generated_url
 
@@ -95,15 +123,31 @@ module ActiveStorage
     def headers_for_direct_upload(key, checksum:, filename: nil, disposition: nil, **)
       content_disposition = content_disposition_with(type: disposition, filename: filename) if filename
 
-      { "Content-MD5" => checksum, "Content-Disposition" => content_disposition }
+      headers = { "Content-MD5" => checksum, "Content-Disposition" => content_disposition }
+
+      if @config[:cache_control].present?
+        headers["Cache-Control"] = @config[:cache_control]
+      end
+
+      headers
     end
 
     private
       def private_url(key, expires_in:, filename:, content_type:, disposition:, **)
-        file_for(key).signed_url expires: expires_in, query: {
-          "response-content-disposition" => content_disposition_with(type: disposition, filename: filename),
-          "response-content-type" => content_type
+        args = {
+          expires: expires_in,
+          query: {
+            "response-content-disposition" => content_disposition_with(type: disposition, filename: filename),
+            "response-content-type" => content_type
+          }
         }
+
+        if @config[:iam]
+          args[:issuer] = issuer
+          args[:signer] = signer
+        end
+
+        file_for(key).signed_url(**args)
       end
 
       def public_url(key, **)
@@ -137,7 +181,47 @@ module ActiveStorage
       end
 
       def client
-        @client ||= Google::Cloud::Storage.new(**config.except(:bucket))
+        @client ||= Google::Cloud::Storage.new(**config.except(:bucket, :cache_control, :iam, :gsa_email))
+      end
+
+      def issuer
+        @issuer ||= if @config[:gsa_email]
+          @config[:gsa_email]
+        else
+          uri = URI.parse("http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email")
+          http = Net::HTTP.new(uri.host, uri.port)
+          request = Net::HTTP::Get.new(uri.request_uri)
+          request["Metadata-Flavor"] = "Google"
+
+          begin
+            response = http.request(request)
+          rescue SocketError
+            raise MetadataServerNotFoundError
+          end
+
+          if response.is_a?(Net::HTTPSuccess)
+            response.body
+          else
+            raise MetadataServerError
+          end
+        end
+      end
+
+      def signer
+        # https://googleapis.dev/ruby/google-cloud-storage/latest/Google/Cloud/Storage/Project.html#signed_url-instance_method
+        lambda do |string_to_sign|
+          iam_client = Google::Apis::IamcredentialsV1::IAMCredentialsService.new
+
+          scopes = ["https://www.googleapis.com/auth/iam"]
+          iam_client.authorization = Google::Auth.get_application_default(scopes)
+
+          request = Google::Apis::IamcredentialsV1::SignBlobRequest.new(
+            payload: string_to_sign
+          )
+          resource = "projects/-/serviceAccounts/#{issuer}"
+          response = iam_client.sign_service_account_blob(resource, request)
+          response.signed_blob
+        end
       end
   end
 end

data/lib/active_storage/service/mirror_service.rb

@@ -17,7 +17,7 @@ module ActiveStorage
       :url_for_direct_upload, :headers_for_direct_upload, :path_for, to: :primary
 
     # Stitch together from named services.
-    def self.build(primary:, mirrors:, name:, configurator:, **options) #:nodoc:
+    def self.build(primary:, mirrors:, name:, configurator:, **options) # :nodoc:
       new(
         primary: configurator.build(primary),
         mirrors: mirrors.collect { |mirror_name| configurator.build mirror_name }

data/lib/active_storage/service/registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveStorage
-  class Service::Registry #:nodoc:
+  class Service::Registry # :nodoc:
     def initialize(configurations)
       @configurations = configurations.deep_symbolize_keys
       @services = {}

data/lib/active_storage/service/s3_service.rb

@@ -96,14 +96,14 @@ module ActiveStorage
     end
 
     private
-      def private_url(key, expires_in:, filename:, disposition:, content_type:, **)
+      def private_url(key, expires_in:, filename:, disposition:, content_type:, **client_opts)
         object_for(key).presigned_url :get, expires_in: expires_in.to_i,
           response_content_disposition: content_disposition_with(type: disposition, filename: filename),
-          response_content_type: content_type
+          response_content_type: content_type, **client_opts
       end
 
-      def public_url(key, **)
-        object_for(key).public_url
+      def public_url(key, **client_opts)
+        object_for(key).public_url(**client_opts)
       end
 
 

data/lib/active_storage/service.rb

@@ -35,8 +35,8 @@ module ActiveStorage
   # can configure the service to use like this:
   #
   #   ActiveStorage::Blob.service = ActiveStorage::Service.configure(
-  #     :Disk,
-  #     root: Pathname("/foo/bar/storage")
+  #     :local,
+  #     { local: {service: "Disk",  root: Pathname("/tmp/foo/storage") } }
   #   )
   class Service
     extend ActiveSupport::Autoload
@@ -57,7 +57,7 @@ module ActiveStorage
       # Passes the configurator and all of the service's config as keyword args.
       #
       # See MirrorService for an example.
-      def build(configurator:, name:, service: nil, **service_config) #:nodoc:
+      def build(configurator:, name:, service: nil, **service_config) # :nodoc:
         new(**service_config).tap do |service_instance|
           service_instance.name = name
         end

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -13,9 +13,6 @@ module ActiveStorage
   module Transformers
     class ImageProcessingTransformer < Transformer
       private
-        class UnsupportedImageProcessingMethod < StandardError; end
-        class UnsupportedImageProcessingArgument < StandardError; end
-
         def process(file, format:)
           processor.
             source(file).
@@ -31,14 +28,10 @@ module ActiveStorage
 
         def operations
           transformations.each_with_object([]) do |(name, argument), list|
-            if ActiveStorage.variant_processor == :mini_magick
-              validate_transformation(name, argument)
-            end
-
             if name.to_s == "combine_options"
               raise ArgumentError, <<~ERROR.squish
                 Active Storage's ImageProcessing transformer doesn't support :combine_options,
-                as it always generates a single ImageMagick command.
+                as it always generates a single command.
               ERROR
             end
 
@@ -47,64 +40,6 @@ module ActiveStorage
             end
           end
         end
-
-        def validate_transformation(name, argument)
-          method_name = name.to_s.tr("-", "_")
-
-          unless ActiveStorage.supported_image_processing_methods.any? { |method| method_name == method }
-            raise UnsupportedImageProcessingMethod, <<~ERROR.squish
-              One or more of the provided transformation methods is not supported.
-            ERROR
-          end
-
-          if argument.present?
-            if argument.is_a?(String) || argument.is_a?(Symbol)
-              validate_arg_string(argument)
-            elsif argument.is_a?(Array)
-              validate_arg_array(argument)
-            elsif argument.is_a?(Hash)
-              validate_arg_hash(argument)
-            end
-          end
-        end
-
-        def validate_arg_string(argument)
-          unsupported_arguments = ActiveStorage.unsupported_image_processing_arguments.any? do |bad_arg|
-            argument.to_s.downcase.include?(bad_arg)
-          end
-
-          raise UnsupportedImageProcessingArgument if unsupported_arguments
-        end
-
-        def validate_arg_array(argument)
-          argument.each do |arg|
-            if arg.is_a?(Integer) || arg.is_a?(Float)
-              next
-            elsif arg.is_a?(String) || arg.is_a?(Symbol)
-              validate_arg_string(arg)
-            elsif arg.is_a?(Array)
-              validate_arg_array(arg)
-            elsif arg.is_a?(Hash)
-              validate_arg_hash(arg)
-            end
-          end
-        end
-
-        def validate_arg_hash(argument)
-          argument.each do |key, value|
-            validate_arg_string(key)
-
-            if value.is_a?(Integer) || value.is_a?(Float)
-              next
-            elsif value.is_a?(String) || value.is_a?(Symbol)
-              validate_arg_string(value)
-            elsif value.is_a?(Array)
-              validate_arg_array(value)
-            elsif value.is_a?(Hash)
-              validate_arg_hash(value)
-            end
-          end
-        end
     end
   end
 end

data/lib/active_storage/transformers/transformer.rb

@@ -31,7 +31,7 @@ module ActiveStorage
       private
         # Returns an open Tempfile containing a transformed image in the given +format+.
         # All subclasses implement this method.
-        def process(file, format:) #:doc:
+        def process(file, format:) # :doc:
           raise NotImplementedError
         end
     end

data/lib/active_storage.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2017-2022 David Heinemeier Hansson, Basecamp
+# Copyright (c) 2017-2021 David Heinemeier Hansson, Basecamp
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -37,6 +37,7 @@ module ActiveStorage
   extend ActiveSupport::Autoload
 
   autoload :Attached
+  autoload :FixtureSet
   autoload :Service
   autoload :Previewer
   autoload :Analyzer
@@ -58,298 +59,8 @@ module ActiveStorage
   mattr_accessor :content_types_to_serve_as_binary, default: []
   mattr_accessor :content_types_allowed_inline,     default: []
 
-  mattr_accessor :supported_image_processing_methods, default: [
-    "adaptive_blur",
-    "adaptive_resize",
-    "adaptive_sharpen",
-    "adjoin",
-    "affine",
-    "alpha",
-    "annotate",
-    "antialias",
-    "append",
-    "apply",
-    "attenuate",
-    "authenticate",
-    "auto_gamma",
-    "auto_level",
-    "auto_orient",
-    "auto_threshold",
-    "backdrop",
-    "background",
-    "bench",
-    "bias",
-    "bilateral_blur",
-    "black_point_compensation",
-    "black_threshold",
-    "blend",
-    "blue_primary",
-    "blue_shift",
-    "blur",
-    "border",
-    "bordercolor",
-    "borderwidth",
-    "brightness_contrast",
-    "cache",
-    "canny",
-    "caption",
-    "channel",
-    "channel_fx",
-    "charcoal",
-    "chop",
-    "clahe",
-    "clamp",
-    "clip",
-    "clip_path",
-    "clone",
-    "clut",
-    "coalesce",
-    "colorize",
-    "colormap",
-    "color_matrix",
-    "colors",
-    "colorspace",
-    "colourspace",
-    "color_threshold",
-    "combine",
-    "combine_options",
-    "comment",
-    "compare",
-    "complex",
-    "compose",
-    "composite",
-    "compress",
-    "connected_components",
-    "contrast",
-    "contrast_stretch",
-    "convert",
-    "convolve",
-    "copy",
-    "crop",
-    "cycle",
-    "deconstruct",
-    "define",
-    "delay",
-    "delete",
-    "density",
-    "depth",
-    "descend",
-    "deskew",
-    "despeckle",
-    "direction",
-    "displace",
-    "dispose",
-    "dissimilarity_threshold",
-    "dissolve",
-    "distort",
-    "dither",
-    "draw",
-    "duplicate",
-    "edge",
-    "emboss",
-    "encoding",
-    "endian",
-    "enhance",
-    "equalize",
-    "evaluate",
-    "evaluate_sequence",
-    "extent",
-    "extract",
-    "family",
-    "features",
-    "fft",
-    "fill",
-    "filter",
-    "flatten",
-    "flip",
-    "floodfill",
-    "flop",
-    "font",
-    "foreground",
-    "format",
-    "frame",
-    "function",
-    "fuzz",
-    "fx",
-    "gamma",
-    "gaussian_blur",
-    "geometry",
-    "gravity",
-    "grayscale",
-    "green_primary",
-    "hald_clut",
-    "highlight_color",
-    "hough_lines",
-    "iconGeometry",
-    "iconic",
-    "identify",
-    "ift",
-    "illuminant",
-    "immutable",
-    "implode",
-    "insert",
-    "intensity",
-    "intent",
-    "interlace",
-    "interline_spacing",
-    "interpolate",
-    "interpolative_resize",
-    "interword_spacing",
-    "kerning",
-    "kmeans",
-    "kuwahara",
-    "label",
-    "lat",
-    "layers",
-    "level",
-    "level_colors",
-    "limit",
-    "limits",
-    "linear_stretch",
-    "linewidth",
-    "liquid_rescale",
-    "list",
-    "loader",
-    "log",
-    "loop",
-    "lowlight_color",
-    "magnify",
-    "map",
-    "mattecolor",
-    "median",
-    "mean_shift",
-    "metric",
-    "mode",
-    "modulate",
-    "moments",
-    "monitor",
-    "monochrome",
-    "morph",
-    "morphology",
-    "mosaic",
-    "motion_blur",
-    "name",
-    "negate",
-    "noise",
-    "normalize",
-    "opaque",
-    "ordered_dither",
-    "orient",
-    "page",
-    "paint",
-    "pause",
-    "perceptible",
-    "ping",
-    "pointsize",
-    "polaroid",
-    "poly",
-    "posterize",
-    "precision",
-    "preview",
-    "process",
-    "quality",
-    "quantize",
-    "quiet",
-    "radial_blur",
-    "raise",
-    "random_threshold",
-    "range_threshold",
-    "red_primary",
-    "regard_warnings",
-    "region",
-    "remote",
-    "render",
-    "repage",
-    "resample",
-    "resize",
-    "resize_to_fill",
-    "resize_to_fit",
-    "resize_to_limit",
-    "resize_and_pad",
-    "respect_parentheses",
-    "reverse",
-    "roll",
-    "rotate",
-    "sample",
-    "sampling_factor",
-    "saver",
-    "scale",
-    "scene",
-    "screen",
-    "seed",
-    "segment",
-    "selective_blur",
-    "separate",
-    "sepia_tone",
-    "shade",
-    "shadow",
-    "shared_memory",
-    "sharpen",
-    "shave",
-    "shear",
-    "sigmoidal_contrast",
-    "silent",
-    "similarity_threshold",
-    "size",
-    "sketch",
-    "smush",
-    "snaps",
-    "solarize",
-    "sort_pixels",
-    "sparse_color",
-    "splice",
-    "spread",
-    "statistic",
-    "stegano",
-    "stereo",
-    "storage_type",
-    "stretch",
-    "strip",
-    "stroke",
-    "strokewidth",
-    "style",
-    "subimage_search",
-    "swap",
-    "swirl",
-    "synchronize",
-    "taint",
-    "text_font",
-    "threshold",
-    "thumbnail",
-    "tile_offset",
-    "tint",
-    "title",
-    "transform",
-    "transparent",
-    "transparent_color",
-    "transpose",
-    "transverse",
-    "treedepth",
-    "trim",
-    "type",
-    "undercolor",
-    "unique_colors",
-    "units",
-    "unsharp",
-    "update",
-    "valid_image",
-    "view",
-    "vignette",
-    "virtual_pixel",
-    "visual",
-    "watermark",
-    "wave",
-    "wavelet_denoise",
-    "weight",
-    "white_balance",
-    "white_point",
-    "white_threshold",
-    "window",
-    "window_group"
-  ]
-  mattr_accessor :unsupported_image_processing_arguments
-
   mattr_accessor :service_urls_expire_in, default: 5.minutes
+  mattr_accessor :urls_expire_in
 
   mattr_accessor :routes_prefix, default: "/rails/active_storage"
   mattr_accessor :draw_routes, default: true