Skip to content

Commit 1a84329

Browse files
committed
Use empty() for signed request value check
1 parent c81dfde commit 1a84329

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/base_facebook.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,10 @@ protected function getUserAccessToken() {
483483
*/
484484
public function getSignedRequest() {
485485
if (!$this->signedRequest) {
486-
if (isset($_REQUEST['signed_request'])) {
486+
if (!empty($_REQUEST['signed_request'])) {
487487
$this->signedRequest = $this->parseSignedRequest(
488488
$_REQUEST['signed_request']);
489-
} else if (isset($_COOKIE[$this->getSignedRequestCookieName()])) {
489+
} else if (!empty($_COOKIE[$this->getSignedRequestCookieName()])) {
490490
$this->signedRequest = $this->parseSignedRequest(
491491
$_COOKIE[$this->getSignedRequestCookieName()]);
492492
}

tests/tests.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ private static function kNonTosedSignedRequest() {
4646
return $facebook->publicMakeSignedRequest(array());
4747
}
4848

49+
private static function kSignedRequestWithEmptyValue() {
50+
return '';
51+
}
52+
4953
private static function kSignedRequestWithBogusSignature() {
5054
$facebook = new FBPublic(array(
5155
'appId' => self::APP_ID,
@@ -778,6 +782,18 @@ public function testNonTossedSignedtoken() {
778782
$this->assertTrue(isset($sr['algorithm']));
779783
}
780784

785+
public function testSignedRequestWithEmptyValue() {
786+
$fb = new FBPublicCookie(array(
787+
'appId' => self::APP_ID,
788+
'secret' => self::SECRET
789+
));
790+
$_REQUEST['signed_request'] = self::kSignedRequestWithEmptyValue();
791+
$this->assertNull($fb->getSignedRequest());
792+
$_COOKIE[$fb->publicGetSignedRequestCookieName()] =
793+
self::kSignedRequestWithEmptyValue();
794+
$this->assertNull($fb->getSignedRequest());
795+
}
796+
781797
public function testSignedRequestWithWrongAlgo() {
782798
$fb = new FBPublic(array(
783799
'appId' => self::APP_ID,

0 commit comments

Comments
 (0)