Skip to content
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.

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

feat: support gdpr export, anonymize and deletion #32

Merged
merged 4 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ jobs:
with:
enable_backend_testing: true
enable_phpstan: true
php_versions: '["8.0", "8.1", "8.2"]'

backend_directory: .
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
],
"require": {
"flarum/core": "^1.2.0"
"flarum/core": "^1.8.3"
},
"authors": [
{
Expand Down Expand Up @@ -51,7 +51,8 @@
"flarum/suspend",
"flarum/flags",
"flarum/tags",
"flarum/approval"
"flarum/approval",
"blomstra/gdpr"
]
},
"flagrow": {
Expand Down Expand Up @@ -89,6 +90,7 @@
},
"require-dev": {
"flarum/testing": "^1.0.0",
"flarum/phpstan": "*"
"flarum/phpstan": "*",
"blomstra/gdpr": "@beta"
}
}
7 changes: 7 additions & 0 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace FoF\BanIPs;

use Blomstra\Gdpr\Extend\UserData;
use Flarum\Api\Controller;
use Flarum\Api\Serializer;
use Flarum\Api\Serializer\AbstractSerializer;
Expand Down Expand Up @@ -108,4 +109,10 @@

(new Extend\Filter(Search\BannedIPFilterer::class))
->addFilter(Search\NxGambit::class),

(new Extend\Conditional())
->whenExtensionEnabled('blomstra-gdpr', fn () => [
(new UserData())
->addType(Data\BannedIPData::class),
]),
];
6 changes: 6 additions & 0 deletions resources/locale/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,9 @@ fof-ban-ips:
address_label: IP Address
reason_label: Reason

blomstra-gdpr:
lib:
data:
bannedipdata:
export_description: "If an IP ban record is associated with a user (i.e. the user was banned by IP), the user's IP address will be included in the export, along with the reason for the ban and the creation date."
anonymize_description: "Any IP addresses linked to the user are decoupled, but the IP itself will remain banned, along with the reason. Ensure no PII data is stored in the 'reason' field."
54 changes: 54 additions & 0 deletions src/Data/BannedIPData.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?php

/*
* This file is part of fof/ban-ips.
*
* Copyright (c) FriendsOfFlarum.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace FoF\BanIPs\Data;

use Blomstra\Gdpr\Data\Type;
use FoF\BanIPs\BannedIP;
use Illuminate\Support\Arr;

class BannedIPData extends Type
{
public function export(): ?array
{
$exportData = [];

BannedIP::query()
->where('user_id', $this->user->id)
->each(function (BannedIP $bannedIp) use (&$exportData) {
$exportData[] = ["bannedIP/ip-{$bannedIp->id}.json" => $this->encodeForExport($this->sanitize($bannedIp))];
});

return $exportData;
}

public function sanitize(BannedIP $bannedIP): array
{
return Arr::except($bannedIP->toArray(), ['id', 'creator_id', 'user_id']);
}

public function anonymize(): void
{
BannedIP::query()
->where('user_id', $this->user->id)
->update(['user_id' => null]);
}

public static function deleteDescription(): string
{
return self::anonymizeDescription();
}

public function delete(): void
{
$this->anonymize();
}
}
Loading