Skip to content

RSL1m4 If clientId is different, error from server #103

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
owenpearson merged 1 commit into from
Apr 6, 2021
Merged

RSL1m4 If clientId is different, error from server #103

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
4 changes: 3 additions & 1 deletion src/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ public function requestToken( $tokenParams = [], $authOptions = [] ) {
$authHeaders = false
);

if ( empty( $res->token ) ) { // just in case.. an AblyRequestException should be thrown on the previous step with a 4XX error code on failure
// just in case.. an AblyRequestException should be thrown on the
// previous step with a 4XX error code on failure
if ( empty( $res->token ) ) {
throw new AblyException( 'Failed to get a token', 40100, 401 );
}

Expand Down
10 changes: 0 additions & 10 deletions src/Channel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,6 @@ public function __publish_request_body($first) {
$json = '[' . implode( ',', $jsonArray ) . ']';
}

// if the message has a clientId set and we're using token based auth,
// the clientIds must match unless we're a wildcard client
$authClientId = $this->ably->auth->clientId;
if ( !empty( $msg->clientId ) && !$this->ably->auth->isUsingBasicAuth()
&& $authClientId != '*' && $msg->clientId != $authClientId) {
throw new AblyException(
'Message\'s clientId does not match the clientId of the authorisation token.', 40102, 401
);
}

return $json;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/ClientIdTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function testClientIdLib() {
$msg->clientId = 'DIFFERENT_clientId';

$this->expectException(AblyException::class);
$this->expectExceptionCode(40102);
$this->expectExceptionCode(40012);
$channel->publish( $msg ); // mismatched clientIds, should throw an exception
}

Expand Down Expand Up @@ -263,7 +263,7 @@ public function testRSA8f2() {
$channel = $ablyClient->channels->get( 'persisted:RSA8f2' );

$this->expectException(AblyException::class);
$this->expectExceptionCode(40102);
$this->expectExceptionCode(40012);
$channel->publish( 'testEvent', 'testData', 'testClientId' );
}

Expand Down