Skip to content

Fix warning when handling HTTP request with missing Origin header #1109

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
PaulRotmann merged 1 commit into from
Jun 25, 2025
Merged

Fix warning when handling HTTP request with missing Origin header #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Ratchet/Http/OriginCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(MessageComponentInterface $component, array $allowed
*/
#[HackSupportForPHP8] public function onOpen(ConnectionInterface $conn, ?RequestInterface $request = null) { /*
public function onOpen(ConnectionInterface $conn, RequestInterface $request = null) { /**/
$header = (string)$request->getHeader('Origin')[0];
$header = $request->getHeaderLine('Origin');
$origin = parse_url($header, PHP_URL_HOST) ?: $header;

if (!in_array($origin, $this->allowedOrigins)) {
Expand Down
20 changes: 19 additions & 1 deletion tests/unit/Http/OriginCheckTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class OriginCheckTest extends AbstractMessageComponentTestCase {
*/
public function setUpConnection() {
$this->_reqStub = $this->getMockBuilder('Psr\Http\Message\RequestInterface')->getMock();
$this->_reqStub->expects($this->any())->method('getHeader')->will($this->returnValue(['localhost']));
$this->_reqStub->expects($this->any())->method('getHeaderLine')->with('Origin')->willReturn('localhost');

parent::setUpConnection();

Expand Down Expand Up @@ -44,6 +44,24 @@ public function testCloseOnNonMatchingOrigin() {
$this->_serv->onOpen($this->_conn, $this->_reqStub);
}

public function testCloseOnMissingOrigin() {
$this->_serv->allowedOrigins = ['socketo.me'];
$this->_conn->expects($this->once())->method('close');

$this->_reqStub->expects($this->once())->method('getHeaderLine')->with('Origin')->willReturn('');

$this->_serv->onOpen($this->_conn, $this->_reqStub);
}

public function testCloseOnDuplicateOrigin() {
$this->_serv->allowedOrigins = ['socketo.me'];
$this->_conn->expects($this->once())->method('close');

$this->_reqStub->expects($this->once())->method('getHeaderLine')->with('Origin')->willReturn('http://socketo.me,https://socketo.me');

$this->_serv->onOpen($this->_conn, $this->_reqStub);
}

public function testOnMessage() {
$this->passthroughMessageTest('Hello World!');
}
Expand Down