Drop the trust_x_forwarded_proto configuration option (#599)

getsentry · May 10, 2018 · 3ccf56c · 3ccf56c · hackel · Jul 31, 2019
1 parent 8f04ade
commit 3ccf56c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 28 deletions.
diff --git a/lib/Raven/ClientBuilder.php b/lib/Raven/ClientBuilder.php
@@ -41,8 +41,6 @@
  *
  * @method int getSendAttempts()
  * @method setSendAttempts(int $attemptsCount)
- * @method bool isTrustXForwardedProto()
- * @method setIsTrustXForwardedProto(bool $value)
  * @method string[] getPrefixes()
  * @method setPrefixes(array $prefixes)
  * @method bool getSerializeAllObjects()

diff --git a/lib/Raven/Configuration.php b/lib/Raven/Configuration.php
@@ -87,28 +87,6 @@ public function setSendAttempts($attemptsCount)
         $this->options = $this->resolver->resolve($options);
     }
 
-    /**
-     * Checks whether the X-FORWARDED-PROTO header should be trusted.
-     *
-     * @return bool
-     */
-    public function isTrustXForwardedProto()
-    {
-        return $this->options['trust_x_forwarded_proto'];
-    }
-
-    /**
-     * Sets whether the X-FORWARDED-PROTO header should be trusted.
-     *
-     * @param bool $value The value of the option
-     */
-    public function setIsTrustXForwardedProto($value)
-    {
-        $options = array_merge($this->options, ['trust_x_forwarded_proto' => $value]);
-
-        $this->options = $this->resolver->resolve($options);
-    }
-
     /**
      * Gets the prefixes which should be stripped from filenames to create
      * relative paths.
@@ -642,7 +620,6 @@ private function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'send_attempts' => 6,
-            'trust_x_forwarded_proto' => false,
             'prefixes' => explode(PATH_SEPARATOR, get_include_path()),
             'serialize_all_object' => false,
             'sample_rate' => 1,
@@ -667,7 +644,6 @@ private function configureOptions(OptionsResolver $resolver)
         ]);
 
         $resolver->setAllowedTypes('send_attempts', 'int');
-        $resolver->setAllowedTypes('trust_x_forwarded_proto', 'bool');
         $resolver->setAllowedTypes('prefixes', 'array');
         $resolver->setAllowedTypes('serialize_all_object', 'bool');
         $resolver->setAllowedTypes('sample_rate', ['int', 'float']);

diff --git a/tests/ClientBuilderTest.php b/tests/ClientBuilderTest.php
@@ -242,7 +242,6 @@ public function testCallExistingMethodForwardsCallToConfiguration($setterMethod,
     public function optionsDataProvider()
     {
         return [
-            ['setIsTrustXForwardedProto', true],
             ['setPrefixes', ['foo', 'bar']],
             ['setSerializeAllObjects', false],
             ['setSampleRate', 0.5],

diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
@@ -45,7 +45,6 @@ public function optionsDataProvider()
     {
         return [
             ['send_attempts', 1, 'getSendAttempts', 'setSendAttempts'],
-            ['trust_x_forwarded_proto', false, 'isTrustXForwardedProto', 'setIsTrustXForwardedProto'],
             ['prefixes', ['foo', 'bar'], 'getPrefixes', 'setPrefixes'],
             ['serialize_all_object', false, 'getSerializeAllObjects', 'setSerializeAllObjects'],
             ['sample_rate', 0.5, 'getSampleRate', 'setSampleRate'],