More updates for laravel 11
This commit is contained in:
38
app/Models/Casts/CollectionOrNull.php
Normal file
38
app/Models/Casts/CollectionOrNull.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Casts;
|
||||
|
||||
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
class CollectionOrNull implements CastsAttributes
|
||||
{
|
||||
/**
|
||||
* Cast the given value.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
* @param array $attributes
|
||||
* @return Collection
|
||||
*/
|
||||
public function get(Model $model,string $key,$value,array $attributes): Collection
|
||||
{
|
||||
return collect(json_decode($value, true));
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare the given value for storage.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
* @param array $attributes
|
||||
* @return string|null
|
||||
*/
|
||||
public function set(Model $model,string $key,$value,array $attributes): ?string
|
||||
{
|
||||
return ($value->count()) ? json_encode($value) : NULL;
|
||||
}
|
||||
}
|
46
app/Models/Casts/CompressedStringOrNull.php
Normal file
46
app/Models/Casts/CompressedStringOrNull.php
Normal file
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Casts;
|
||||
|
||||
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class CompressedStringOrNull implements CastsAttributes
|
||||
{
|
||||
/**
|
||||
* Cast the given value.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
* @param array $attributes
|
||||
* @return string|null
|
||||
* @note postgres bytea columns the value is a resource stream
|
||||
*/
|
||||
public function get(Model $model,string $key,mixed $value,array $attributes): ?string
|
||||
{
|
||||
// For stream resources, we to fseek in case we've already read it.
|
||||
if (is_resource($value))
|
||||
fseek($value,0);
|
||||
|
||||
$value = is_resource($value)
|
||||
? stream_get_contents($value)
|
||||
: $value;
|
||||
|
||||
return $value ? zstd_uncompress(base64_decode($value)) : NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare the given value for storage.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
* @param array $attributes
|
||||
* @return string|null
|
||||
*/
|
||||
public function set(Model $model,string $key,$value,array $attributes): ?string
|
||||
{
|
||||
return $value ? base64_encode(zstd_compress($value)) : NULL;
|
||||
}
|
||||
}
|
29
app/Models/Casts/UTF8StringOrNull.php
Normal file
29
app/Models/Casts/UTF8StringOrNull.php
Normal file
@@ -0,0 +1,29 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Casts;
|
||||
|
||||
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class UTF8StringOrNull implements CastsAttributes
|
||||
{
|
||||
/**
|
||||
* Cast the given value.
|
||||
*
|
||||
* @param array<string, mixed> $attributes
|
||||
*/
|
||||
public function get(Model $model,string $key,mixed $value,array $attributes): ?string
|
||||
{
|
||||
return $value ? utf8_decode($value) : NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare the given value for storage.
|
||||
*
|
||||
* @param array<string, mixed> $attributes
|
||||
*/
|
||||
public function set(Model $model,string $key,mixed $value,array $attributes): ?string
|
||||
{
|
||||
return $value ? utf8_encode($value) : NULL;
|
||||
}
|
||||
}
|
@@ -5,7 +5,7 @@ namespace App\Models;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
use App\Casts\CollectionOrNull;
|
||||
use App\Models\Casts\CollectionOrNull;
|
||||
|
||||
class Dynamic extends Model
|
||||
{
|
||||
|
@@ -9,10 +9,10 @@ use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Casts\{CollectionOrNull,CompressedStringOrNull,UTF8StringOrNull};
|
||||
use App\Classes\FTN\Message;
|
||||
use App\Events\Echomail as EchomailEvent;
|
||||
use App\Interfaces\Packet;
|
||||
use App\Models\Casts\{CompressedStringOrNull,CollectionOrNull,UTF8StringOrNull};
|
||||
use App\Traits\{MessageAttributes,MsgID,ParseAddresses,QueryCacheableConfig};
|
||||
|
||||
final class Echomail extends Model implements Packet
|
||||
@@ -250,6 +250,7 @@ final class Echomail extends Model implements Packet
|
||||
}
|
||||
|
||||
// See if we need to export this message.
|
||||
// @todo We need to limit exporting if address/system is not active
|
||||
if ($model->echoarea->sec_read) {
|
||||
$exportto = $model
|
||||
->echoarea
|
||||
|
@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
use App\Casts\{CollectionOrNull,CompressedStringOrNull};
|
||||
use App\Models\Casts\{CompressedStringOrNull,CollectionOrNull};
|
||||
|
||||
class File extends Model
|
||||
{
|
||||
|
@@ -10,9 +10,9 @@ use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Casts\{CollectionOrNull,CompressedStringOrNull,UTF8StringOrNull};
|
||||
use App\Interfaces\Packet;
|
||||
use App\Pivots\ViaPivot;
|
||||
use App\Models\Casts\{CompressedStringOrNull,CollectionOrNull,UTF8StringOrNull};
|
||||
use App\Models\Pivots\ViaPivot;
|
||||
use App\Traits\{MessageAttributes,MsgID};
|
||||
|
||||
final class Netmail extends Model implements Packet
|
||||
|
@@ -2,10 +2,9 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
use App\Casts\UTF8StringOrNull;
|
||||
use App\Models\Casts\UTF8StringOrNull;
|
||||
|
||||
class Origin extends Model
|
||||
{
|
||||
|
12
app/Models/Pivots/ViaPivot.php
Normal file
12
app/Models/Pivots/ViaPivot.php
Normal file
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Pivots;
|
||||
|
||||
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||
|
||||
class ViaPivot extends Pivot
|
||||
{
|
||||
protected $casts = [
|
||||
'datetime' => 'datetime',
|
||||
];
|
||||
}
|
28
app/Models/Policies/EchomailPolicy.php
Normal file
28
app/Models/Policies/EchomailPolicy.php
Normal file
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Policies;
|
||||
|
||||
use Illuminate\Auth\Access\HandlesAuthorization;
|
||||
|
||||
use App\Models\{Echomail,User};
|
||||
|
||||
class EchomailPolicy
|
||||
{
|
||||
use HandlesAuthorization;
|
||||
|
||||
/**
|
||||
* This determines whether a logged-in user can view an echomail
|
||||
*
|
||||
* @param User $user
|
||||
* @param Echomail $o
|
||||
* @return bool
|
||||
*/
|
||||
public function view(User $user, Echomail $o): bool
|
||||
{
|
||||
return (
|
||||
$user->isAdmin()
|
||||
|| $user->isZC()
|
||||
|| $o->seenby->pluck('id')->intersect($user->addresses()->pluck('id'))->count()
|
||||
);
|
||||
}
|
||||
}
|
32
app/Models/Policies/NetmailPolicy.php
Normal file
32
app/Models/Policies/NetmailPolicy.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Policies;
|
||||
|
||||
use Illuminate\Auth\Access\HandlesAuthorization;
|
||||
|
||||
use App\Models\{Netmail,User};
|
||||
|
||||
class NetmailPolicy
|
||||
{
|
||||
use HandlesAuthorization;
|
||||
|
||||
/**
|
||||
* This determines whether a logged-in user can view a netmail
|
||||
*
|
||||
* @param User $user
|
||||
* @param Netmail $o
|
||||
* @return bool
|
||||
*/
|
||||
public function view(User $user, Netmail $o): bool
|
||||
{
|
||||
$addresses = $user->addresses()->pluck('id');
|
||||
|
||||
// Site Admins can always view
|
||||
return (
|
||||
$user->isAdmin()
|
||||
|| $user->isZC()
|
||||
|| ($addresses->contains($o->fftn_id))
|
||||
|| ($addresses->contains($o->tftn_id))
|
||||
);
|
||||
}
|
||||
}
|
81
app/Models/Policies/SystemPolicy.php
Normal file
81
app/Models/Policies/SystemPolicy.php
Normal file
@@ -0,0 +1,81 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Policies;
|
||||
|
||||
use Illuminate\Auth\Access\HandlesAuthorization;
|
||||
|
||||
use App\Models\{System,User};
|
||||
|
||||
/**
|
||||
* This handles updating system records
|
||||
*
|
||||
* Authorisation is defined by function_role_only, where
|
||||
* - function = create,delete,update
|
||||
* - role = admin,zc,rc,nc,hc,nn,pt
|
||||
* - only = only that role can do (no hierarchy permission)
|
||||
* ie:
|
||||
* - admin - only site admin can do (user = admin)
|
||||
* - zc - only ZC can perform (user has an address that is a ZC)
|
||||
* - rc - only RC (or ZC) ...
|
||||
* - hc - only HC (or ZC/RC) ...
|
||||
* - nn - only NN (or ZC/RC/HC) ...
|
||||
* - pt - only PT (or ZC/RC/HC/NN) ...
|
||||
*/
|
||||
class SystemPolicy
|
||||
{
|
||||
use HandlesAuthorization;
|
||||
|
||||
/**
|
||||
* Determine whether the user can create the model.
|
||||
*
|
||||
* A user can create a system if it doesnt exist.
|
||||
*
|
||||
* @param User $user
|
||||
* @param System $system
|
||||
* @return bool
|
||||
*/
|
||||
public function create(User $user, System $system): bool
|
||||
{
|
||||
// Site Admins can always create
|
||||
// If it doesnt exist, then a user can create it.
|
||||
return ($user->isAdmin() || (! $system->exists));
|
||||
}
|
||||
|
||||
/**
|
||||
* Can the user register this system
|
||||
*
|
||||
* @param User $user
|
||||
* @param System $system
|
||||
* @return bool
|
||||
*/
|
||||
public function register(User $user,System $system): bool
|
||||
{
|
||||
return ! $system->users->count() || $system->users->has($user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can update the model.
|
||||
*
|
||||
* A user can update a system if they are the user of it and it has no addresses.
|
||||
* If it has addresses, at least one of the addresses must have been validated.
|
||||
* (The assumption is, if a system has multiple addresses, they would be valid, or an admin can remove them.)
|
||||
*
|
||||
* @param User $user
|
||||
* @param System $system
|
||||
* @return bool
|
||||
*/
|
||||
public function update_nn(User $user,System $system): bool
|
||||
{
|
||||
// Site Admins can always edit
|
||||
if ($user->isAdmin())
|
||||
return TRUE;
|
||||
|
||||
// If it doesnt exist, then its a false.
|
||||
if (! $system->exists)
|
||||
return FALSE;
|
||||
|
||||
// @todo Permit ZC, RC, NC, HUB user
|
||||
|
||||
return $system->users->contains($user) && $system->akas->count();
|
||||
}
|
||||
}
|
87
app/Models/Policies/UserPolicy.php
Normal file
87
app/Models/Policies/UserPolicy.php
Normal file
@@ -0,0 +1,87 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Policies;
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
class UserPolicy
|
||||
{
|
||||
/**
|
||||
* Does this user have admin privileges
|
||||
*
|
||||
* @param User $user
|
||||
* @return bool
|
||||
*/
|
||||
public function admin(User $user): bool
|
||||
{
|
||||
return $user->isAdmin();
|
||||
}
|
||||
|
||||
/**
|
||||
* Does this user own the model?
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $model
|
||||
* @return bool
|
||||
*/
|
||||
public function ownes(User $user,User $model): bool
|
||||
{
|
||||
return $user->id === $model->id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can view any models.
|
||||
*/
|
||||
public function viewAny(User $user): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can view the model.
|
||||
*/
|
||||
public function view(User $user, User $model): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can create models.
|
||||
*/
|
||||
public function create(User $user): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can update the model, or if the user is an admin, and thus they can update all users.
|
||||
*/
|
||||
public function update(User $user, User $model): bool
|
||||
{
|
||||
return $user->isAdmin() || ($model->id === $user->id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can delete the model.
|
||||
*/
|
||||
public function delete(User $user, User $model): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can restore the model.
|
||||
*/
|
||||
public function restore(User $user, User $model): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine whether the user can permanently delete the model.
|
||||
*/
|
||||
public function forceDelete(User $user, User $model): bool
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
@@ -2,10 +2,9 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
use App\Casts\UTF8StringOrNull;
|
||||
use App\Models\Casts\UTF8StringOrNull;
|
||||
|
||||
class Tagline extends Model
|
||||
{
|
||||
|
@@ -2,10 +2,9 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
use App\Casts\UTF8StringOrNull;
|
||||
use App\Models\Casts\UTF8StringOrNull;
|
||||
|
||||
class Tearline extends Model
|
||||
{
|
||||
|
Reference in New Issue
Block a user