Changeset 10060

Timestamp:

07/02/08 09:43:58 (5 months ago)

Author:

Carl.Vondrick

Message:

1.2: added ->getRemoteAddress() to get the client's IP address and ->getForwardedRemoteAddress() to get the IP address from behind a proxy (closes #2798)

Note: I am not sure if ->getForwardedRemoteAddress() is the best method name. Welcome to suggestions in ticket #2798.

Files:

• branches/1.2/lib/request/sfWebRequest.class.php (modified) (1 diff)
• branches/1.2/test/unit/request/sfWebRequestTest.php (modified) (2 diffs)

branches/1.2/lib/request/sfWebRequest.class.php

@@ -1067 +1067 @@
-
-  /**
+   * Returns the remote IP address for the request.
+   *
+   * @return string The remote IP address
+   */
+  public function getRemoteAddress()
+  {
+    $pathInfo = $this->getPathInfoArray();
+
+    return $pathInfo['REMOTE_ADDR'];
+  }
+
+  /**
+   * Returns the remote IP addressed after resolved from the forward.
+   *
+   * This is useful if you are testing to see if the user is behind a proxy. However,
+   * it should not be trusted.
+   *
+   * @return string|null The remote IP address resolved from a forward, null if none set
+   */
+  public function getForwardedRemoteAddress()
+  {
+    $pathInfo = $this->getPathInfoArray();
+
+    if (empty($pathInfo['HTTP_X_FORWARDED_FOR']))
+    {
+      return null;
+    }
+
+    return $pathInfo['HTTP_X_FORWARDED_FOR'];
+  }
+
+  /**
-   * Parses the request parameters.
-   *

branches/1.2/test/unit/request/sfWebRequestTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-1
+4
-
-class myRequest extends sfWebRequest
@@ -132 +132 @@
-$_SERVER['HTTP_HOST'] = 'symfony-project.org:8043';
-$t->is($request->getUriPrefix(), 'https://symfony-project.org:8043', '->getUriPrefix() works for nonstandard https ports');
+
+// ->getRemoteAddress()
+$t->diag('->getRemoteAddress()');
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+$t->is($request->getRemoteAddress(), '127.0.0.1', '->getRemoteAddress() returns the remote address');
+
+// ->getForwardedRemoteAddress()
+$t->diag('->getForwardedRemoteAddress()');
+$t->is($request->getForwardedRemoteAddress(), null, '->getForwardedRemoteAddress() returns null if the request was not forwarded.');
+$_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1';
+$t->is($request->getForwardedRemoteAddress(), '10.0.0.1', '->getForwardedRemoteAddress() returns the value from HTTP_X_FORWARDED_FOR');