Skip to content

fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulbalandan merged 8 commits into from
Jan 23, 2025
Merged

fix(CURLRequest): multiple header sections after redirects #9426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
23354d4
fix: strip out multiple header sections for redirect
ducng99 Jan 20, 2025
1f3fe2d
test: add test for stripping out multiple redirect header sections
ducng99 Jan 20, 2025
bfec970
docs: changelog for fixing returning multiple header sections after r…
ducng99 Jan 20, 2025
4722795
Added a non-standard http redirect code test
ducng99 Jan 20, 2025
a106b18
apply cs-fix for test
ducng99 Jan 20, 2025
a9c9284
Moved redirect header loop to a separate function
ducng99 Jan 21, 2025
8909dbd
Updated changelog to be clearer
ducng99 Jan 21, 2025
cc521d9
Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…
ducng99 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions system/HTTP/CURLRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
// Set the string we want to break our response from
$breakString = "\r\n\r\n";

if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
$output = $this->handleRedirectHeaders($output, $breakString);
}

while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
$output = substr($output, strpos($output, $breakString) + 4);
}
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

return $output;
}

private function handleRedirectHeaders(string $output, string $breakString): string
{
// Strip out multiple redirect header sections
while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
$breakStringPos = strpos($output, $breakString);
$redirectHeaderSection = substr($output, 0, $breakStringPos);
$redirectHeaders = explode("\n", $redirectHeaderSection);
$locationHeaderFound = false;

foreach ($redirectHeaders as $header) {
if (str_starts_with(strtolower($header), 'location:')) {
$locationHeaderFound = true;
break;
}
}

if ($locationHeaderFound) {
$output = substr($output, $breakStringPos + 4);
} else {
break;
}
}

return $output;
}
}
68 changes: 68 additions & 0 deletions tests/system/HTTP/CURLRequestTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
$this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
$this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
}

public function testRemoveMultipleRedirectHeaderSections(): void
{
$testBody = 'Hello world';

$output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

$this->request->setOutput($output);

$response = $this->request->request('GET', 'http://example.com', [
'allow_redirects' => true,
]);

$this->assertSame(200, $response->getStatusCode());

$this->assertSame($testBody, $response->getBody());
}

public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
{
$testBody = 'Hello world';

$output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

$this->request->setOutput($output);

$response = $this->request->request('GET', 'http://example.com', [
'allow_redirects' => true,
]);

$this->assertSame(301, $response->getStatusCode());

$this->assertSame($testBody, $response->getBody());
}
}
2 changes: 2 additions & 0 deletions user_guide_src/source/changelogs/v4.6.1.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(CURLRequest): multiple header sections after redirects by ducng99 · Pull Request #9426 · codeigniter4/CodeIgniter4 · GitHub
Skip to content
fix(CURLRequest): multiple header sections after redirects#9426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 8 commits into

from

Jan 23, 2025
 Merged


fix(CURLRequest): multiple header sections after redirects
#9426
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
23354d4

fix: strip out multiple header sections for redirect


ducng99 Jan 20, 2025
1f3fe2d

test: add test for stripping out multiple redirect header sections


ducng99 Jan 20, 2025
bfec970

docs: changelog for fixing returning multiple header sections after r…


ducng99 Jan 20, 2025
4722795

Added a non-standard http redirect code test


ducng99 Jan 20, 2025
a106b18

apply cs-fix for test


ducng99 Jan 20, 2025
a9c9284

Moved redirect header loop to a separate function


ducng99 Jan 21, 2025
8909dbd

Updated changelog to be clearer


ducng99 Jan 21, 2025
cc521d9

Merge branch 'develop' into fix/curl_multiple_header_sections_after_r…


ducng99 Jan 21, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 30 additions & 0 deletions
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -385,6 +385,10 @@ public function send(string $method, string $url)
 // Set the string we want to break our response from
 $breakString = "\r\n\r\n";

 if (isset($this->config['allow_redirects']) && $this->config['allow_redirects'] !== false) {
 $output = $this->handleRedirectHeaders($output, $breakString);
 }

 while (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
 $output = substr($output, strpos($output, $breakString) + 4);
 }
Expand DownExpand Up@@ -713,4 +717,30 @@ protected function sendRequest(array $curlOptions = []): string

 return $output;
 }

 private function handleRedirectHeaders(string $output, string $breakString): string
 {
 // Strip out multiple redirect header sections
 while (preg_match('/^HTTP\/\d(?:\.\d)? 3\d\d/', $output)) {
 $breakStringPos = strpos($output, $breakString);
 $redirectHeaderSection = substr($output, 0, $breakStringPos);
 $redirectHeaders = explode("\n", $redirectHeaderSection);
 $locationHeaderFound = false;

 foreach ($redirectHeaders as $header) {
 if (str_starts_with(strtolower($header), 'location:')) {
 $locationHeaderFound = true;
 break;
 }
 }

 if ($locationHeaderFound) {
 $output = substr($output, $breakStringPos + 4);
 } else {
 break;
 }
 }

 return $output;
 }
}

68 changes: 68 additions & 0 deletions
tests/system/HTTP/CURLRequestTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1313,4 +1313,72 @@ public function testHTTPversionAsString(): void
 $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
 $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]);
 }

 public function testRemoveMultipleRedirectHeaderSections(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 302 Found
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 399 Custom Redirect
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/2 308
content-type: text/html; charset=utf-8
content-length: 211
location: http://example.com
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\nHTTP/1.1 200 OK
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(200, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }

 public function testNotRemoveMultipleRedirectHeaderSectionsWithoutLocationHeader(): void
 {
 $testBody = 'Hello world';

 $output = "HTTP/1.1 301 Moved Permanently
content-type: text/html; charset=utf-8
content-length: 211
date: Mon, 20 Jan 2025 11:46:34 GMT
server: nginx/1.21.6
vary: Origin\r\n\r\n" . $testBody;

 $this->request->setOutput($output);

 $response = $this->request->request('GET', 'http://example.com', [
 'allow_redirects' => true,
 ]);

 $this->assertSame(301, $response->getStatusCode());

 $this->assertSame($testBody, $response->getBody());
 }
}

2 changes: 2 additions & 0 deletions
user_guide_src/source/changelogs/v4.6.1.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,8 @@ Deprecations
Bugs Fixed
**********

- **CURLRequest:** Fixed an issue where multiple header sections appeared in the CURL response body during multiple redirects from the target server.

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.