datadome_module 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddcdafc8d1dc67d5820375afd61d2c14492245b14df2d52537176ed7baa7c52c
-  data.tar.gz: d657d8a0738e8ba53f5b3a34a57794a0827357ae1061fe72f2295e10895ab7d9
+  metadata.gz: da078c3d8b29968135733910234cfc5c523f256aa12a96377db4d29705b28dc6
+  data.tar.gz: db0ee5c87fe7937e8340ecf1ccc79dee48e77f29c11feed9adc95e659ad5ecc9
 SHA512:
-  metadata.gz: d973f4d93db659e56d72896712a9bfddfcbaff2b0c4df1c70117d5b15d6e57ccfa6625e890899f0a7d8022692f1a0afd5e0502652ac152e4c4d503822294526f
-  data.tar.gz: 8b7ca8e955384b9e335d251c2fe9a8f301f5a241f30843a67407c573a03642aa05d2fce840ace443ecd4501ee69992109d15e290cba976a4d23080a21dbe62c9
+  metadata.gz: 438a444b14b372e7b468ac14bcc3d596ccbd8b3a1ae532a7d619d4f22581516cb7ee92fa4bdc84c8bbbc41647500dca62bee8e4e68b6d40634fde65e7c4ff4e8
+  data.tar.gz: bcaeeb008b4e593e4028e41fd9f0be4e5f5672b6aa11154a0e655fde5e63188e84cc4fe358ff1194b68385c633217ff499baf37286103a9d283bed14fbb4063e

data/lib/constants.rb

@@ -1,4 +1,4 @@
-MODULE_VERSION = '1.1.0'
+MODULE_VERSION = '1.2.0'
 MODULE_NAME = 'datadome_module'
 
 VALIDATE_REQUEST_PATH = '/validate-request'

data/lib/datadome_module.rb

@@ -23,14 +23,38 @@ class DataDomeModule
     return @app.call(env) unless assessment_result
     return assessment_result.response_array unless assessment_result.legitimate_request?
 
+    enrich_request_headers(env, assessment_result.request_headers)
     status, headers, payload = @app.call(env)
-    headers = headers.merge(assessment_result.headers)
+
+    # Merge the headers from DataDome with the original headers
+    headers = headers.merge(assessment_result.headers) do |key, request_header_val, datadome_header_val|
+      if key.downcase == "set-cookie" && request_header_val
+        # Handle the merge for cookies when the protected request has at least one cookie
+        # If the original request contains one cookie, ensure it's in an array format for uniform handling
+        request_header_val = [request_header_val] unless request_header_val.is_a?(Array) 
+        
+        # Remove any cookies that start with 'datadome=' from the original request's cookies
+        request_header_val.reject! { |cookie| cookie.downcase.start_with?("datadome=") }
+        
+        # Return the cookies merged with the new value of the datadome cookie
+        [datadome_header_val, *request_header_val]
+      else
+        # For DataDome headers other than 'Set-Cookie', return the value.
+        datadome_header_val
+      end
+    end
 
     [status, headers, payload]
   end
 
   private
 
+  def enrich_request_headers(env, request_headers)
+    request_headers.each do |header_name, header_value|
+      env["HTTP_#{header_name.upcase.tr('-', '_')}"] = header_value
+    end
+  end
+
   def datadome_assessment(request)
     return unless datadome_assessment_enabled?
     return if endpoint_hidden_from_datadome?(request)

data/lib/process_assessment.rb

@@ -25,7 +25,8 @@ class ProcessAssessment
     Response.new(
       status: dd_response.status,
       headers: headers_hash(dd_response),
-      payload: dd_response.body
+      payload: dd_response.body,
+      request_headers: request_headers_hash(dd_response)
     )
   rescue Faraday::TimeoutError
     MD.logger.error("#{self.class}: Protection API request timed out")
@@ -55,6 +56,14 @@ class ProcessAssessment
     end
   end
 
+  def request_headers_hash(dd_response)
+    header_names = dd_response.headers['X-DataDome-Request-Headers']&.split || []
+
+    header_names.each_with_object({}) do |header, hash|
+      hash[header] = dd_response.headers[header]
+    end
+  end
+
   def client
     Faraday.new(api_uri) do |builder|
       builder.request :url_encoded

data/lib/request_data.rb

@@ -9,6 +9,7 @@ class RequestData
   DATA_LIMITS = {
     SecCHDeviceMemory: 8,
     SecCHUAMobile: 8,
+    SecFetchStorageAccess: 8,
     SecFetchUser: 8,
     TlsProtocol: 8,
     SecCHUAArch: 16,
@@ -117,6 +118,7 @@ class RequestData
         'SecFetchDest': headers['HTTP_SEC_FETCH_DEST'],
         'SecFetchMode': headers['HTTP_SEC_FETCH_MODE'],
         'SecFetchSite': headers['HTTP_SEC_FETCH_SITE'],
+        'SecFetchStorageAccess': headers['HTTP_SEC_FETCH_STORAGE_ACCESS'],
         'SecFetchUser': headers['HTTP_SEC_FETCH_USER'],
         'ServerHostname': headers['HTTP_HOST'],
         'ServerName': Socket.gethostname,

data/lib/response.rb

@@ -2,12 +2,13 @@
 
 class Response
 
-  attr_reader :headers
+  attr_reader :headers, :request_headers
 
-  def initialize(status: 200, headers: {}, payload: nil)
+  def initialize(status: 200, headers: {}, payload: nil, request_headers: {})
     @status = status
     @headers = headers
     @payload = payload
+    @request_headers = request_headers
   end
 
   def response_array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadome_module
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - DataDome
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2026-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday