diff --git a/src/FederationServer/Classes/Enums/AuditLogType.php b/src/FederationServer/Classes/Enums/AuditLogType.php index 0eecdfa..77763de 100644 --- a/src/FederationServer/Classes/Enums/AuditLogType.php +++ b/src/FederationServer/Classes/Enums/AuditLogType.php @@ -17,9 +17,9 @@ case EVIDENCE_DELETED = 'EVIDENCE_DELETED'; case ENTITY_DISCOVERED = 'ENTITY_DISCOVERED'; - case ENTITY_BLACKLISTED = 'ENTITY_BLACKLISTED'; - case ENTITY_UNBLACKLISTED = 'ENTITY_UNBLACKLISTED'; + case ENTITY_DELETED = 'ENTITY_DELETED'; case BLACKLIST_RECORD_DELETED = 'BLACKLIST_DELETED'; case BLACKLIST_LIFTED = 'BLACKLIST_LIFTED'; + case ENTITY_BLACKLISTED = 'ENTITY_BLACKLISTED'; } \ No newline at end of file diff --git a/src/FederationServer/Methods/Blacklist/BlacklistEntity.php b/src/FederationServer/Methods/Blacklist/BlacklistEntity.php index 2f507d7..9d1154d 100644 --- a/src/FederationServer/Methods/Blacklist/BlacklistEntity.php +++ b/src/FederationServer/Methods/Blacklist/BlacklistEntity.php @@ -3,7 +3,9 @@ namespace FederationServer\Methods\Blacklist; use FederationServer\Classes\Configuration; + use FederationServer\Classes\Enums\AuditLogType; use FederationServer\Classes\Enums\BlacklistType; + use FederationServer\Classes\Managers\AuditLogManager; use FederationServer\Classes\Managers\BlacklistManager; use FederationServer\Classes\Managers\EntitiesManager; use FederationServer\Classes\RequestHandler; @@ -77,6 +79,15 @@ expires: $expires, evidence: $evidence ); + + AuditLogManager::createEntry(AuditLogType::ENTITY_BLACKLISTED, sprintf( + 'Entity %s blacklisted by %s (%s) with type %s%s', + $entityUuid, + $authenticatedOperator->getName(), + $authenticatedOperator->getUuid(), + $type->name, + $expires ? ' until ' . date('Y-m-d H:i:s', $expires) : '' + ), $authenticatedOperator->getUuid(), $entityUuid); } catch(DatabaseOperationException $e) { diff --git a/src/FederationServer/Methods/Entities/DeleteEntity.php b/src/FederationServer/Methods/Entities/DeleteEntity.php index c3ed736..63da7b1 100644 --- a/src/FederationServer/Methods/Entities/DeleteEntity.php +++ b/src/FederationServer/Methods/Entities/DeleteEntity.php @@ -2,6 +2,8 @@ namespace FederationServer\Methods\Entities; + use FederationServer\Classes\Enums\AuditLogType; + use FederationServer\Classes\Managers\AuditLogManager; use FederationServer\Classes\Managers\EntitiesManager; use FederationServer\Classes\RequestHandler; use FederationServer\Classes\Validate; @@ -41,6 +43,13 @@ } EntitiesManager::deleteEntity($entityUuid); + + AuditLogManager::createEntry(AuditLogType::ENTITY_DELETED, sprintf( + 'Entity %s deleted by %s (%s)', + $entityUuid, + $authenticatedOperator->getName(), + $authenticatedOperator->getUuid() + ), $authenticatedOperator->getUuid(), $entityUuid); } catch (DatabaseOperationException $e) {