|
 |
de86d1 |
From 5cea97e083448aaa2352320612541c895178b3b5 Mon Sep 17 00:00:00 2001
|
|
|
de86d1 |
From: "Christoph M. Becker" <cmbecker69@gmx.de>
|
|
|
de86d1 |
Date: Mon, 14 Jun 2021 13:22:27 +0200
|
|
|
de86d1 |
Subject: [PATCH] Fix #81122: SSRF bypass in FILTER_VALIDATE_URL
|
|
|
de86d1 |
|
|
|
de86d1 |
We need to ensure that the password detected by parse_url() is actually
|
|
|
de86d1 |
a valid password; we can re-use is_userinfo_valid() for that.
|
|
|
de86d1 |
---
|
|
|
de86d1 |
ext/filter/logical_filters.c | 4 +++-
|
|
|
de86d1 |
ext/filter/tests/bug81122.phpt | 21 +++++++++++++++++++++
|
|
|
de86d1 |
2 files changed, 24 insertions(+), 1 deletion(-)
|
|
|
de86d1 |
create mode 100644 ext/filter/tests/bug81122.phpt
|
|
|
de86d1 |
|
|
|
de86d1 |
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
|
|
|
de86d1 |
index ba2e7e527e76..721da45d532d 100644
|
|
|
de86d1 |
--- a/ext/filter/logical_filters.c
|
|
|
de86d1 |
+++ b/ext/filter/logical_filters.c
|
|
|
de86d1 |
@@ -632,7 +632,9 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
|
|
de86d1 |
RETURN_VALIDATION_FAILED
|
|
|
de86d1 |
}
|
|
|
de86d1 |
|
|
|
de86d1 |
- if (url->user != NULL && !is_userinfo_valid(url->user)) {
|
|
|
de86d1 |
+ if (url->user != NULL && !is_userinfo_valid(url->user)
|
|
|
de86d1 |
+ || url->pass != NULL && !is_userinfo_valid(url->pass)
|
|
|
de86d1 |
+ ) {
|
|
|
de86d1 |
php_url_free(url);
|
|
|
de86d1 |
RETURN_VALIDATION_FAILED
|
|
|
de86d1 |
|
|
|
de86d1 |
diff --git a/ext/filter/tests/bug81122.phpt b/ext/filter/tests/bug81122.phpt
|
|
|
de86d1 |
new file mode 100644
|
|
|
de86d1 |
index 000000000000..d89d4114a547
|
|
|
de86d1 |
--- /dev/null
|
|
|
de86d1 |
+++ b/ext/filter/tests/bug81122.phpt
|
|
|
de86d1 |
@@ -0,0 +1,21 @@
|
|
|
de86d1 |
+--TEST--
|
|
|
de86d1 |
+Bug #81122 (SSRF bypass in FILTER_VALIDATE_URL)
|
|
|
de86d1 |
+--SKIPIF--
|
|
|
de86d1 |
+
|
|
|
de86d1 |
+if (!extension_loaded('filter')) die("skip filter extension not available");
|
|
|
de86d1 |
+?>
|
|
|
de86d1 |
+--FILE--
|
|
|
de86d1 |
+
|
|
|
de86d1 |
+$urls = [
|
|
|
de86d1 |
+ "https://example.com:\\@test.com/",
|
|
|
de86d1 |
+ "https://user:\\epass@test.com",
|
|
|
de86d1 |
+ "https://user:\\@test.com",
|
|
|
de86d1 |
+];
|
|
|
de86d1 |
+foreach ($urls as $url) {
|
|
|
de86d1 |
+ var_dump(filter_var($url, FILTER_VALIDATE_URL));
|
|
|
de86d1 |
+}
|
|
|
de86d1 |
+?>
|
|
|
de86d1 |
+--EXPECT--
|
|
|
de86d1 |
+bool(false)
|
|
|
de86d1 |
+bool(false)
|
|
|
de86d1 |
+bool(false)
|