Skip to content

Swapped needle and haystack arguments #6

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
clue merged 2 commits into from
Nov 10, 2015
Merged

Swapped needle and haystack arguments #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ace61
Swapped needle and haystack arguments
WyriHaximus Nov 10, 2015
d0ff285
Test for IPv6 address sanitization
WyriHaximus Nov 10, 2015
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
4 changes: 2 additions & 2 deletions src/Socket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ private function sanitizeAddress($address)
{
// doc comment suggests IPv6 address is not enclosed in square brackets?

$pos = strrpos(':', $address);
$pos = strrpos($address, ':');
// this is an IPv6 address which includes colons but no square brackets
if ($pos !== false && substr($address, 0, 1) !== '[') {
if (strpos(':', $address) < $pos) {
if (strpos($address, ':') < $pos) {
$port = substr($address, $pos + 1);
$address = '[' . substr($address, 0, $pos) . ']:' . $port;
}
Expand Down
42 changes: 42 additions & 0 deletions tests/SocketTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,46 @@ public function testCreatePair()

$this->loop->run();
}

public function provideSanitizeAddress()
{
return array(
array(
'127.0.0.1:1337',
),
array(
'[::1]:1337',
),
);
}

/**
* @dataProvider provideSanitizeAddress
*/
public function testSanitizeAddress($address)
{
$promise = $this->factory->createServer($address);
$server = $this->getValueFromResolvedPromise($promise);

$promise = $this->factory->createClient($server->getLocalAddress());
$client = $this->getValueFromResolvedPromise($promise);

$that = $this;
$server->on('message', function ($message, $remote, $server) use ($that) {
// once the server receives a message, send it pack to client and stop server
$server->send('response:' . $message, $remote);
$server->end();
});

$client->on('message', function ($message, $remote, $client) use ($that, $address) {
$that->assertEquals($address, $remote);

// once the client receives a message, stop client
$client->end();
});

$client->send('test');

$this->loop->run();
}
}