Merge pull request #2484 from cyberark/cyberark/ONYX-16929

Rename the TrustedProxyFilter class to IsIpTrusted
cyberark · Feb 10, 2022 · d9c17cd · d9c17cd
2 parents 05ddcb9 + 19eeb05
commit d9c17cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
@@ -6,7 +6,7 @@
   disable_cache = config.respond_to?(:conjur_disable_trusted_proxies_cache) &&
     config.conjur_disable_trusted_proxies_cache
 
-  Rack::Request.ip_filter = Conjur::TrustedProxyFilter.new(
+  Rack::Request.ip_filter = Conjur::IsIpTrusted.new(
     config: Rails.application.config.conjur_config,
     disable_cache: disable_cache
   )

diff --git a/lib/conjur/trusted_proxy_filter.rb → lib/conjur/is_ip_trusted.rb b/lib/conjur/trusted_proxy_filter.rb → lib/conjur/is_ip_trusted.rb
@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 module Conjur
-  # TrustedProxyFilter wraps the default Rack IP filtering. This allows
+  # IsIpTrusted wraps the default Rack IP filtering. This allows
   # the trusted proxies to be configured using the environment variable,
   # `TRUSTED_PROXIES`.
   #
   # The value of `TRUSTED_PROXIES` must be a comma-separated list of IP
   # addresses or IP address ranges using CIDR notation.
   #
   # Example: TRUSTED_PROXIES=4.4.4.4,192.168.100.0/24
-  class TrustedProxyFilter
+  class IsIpTrusted
     def initialize(config:, disable_cache: true)
       @config = config
       @disable_cache = disable_cache
@@ -47,8 +47,8 @@ def configured_trusted_proxies
 
       return [] unless trusted_proxies
 
-      Set.new(trusted_proxies).
-        map { |cidr| IPAddr.new(cidr.strip) }
+      Set.new(trusted_proxies)
+        .map { |cidr| IPAddr.new(cidr.strip) }
     end
   end
 end
diff --git a/spec/lib/conjur/trusted_proxy_filter_spec.rb → spec/lib/conjur/is_ip_trusted_spec.rb b/spec/lib/conjur/trusted_proxy_filter_spec.rb → spec/lib/conjur/is_ip_trusted_spec.rb
@@ -2,12 +2,12 @@
 
 require 'spec_helper'
 
-describe Conjur::TrustedProxyFilter do
+describe Conjur::IsIpTrusted do
   it "does not raise an exception when created with valid IP addresses" do
     config = Conjur::ConjurConfig.new(trusted_proxies: '127.0.0.1')
 
     expect {
-      Conjur::TrustedProxyFilter.new(config: config)
+      Conjur::IsIpTrusted.new(config: config)
     }.not_to raise_error
   end
 end