Fixed local_secure_restricted preventing attachment uploads

[bookstack] / app / Entities / Models / Entity.php

diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index c6b2468b0814afd124d1c64a4e0f8b116b9ec8d5..26a52073e016358f4f604c47eb3b2f0699fc88dd 100644 (file)
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -1,15 +1,26 @@
-<?php namespace BookStack\Entities\Models;
+<?php
+
+namespace BookStack\Entities\Models;

 
 use BookStack\Actions\Activity;
 use BookStack\Actions\Comment;
 
 use BookStack\Actions\Activity;
 use BookStack\Actions\Comment;

+use BookStack\Actions\Favourite;

 use BookStack\Actions\Tag;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Actions\Tag;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;

-use BookStack\Entities\Tools\SearchIndex;
+use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Auth\Permissions\PermissionApplicator;

 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Entities\Tools\SlugGenerator;

-use BookStack\Facades\Permissions;
+use BookStack\Interfaces\Deletable;
+use BookStack\Interfaces\Favouritable;
+use BookStack\Interfaces\Loggable;
+use BookStack\Interfaces\Sluggable;
+use BookStack\Interfaces\Viewable;

 use BookStack\Model;
 use BookStack\Model;

+use BookStack\References\Reference;
+use BookStack\Search\SearchIndex;
+use BookStack\Search\SearchTerm;

 use BookStack\Traits\HasCreatorAndUpdater;
 use BookStack\Traits\HasOwner;
 use Carbon\Carbon;
 use BookStack\Traits\HasCreatorAndUpdater;
 use BookStack\Traits\HasOwner;
 use Carbon\Carbon;


@@ -23,21 +34,22 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * The base class for book-like items such as pages, chapters & books.
  * This is not a database model in itself but extended.
  *
  * The base class for book-like items such as pages, chapters & books.
  * This is not a database model in itself but extended.
  *

- * @property int $id
- * @property string $name
- * @property string $slug
- * @property Carbon $created_at
- * @property Carbon $updated_at
- * @property int $created_by
- * @property int $updated_by
- * @property boolean $restricted
+ * @property int        $id
+ * @property string     $name
+ * @property string     $slug
+ * @property Carbon     $created_at
+ * @property Carbon     $updated_at
+ * @property Carbon     $deleted_at
+ * @property int        $created_by
+ * @property int        $updated_by
+ * @property bool       $restricted

  * @property Collection $tags
  * @property Collection $tags

+ *

  * @method static Entity|Builder visible()
  * @method static Entity|Builder visible()

- * @method static Entity|Builder hasPermission(string $permission)

  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */

-abstract class Entity extends Model
+abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, Deletable, Loggable

 {
     use SoftDeletes;
     use HasCreatorAndUpdater;
 {
     use SoftDeletes;
     use HasCreatorAndUpdater;


@@ -58,15 +70,7 @@ abstract class Entity extends Model
      */
     public function scopeVisible(Builder $query): Builder
     {
      */
     public function scopeVisible(Builder $query): Builder
     {

-        return $this->scopeHasPermission($query, 'view');
-    }
-
-    /**
-     * Scope the query to those entities that the current user has the given permission for.
-     */
-    public function scopeHasPermission(Builder $query, string $permission)
-    {
-        return Permissions::restrictEntityQuery($query, $permission);
+        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);

     }
 
     /**
     }
 
     /**


@@ -99,7 +103,7 @@ abstract class Entity extends Model
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
      */
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
      */

-    public function matches(Entity $entity): bool
+    public function matches(self $entity): bool

     {
         return [get_class($this), $this->id] === [get_class($entity), $entity->id];
     }
     {
         return [get_class($this), $this->id] === [get_class($entity), $entity->id];
     }


@@ -107,17 +111,17 @@ abstract class Entity extends Model
     /**
      * Checks if the current entity matches or contains the given.
      */
     /**
      * Checks if the current entity matches or contains the given.
      */

-    public function matchesOrContains(Entity $entity): bool
+    public function matchesOrContains(self $entity): bool

     {
         if ($this->matches($entity)) {
             return true;
         }
 
     {
         if ($this->matches($entity)) {
             return true;
         }
 

-        if (($entity->isA('chapter') || $entity->isA('page')) && $this->isA('book')) {
+        if (($entity instanceof BookChild) && $this instanceof Book) {

             return $entity->book_id === $this->id;
         }
 
             return $entity->book_id === $this->id;
         }
 

-        if ($entity->isA('page') && $this->isA('chapter')) {
+        if ($entity instanceof Page && $this instanceof Chapter) {

             return $entity->chapter_id === $this->id;
         }
 
             return $entity->chapter_id === $this->id;
         }
 


@@ -150,11 +154,12 @@ abstract class Entity extends Model
     }
 
     /**
     }
 
     /**

-     * Get the comments for an entity
+     * Get the comments for an entity.

      */
     public function comments(bool $orderByCreated = true): MorphMany
     {
         $query = $this->morphMany(Comment::class, 'entity');
      */
     public function comments(bool $orderByCreated = true): MorphMany
     {
         $query = $this->morphMany(Comment::class, 'entity');

+

         return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
     }
 
         return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
     }
 


@@ -199,9 +204,27 @@ abstract class Entity extends Model
         return $this->morphMany(Deletion::class, 'deletable');
     }
 
         return $this->morphMany(Deletion::class, 'deletable');
     }
 

+    /**
+     * Get the references pointing from this entity to other items.
+     */
+    public function referencesFrom(): MorphMany
+    {
+        return $this->morphMany(Reference::class, 'from');
+    }
+
+    /**
+     * Get the references pointing to this entity from other items.
+     */
+    public function referencesTo(): MorphMany
+    {
+        return $this->morphMany(Reference::class, 'to');
+    }
+

     /**
      * Check if this instance or class is a certain type of entity.
     /**
      * Check if this instance or class is a certain type of entity.

-     * Examples of $type are 'page', 'book', 'chapter'
+     * Examples of $type are 'page', 'book', 'chapter'.
+     *
+     * @deprecated Use instanceof instead.

      */
     public static function isA(string $type): bool
     {
      */
     public static function isA(string $type): bool
     {


@@ -214,6 +237,7 @@ abstract class Entity extends Model
     public static function getType(): string
     {
         $className = array_slice(explode('\\', static::class), -1, 1)[0];
     public static function getType(): string
     {
         $className = array_slice(explode('\\', static::class), -1, 1)[0];

+

         return strtolower($className);
     }
 
         return strtolower($className);
     }
 


@@ -225,15 +249,8 @@ abstract class Entity extends Model
         if (mb_strlen($this->name) <= $length) {
             return $this->name;
         }
         if (mb_strlen($this->name) <= $length) {
             return $this->name;
         }

-        return mb_substr($this->name, 0, $length - 3) . '...';
-    }

 
 

-    /**
-     * Get the body text of this entity.
-     */
-    public function getText(): string
-    {
-        return $this->{$this->textField} ?? '';
+        return mb_substr($this->name, 0, $length - 3) . '...';

     }
 
     /**
     }
 
     /**


@@ -241,17 +258,17 @@ abstract class Entity extends Model
      */
     public function getExcerpt(int $length = 100): string
     {
      */
     public function getExcerpt(int $length = 100): string
     {

-        $text = $this->getText();
+        $text = $this->{$this->textField} ?? '';

 
         if (mb_strlen($text) > $length) {
 
         if (mb_strlen($text) > $length) {

-            $text = mb_substr($text, 0, $length-3) . '...';
+            $text = mb_substr($text, 0, $length - 3) . '...';

         }
 
         return trim($text);
     }
 
     /**
         }
 
         return trim($text);
     }
 
     /**

-     * Get the url of this entity
+     * Get the url of this entity.

      */
     abstract public function getUrl(string $path = '/'): string;
 
      */
     abstract public function getUrl(string $path = '/'): string;
 


@@ -260,14 +277,15 @@ abstract class Entity extends Model
      * This is the "static" parent and does not include dynamic
      * relations such as shelves to books.
      */
      * This is the "static" parent and does not include dynamic
      * relations such as shelves to books.
      */

-    public function getParent(): ?Entity
+    public function getParent(): ?self

     {
     {

-        if ($this->isA('page')) {
+        if ($this instanceof Page) {

             return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
         }
             return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
         }

-        if ($this->isA('chapter')) {
+        if ($this instanceof Chapter) {

             return $this->book()->withTrashed()->first();
         }
             return $this->book()->withTrashed()->first();
         }

+

         return null;
     }
 
         return null;
     }
 


@@ -276,24 +294,50 @@ abstract class Entity extends Model
      */
     public function rebuildPermissions()
     {
      */
     public function rebuildPermissions()
     {

-        /** @noinspection PhpUnhandledExceptionInspection */
-        Permissions::buildJointPermissionsForEntity(clone $this);
+        app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);

     }
 
     /**
     }
 
     /**

-     * Index the current entity for search
+     * Index the current entity for search.

      */
     public function indexForSearch()
     {
      */
     public function indexForSearch()
     {

-        app(SearchIndex::class)->indexEntity(clone $this);
+        app()->make(SearchIndex::class)->indexEntity(clone $this);

     }
 
     /**
     }
 
     /**

-     * Generate and set a new URL slug for this model.
+     * {@inheritdoc}

      */
     public function refreshSlug(): string
     {
      */
     public function refreshSlug(): string
     {

-        $this->slug = (new SlugGenerator)->generate($this);
+        $this->slug = app()->make(SlugGenerator::class)->generate($this);
+

         return $this->slug;
     }
         return $this->slug;
     }

+
+    /**
+     * {@inheritdoc}
+     */
+    public function favourites(): MorphMany
+    {
+        return $this->morphMany(Favourite::class, 'favouritable');
+    }
+
+    /**
+     * Check if the entity is a favourite of the current user.
+     */
+    public function isFavourite(): bool
+    {
+        return $this->favourites()
+            ->where('user_id', '=', user()->id)
+            ->exists();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logDescriptor(): string
+    {
+        return "({$this->id}) {$this->name}";
+    }

 }
 }