Change to use OAuth for authentication
This commit is contained in:
parent
441ac3faf6
commit
89d72852d5
@ -47,8 +47,6 @@ if (!defined('STATUSNET')) {
|
|||||||
class ActivitySpamPlugin extends Plugin
|
class ActivitySpamPlugin extends Plugin
|
||||||
{
|
{
|
||||||
public $server = null;
|
public $server = null;
|
||||||
public $username = null;
|
|
||||||
public $password = null;
|
|
||||||
|
|
||||||
const REVIEWSPAM = 'ActivitySpamPlugin::REVIEWSPAM';
|
const REVIEWSPAM = 'ActivitySpamPlugin::REVIEWSPAM';
|
||||||
const TRAINSPAM = 'ActivitySpamPlugin::TRAINSPAM';
|
const TRAINSPAM = 'ActivitySpamPlugin::TRAINSPAM';
|
||||||
@ -60,13 +58,9 @@ class ActivitySpamPlugin extends Plugin
|
|||||||
*/
|
*/
|
||||||
function initialize()
|
function initialize()
|
||||||
{
|
{
|
||||||
foreach (array('username', 'password', 'server') as $attr) {
|
$this->filter = new SpamFilter(common_config('activityspam', 'server'),
|
||||||
if (!$this->$attr) {
|
common_config('activityspam', 'consumerkey'),
|
||||||
$this->$attr = common_config('activityspam', $attr);
|
common_config('activityspam', 'secret'));
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->filter = new SpamFilter($this->server, $this->username, $this->password);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -47,20 +47,16 @@ if (!defined('STATUSNET')) {
|
|||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class SpamFilter {
|
class SpamFilter extends OAuthClient {
|
||||||
|
|
||||||
const HAM = 'ham';
|
const HAM = 'ham';
|
||||||
const SPAM = 'spam';
|
const SPAM = 'spam';
|
||||||
|
|
||||||
public $server;
|
public $server;
|
||||||
public $username;
|
|
||||||
public $password;
|
|
||||||
|
|
||||||
function __construct($server, $username, $password) {
|
|
||||||
|
|
||||||
|
function __construct($server, $consumerKey, $secret) {
|
||||||
|
parent::__construct($consumerKey, $secret);
|
||||||
$this->server = $server;
|
$this->server = $server;
|
||||||
$this->username = $username;
|
|
||||||
$this->password = $password;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function toActivity($notice) {
|
protected function toActivity($notice) {
|
||||||
@ -80,14 +76,7 @@ class SpamFilter {
|
|||||||
|
|
||||||
public function testActivity($activity) {
|
public function testActivity($activity) {
|
||||||
|
|
||||||
$client = new HTTPClient($this->server . "/is-this-spam");
|
$response = $this->postJSON($this->server . "/is-this-spam", $activity->asArray());
|
||||||
|
|
||||||
$client->setMethod('POST');
|
|
||||||
$client->setAuth($this->username, $this->password);
|
|
||||||
$client->setHeader('Content-Type', 'application/json');
|
|
||||||
$client->setBody(json_encode($activity->asArray()));
|
|
||||||
|
|
||||||
$response = $client->send();
|
|
||||||
|
|
||||||
if (!$response->isOK()) {
|
if (!$response->isOK()) {
|
||||||
throw new Exception("Error " . $response->getStatus() . " checking spam score: " . $response->getBody());
|
throw new Exception("Error " . $response->getStatus() . " checking spam score: " . $response->getBody());
|
||||||
@ -118,14 +107,7 @@ class SpamFilter {
|
|||||||
throw new Exception("Unknown category: " + $category);
|
throw new Exception("Unknown category: " + $category);
|
||||||
}
|
}
|
||||||
|
|
||||||
$client = new HTTPClient($this->server . $endpoint);
|
$response = $this->postJSON($this->server . $endpoint, $activity->asArray());
|
||||||
|
|
||||||
$client->setMethod('POST');
|
|
||||||
$client->setAuth($this->username, $this->password);
|
|
||||||
$client->setHeader('Content-Type', 'application/json');
|
|
||||||
$client->setBody(json_encode($activity->asArray()));
|
|
||||||
|
|
||||||
$response = $client->send();
|
|
||||||
|
|
||||||
if (!$response->isOK()) {
|
if (!$response->isOK()) {
|
||||||
throw new Exception("Error " . $response->getStatus() . " checking spam score: " . $response->getBody());
|
throw new Exception("Error " . $response->getStatus() . " checking spam score: " . $response->getBody());
|
||||||
@ -153,4 +135,45 @@ class SpamFilter {
|
|||||||
return $this->trainActivity($activity, $category);
|
return $this->trainActivity($activity, $category);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function postJSON($url, $body)
|
||||||
|
{
|
||||||
|
$request = OAuthRequest::from_consumer_and_token($this->consumer,
|
||||||
|
$this->token,
|
||||||
|
'POST',
|
||||||
|
$url);
|
||||||
|
|
||||||
|
$request->sign_request($this->sha1_method,
|
||||||
|
$this->consumer,
|
||||||
|
$this->token);
|
||||||
|
|
||||||
|
$hclient = new HTTPClient($url);
|
||||||
|
|
||||||
|
$hclient->setConfig(array('connect_timeout' => 120,
|
||||||
|
'timeout' => 120,
|
||||||
|
'follow_redirects' => true,
|
||||||
|
'ssl_verify_peer' => false,
|
||||||
|
'ssl_verify_host' => false));
|
||||||
|
|
||||||
|
$hclient->setMethod(HTTP_Request2::METHOD_POST);
|
||||||
|
$hclient->setBody(json_encode($body));
|
||||||
|
$hclient->setHeader('Content-Type', 'application/json');
|
||||||
|
$hclient->setHeader($request->to_header());
|
||||||
|
|
||||||
|
// Twitter is strict about accepting invalid "Expect" headers
|
||||||
|
// No reason not to clear it still here -ESP
|
||||||
|
|
||||||
|
$hclient->setHeader('Expect', '');
|
||||||
|
|
||||||
|
try {
|
||||||
|
$response = $hclient->send();
|
||||||
|
$code = $response->getStatus();
|
||||||
|
if ($code < 200 || $code >= 400) {
|
||||||
|
throw new OAuthClientException($response->getBody(), $code);
|
||||||
|
}
|
||||||
|
return $response->getBody();
|
||||||
|
} catch (Exception $e) {
|
||||||
|
throw new OAuthClientException($e->getMessage(), $e->getCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user