Merge pull request #4417 from brave-intl/staging

Prod Release: 04-17-2024
brave-intl · Apr 17, 2024 · 26b5be2 · 26b5be2
2 parents 924eb34 + 0fe238d
commit 26b5be2
Show file tree

Hide file tree

Showing 5 changed files with 2,137 additions and 2,617 deletions.
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
@@ -43,7 +43,15 @@ def authenticate
 
   def authenticate_ip
     return true if API_IP_WHITELIST.blank? && (Rails.env.development? || Rails.env.test?)
-    API_IP_WHITELIST.any? { |ip_addr| ip_addr.include?(request.remote_ip) }
+
+    direct_remote_ip = request.remote_ip
+    passed_from_next = request&.headers&.fetch("HTTP_ORIGINALIP", "")
+
+    authenticated = API_IP_WHITELIST.any? { |ip_addr| ip_addr.include?(direct_remote_ip) }
+    if !authenticated && passed_from_next.present?
+      authenticated = API_IP_WHITELIST.any? { |ip_addr| ip_addr.include?(passed_from_next) }
+    end
+    authenticated
   end
 
   def authenticate_token

diff --git a/config/initializers/active_analytics.rb b/config/initializers/active_analytics.rb
@@ -7,7 +7,7 @@ def current_user
     end
 
     def current_ability
-      @current_ability ||= Ability.new(current_user, request.remote_ip)
+      @current_ability ||= Ability.new(current_user, request.remote_ip, request&.headers&.fetch("HTTP_ORIGINALIP", ""))
     end
   end
 end
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
@@ -9,7 +9,8 @@ const customConfig = {
       'brave-ui': path.resolve(__dirname, '../../node_modules/brave-ui/src')
     },
     fallback: {
-      "crypto": require.resolve("crypto-browserify")
+      crypto: require.resolve("crypto-browserify"),
+      stream: require.resolve("stream-browserify"),
     },
     extensions: ['.css']
   }

diff --git a/package.json b/package.json
@@ -143,7 +143,7 @@
     "typescript": "^5.1.6"
   },
   "resolutions": {
-    "@babel/traverse": "7.24.1",
+    "**/@babel/traverse": "7.24.1",
     "node-fetch": "3.3.2",
     "nth-check": "2.1.1",
     "postcss": "8.4.33",