Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 0 deletions

diff --git a/lib/gitlab/logging/cloudflare_helper.rb b/lib/gitlab/logging/cloudflare_helper.rb
new file mode 100644
index 00000000000..09a4cbc6146
--- /dev/null
+++ b/lib/gitlab/logging/cloudflare_helper.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Logging
+    module CloudflareHelper
+      CLOUDFLARE_CUSTOM_HEADERS = { 'Cf-Ray' => :cf_ray, 'Cf-Request-Id' => :cf_request_id }.freeze
+
+      def store_cloudflare_headers!(payload, request)
+        CLOUDFLARE_CUSTOM_HEADERS.each do |header, value|
+          payload[value] = request.headers[header] if valid_cloudflare_header?(request.headers[header])
+        end
+      end
+
+      def valid_cloudflare_header?(value)
+        return false unless value.present?
+        return false if value.length > 64
+        return false if value.index(/[^[:alnum:]]/)
+
+        true
+      end
+    end
+  end
+end