friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into views

This commit is contained in:
Michael 2020-04-26 09:21:57 +00:00
parent d74067b461 91b87b8df1
commit af97df96bd
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ php:
services:
- mysql
- redis-server
- redis
- memcached
env:
- MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_USERNAME=travis MYSQL_PASSWORD="" MYSQL_DATABASE=test

19
library/OAuth1.php
View File

@ -96,7 +96,7 @@ abstract class OAuthSignatureMethod
* @param OAuthToken $token
* @return string
*/
abstract public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token);
abstract public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null);
/**
* Verifies that a given signature is correct
@ -107,7 +107,7 @@ abstract class OAuthSignatureMethod
* @param string $signature
* @return bool
*/
public function check_signature($request, $consumer, $token, $signature)
public function check_signature(OAuthRequest $request, OAuthConsumer $consumer, $signature, OAuthToken $token = null)
{
$built = $this->build_signature($request, $consumer, $token);
return ($built == $signature);
@ -134,7 +134,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod
* @param OAuthToken $token
* @return string
*/
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
{
$base_string = $request->get_signature_base_string();
$request->base_string = $base_string;
@ -179,7 +179,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod
* @param $token
* @return string
*/
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
{
$key_parts = array(
$consumer->secret,
@ -223,7 +223,7 @@ abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
// Either way should return a string representation of the certificate
protected abstract function fetch_private_cert(&$request);
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token)
public function build_signature(OAuthRequest $request, OAuthConsumer $consumer, OAuthToken $token = null)
{
$base_string = $request->get_signature_base_string();
$request->base_string = $base_string;
@ -243,7 +243,7 @@ abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
return base64_encode($signature);
}
public function check_signature($request, $consumer, $token, $signature)
public function check_signature(OAuthRequest $request, OAuthConsumer $consumer, $signature, OAuthToken $token = null)
{
$decoded_sig = base64_decode($signature);
@ -358,7 +358,7 @@ class OAuthRequest
* @param array|null $parameters
* @return OAuthRequest
*/
public static function from_consumer_and_token(OAuthConsumer $consumer, OAuthToken $token, $http_method, $http_url, array $parameters = NULL)
public static function from_consumer_and_token(OAuthConsumer $consumer, $http_method, $http_url, array $parameters = null, OAuthToken $token = null)
{
@$parameters or $parameters = array();
$defaults = array(
@ -788,11 +788,10 @@ class OAuthServer
$valid_sig = $signature_method->check_signature(
$request,
$consumer,
$token,
$signature
$signature,
$token
);
if (!$valid_sig) {
throw new OAuthException("Invalid signature");
}

1
view/theme/frio/css/style.css
View File

@ -391,6 +391,7 @@ header #banner #logo-img,
}
#navbrand-container #navbar-brand-text {
padding-left: 5px;
color: $nav_icon_color;
}
/* NavBar */