chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1124 from pixelfed/frontend-ui-refactor 

Add COSTAR
This commit is contained in:
daniel 2019-04-04 22:44:45 -06:00 committed by GitHub
parent 15d4aff821 c86f36d53d
commit d66b8044fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 131 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@ -65,3 +65,7 @@ HORIZON_DARKMODE=true
# php artisan optimize
ACTIVITY_PUB=false
REMOTE_FOLLOW=false
CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
CS_CW_DOMAINS='example.org,example.net,example.com'
CS_UNLISTED_DOMAINS='example.org,example.net,example.com'

4
.env.testing
View File

@ -56,3 +56,7 @@ MIX_API_SEARCH="${API_SEARCH}"
TELESCOPE_ENABLED=false
PF_MAX_USERS=1000
CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
CS_CW_DOMAINS='example.org,example.net,example.com'
CS_UNLISTED_DOMAINS='example.org,example.net,example.com'

68
app/Util/ActivityPub/Helpers.php
View File

@ -24,6 +24,7 @@ use App\Jobs\StatusPipeline\NewStatusPipeline;
use App\Util\HttpSignatures\{GuzzleHttpSignatures, KeyStore, Context, Verifier};
use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
use App\Util\ActivityPub\HttpSignature;
use Illuminate\Support\Str;
class Helpers {
@ -141,7 +142,22 @@ class Helpers {
$valid = filter_var($url, FILTER_VALIDATE_URL);
if(in_array(parse_url($valid, PHP_URL_HOST), $localhosts)) {
if(!$valid) {
return false;
}
$host = parse_url($valid, PHP_URL_HOST);
if(config('costar.enabled') == true) {
if(
(config('costar.domain.block') != null && in_array($host, config('costar.domain.block')) == true) ||
(config('costar.actor.block') != null && in_array($url, config('costar.actor.block')) == true)
) {
return false;
}
}
if(in_array($host, $localhosts)) {
return false;
}
@ -151,7 +167,7 @@ class Helpers {
public static function validateLocalUrl($url)
{
$url = self::validateUrl($url);
if($url) {
if($url == true) {
$domain = config('pixelfed.domain.app');
$host = parse_url($url, PHP_URL_HOST);
$url = $domain === $host ? $url : false;
@ -217,6 +233,48 @@ class Helpers {
$activity = ['object' => $res];
}
if(isset($res['content']) == false) {
abort(400, 'Invalid object');
}
$scope = 'private';
$cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false;
if(isset($res['to']) == true && in_array('https://www.w3.org/ns/activitystreams#Public', $res['to'])) {
$scope = 'public';
}
if(isset($res['cc']) == true && in_array('https://www.w3.org/ns/activitystreams#Public', $res['cc'])) {
$scope = 'unlisted';
}
if(config('costar.enabled') == true) {
$blockedKeywords = config('costar.keyword.block');
if($blockedKeywords !== null) {
$keywords = config('costar.keyword.block');
foreach($keywords as $kw) {
if(Str::contains($res['content'], $kw) == true) {
abort(400, 'Invalid object');
}
}
}
$unlisted = config('costar.domain.unlisted');
if(in_array(parse_url($url, PHP_URL_HOST), $unlisted) == true) {
$unlisted = true;
$scope = 'unlisted';
} else {
$unlisted = false;
}
$cw = config('costar.domain.cw');
if(in_array(parse_url($url, PHP_URL_HOST), $cw) == true) {
$cw = true;
} else {
$cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false;
}
}
$idDomain = parse_url($res['id'], PHP_URL_HOST);
$urlDomain = parse_url($url, PHP_URL_HOST);
$actorDomain = parse_url($activity['object']['attributedTo'], PHP_URL_HOST);
@ -246,6 +304,9 @@ class Helpers {
$status->created_at = Carbon::parse($ts);
$status->in_reply_to_id = $reply_to;
$status->local = false;
$status->is_nsfw = $cw;
$status->scope = $scope;
$status->visibility = $scope;
$status->save();
self::importNoteAttachment($res, $status);
@ -301,6 +362,9 @@ class Helpers {
public static function profileFirstOrNew($url, $runJobs = false)
{
$url = self::validateUrl($url);
if($url == false) {
abort(400, 'Invalid url');
}
$host = parse_url($url, PHP_URL_HOST);
$local = config('pixelfed.domain.app') == $host ? true : false;

33
config/costar.php Normal file
View File

@ -0,0 +1,33 @@
<?php
/*
* COSTAR - Confirm Object Sentiment Transform and Reduce
*
* v 0.1
*
*/
return [
'enabled' => env('PF_COSTAR_ENABLED', true),
'domain' => [
'block' => env('CS_BLOCKED_DOMAINS', null) ? explode(',', env('CS_BLOCKED_DOMAINS')) : null,
'cw' => env('CS_CW_DOMAINS', null) ? explode(',', env('CS_CW_DOMAINS')) : null,
'unlisted' => env('CS_UNLISTED_DOMAINS', null) ? explode(',', env('CS_UNLISTED_DOMAINS')) : null,
],
'keyword' => [
'block' => env('CS_BLOCKED_KEYWORDS', null) ? explode(',', env('CS_BLOCKED_KEYWORDS')) : null,
'cw' => env('CS_CW_KEYWORDS', null) ? explode(',', env('CS_CW_KEYWORDS')) : null,
'unlisted' => env('CS_UNLISTED_KEYWORDS', null) ? explode(',', env('CS_UNLISTED_KEYWORDS')) : null,
],
'actor' => [
'block' => env('CS_BLOCKED_ACTOR', null) ? explode(',', env('CS_BLOCKED_ACTOR')) : null,
'cw' => env('CS_CW_ACTOR', null) ? explode(',', env('CS_CW_ACTOR')) : null,
'unlisted' => env('CS_UNLISTED_ACTOR', null) ? explode(',', env('CS_UNLISTED_ACTOR')) : null,
]
];

24
tests/Unit/CostarTest.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace Tests\Unit;
use App\Util\ActivityPub\Helpers;
use Tests\TestCase;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Foundation\Testing\RefreshDatabase;
class CostarTest extends TestCase
{
/** @test */
public function blockedDomain()
{
$domains = config('costar.domain.block');
$this->assertTrue(in_array('example.net', $domains));
$blockedDomain = 'https://example.org/user/replyGuy';
$this->assertFalse(Helpers::validateUrl($blockedDomain));
$unblockedDomain = 'https://pixelfed.org/user/pixelfed';
$this->assertEquals(Helpers::validateUrl($unblockedDomain), $unblockedDomain);
}
}