LDAP: Added TLS support

[bookstack] / app / Actions / ActivityService.php

diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php
index 11f8b87328ceec432c4f85b62bc6872edae80118..4e5b1f36575ff74c5439fe1518c372d94ae448f6 100644 (file)
--- a/app/Actions/ActivityService.php
+++ b/app/Actions/ActivityService.php
@@ -1,8 +1,11 @@
 <?php namespace BookStack\Actions;
 
 use BookStack\Auth\Permissions\PermissionService;
 <?php namespace BookStack\Actions;
 
 use BookStack\Auth\Permissions\PermissionService;

+use BookStack\Auth\User;

 use BookStack\Entities\Entity;
 use BookStack\Entities\Entity;

-use Session;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;

 
 class ActivityService
 {
 
 class ActivityService
 {


@@ -12,8 +15,6 @@ class ActivityService
 
     /**
      * ActivityService constructor.
 
     /**
      * ActivityService constructor.

-     * @param \BookStack\Actions\Activity $activity
-     * @param PermissionService $permissionService

      */
     public function __construct(Activity $activity, PermissionService $permissionService)
     {
      */
     public function __construct(Activity $activity, PermissionService $permissionService)
     {


@@ -24,73 +25,66 @@ class ActivityService
 
     /**
      * Add activity data to database.
 
     /**
      * Add activity data to database.

-     * @param Entity $entity
-     * @param        $activityKey
-     * @param int $bookId
-     * @param bool $extra

      */
      */

-    public function add(Entity $entity, $activityKey, $bookId = 0, $extra = false)
+    public function add(Entity $entity, string $activityKey, ?int $bookId = null)

     {
     {

-        $activity = $this->activity->newInstance();
-        $activity->user_id = $this->user->id;
-        $activity->book_id = $bookId;
-        $activity->key = strtolower($activityKey);
-        if ($extra !== false) {
-            $activity->extra = $extra;
-        }
+        $activity = $this->newActivityForUser($activityKey, $bookId);

         $entity->activity()->save($activity);
         $this->setNotification($activityKey);
     }
 
     /**
         $entity->activity()->save($activity);
         $this->setNotification($activityKey);
     }
 
     /**

-     * Adds a activity history with a message & without binding to a entity.
-     * @param            $activityKey
-     * @param int $bookId
-     * @param bool|false $extra
+     * Adds a activity history with a message, without binding to a entity.

      */
      */

-    public function addMessage($activityKey, $bookId = 0, $extra = false)
+    public function addMessage(string $activityKey, string $message, ?int $bookId = null)

     {
     {

-        $this->activity->user_id = $this->user->id;
-        $this->activity->book_id = $bookId;
-        $this->activity->key = strtolower($activityKey);
-        if ($extra !== false) {
-            $this->activity->extra = $extra;
-        }
-        $this->activity->save();
+        $this->newActivityForUser($activityKey, $bookId)->forceFill([
+            'extra' => $message
+        ])->save();
+

         $this->setNotification($activityKey);
     }
 
         $this->setNotification($activityKey);
     }
 

+    /**
+     * Get a new activity instance for the current user.
+     */
+    protected function newActivityForUser(string $key, ?int $bookId = null): Activity
+    {
+        return $this->activity->newInstance()->forceFill([
+            'key'     => strtolower($key),
+            'user_id' => $this->user->id,
+            'book_id' => $bookId ?? 0,
+        ]);
+    }

 
     /**
      * Removes the entity attachment from each of its activities
      * and instead uses the 'extra' field with the entities name.
      * Used when an entity is deleted.
 
     /**
      * Removes the entity attachment from each of its activities
      * and instead uses the 'extra' field with the entities name.
      * Used when an entity is deleted.

-     * @param Entity $entity
-     * @return mixed

      */
      */

-    public function removeEntity(Entity $entity)
+    public function removeEntity(Entity $entity): Collection

     {
     {

-        $activities = $entity->activity;
-        foreach ($activities as $activity) {
-            $activity->extra = $entity->name;
-            $activity->entity_id = 0;
-            $activity->entity_type = null;
-            $activity->save();
-        }
+        $activities = $entity->activity()->get();
+        $entity->activity()->update([
+            'extra'       => $entity->name,
+            'entity_id'   => 0,
+            'entity_type' => '',
+        ]);

         return $activities;
     }
 
     /**
      * Gets the latest activity.
         return $activities;
     }
 
     /**
      * Gets the latest activity.

-     * @param int $count
-     * @param int $page
-     * @return array

      */
      */

-    public function latest($count = 20, $page = 0)
+    public function latest(int $count = 20, int $page = 0): array

     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')

-            ->orderBy('created_at', 'desc')->with('user', 'entity')->skip($count * $page)->take($count)->get();
+            ->orderBy('created_at', 'desc')
+            ->with(['user', 'entity'])
+            ->skip($count * $page)
+            ->take($count)
+            ->get();

 
         return $this->filterSimilar($activityList);
     }
 
         return $this->filterSimilar($activityList);
     }


@@ -98,40 +92,42 @@ class ActivityService
     /**
      * Gets the latest activity for an entity, Filtering out similar
      * items to prevent a message activity list.
     /**
      * Gets the latest activity for an entity, Filtering out similar
      * items to prevent a message activity list.

-     * @param Entity $entity
-     * @param int $count
-     * @param int $page
-     * @return array

      */
      */

-    public function entityActivity($entity, $count = 20, $page = 1)
+    public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array

     {
         if ($entity->isA('book')) {
     {
         if ($entity->isA('book')) {

-            $query = $this->activity->where('book_id', '=', $entity->id);
+            $query = $this->activity->newQuery()->where('book_id', '=', $entity->id);

         } else {
         } else {

-            $query = $this->activity->where('entity_type', '=', get_class($entity))
+            $query = $this->activity->newQuery()->where('entity_type', '=', $entity->getMorphClass())

                 ->where('entity_id', '=', $entity->id);
         }
                 ->where('entity_id', '=', $entity->id);
         }

-        
+

         $activity = $this->permissionService
             ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
         $activity = $this->permissionService
             ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')

-            ->orderBy('created_at', 'desc')->with(['entity', 'user.avatar'])->skip($count * ($page - 1))->take($count)->get();
+            ->orderBy('created_at', 'desc')
+            ->with(['entity' => function (Relation $query) {
+                $query->withTrashed();
+            }, 'user.avatar'])
+            ->skip($count * ($page - 1))
+            ->take($count)
+            ->get();

 
         return $this->filterSimilar($activity);
     }
 
     /**
 
         return $this->filterSimilar($activity);
     }
 
     /**

-     * Get latest activity for a user, Filtering out similar
-     * items.
-     * @param $user
-     * @param int $count
-     * @param int $page
-     * @return array
+     * Get latest activity for a user, Filtering out similar items.

      */
      */

-    public function userActivity($user, $count = 20, $page = 0)
+    public function userActivity(User $user, int $count = 20, int $page = 0): array

     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')

-            ->orderBy('created_at', 'desc')->where('user_id', '=', $user->id)->skip($count * $page)->take($count)->get();
+            ->orderBy('created_at', 'desc')
+            ->where('user_id', '=', $user->id)
+            ->skip($count * $page)
+            ->take($count)
+            ->get();
+

         return $this->filterSimilar($activityList);
     }
 
         return $this->filterSimilar($activityList);
     }
 


@@ -140,34 +136,47 @@ class ActivityService
      * @param Activity[] $activities
      * @return array
      */
      * @param Activity[] $activities
      * @return array
      */

-    protected function filterSimilar($activities)
+    protected function filterSimilar(iterable $activities): array

     {
         $newActivity = [];
     {
         $newActivity = [];

-        $previousItem = false;
+        $previousItem = null;
+

         foreach ($activities as $activityItem) {
         foreach ($activities as $activityItem) {

-            if ($previousItem === false) {
-                $previousItem = $activityItem;
-                $newActivity[] = $activityItem;
-                continue;
-            }
-            if (!$activityItem->isSimilarTo($previousItem)) {
+            if (!$previousItem || !$activityItem->isSimilarTo($previousItem)) {

                 $newActivity[] = $activityItem;
             }
                 $newActivity[] = $activityItem;
             }

+

             $previousItem = $activityItem;
         }
             $previousItem = $activityItem;
         }

+

         return $newActivity;
     }
 
     /**
      * Flashes a notification message to the session if an appropriate message is available.
         return $newActivity;
     }
 
     /**
      * Flashes a notification message to the session if an appropriate message is available.

-     * @param $activityKey

      */
      */

-    protected function setNotification($activityKey)
+    protected function setNotification(string $activityKey)

     {
         $notificationTextKey = 'activities.' . $activityKey . '_notification';
         if (trans()->has($notificationTextKey)) {
             $message = trans($notificationTextKey);
     {
         $notificationTextKey = 'activities.' . $activityKey . '_notification';
         if (trans()->has($notificationTextKey)) {
             $message = trans($notificationTextKey);

-            Session::flash('success', $message);
+            session()->flash('success', $message);
+        }
+    }
+
+    /**
+     * Log out a failed login attempt, Providing the given username
+     * as part of the message if the '%u' string is used.
+     */
+    public function logFailedLogin(string $username)
+    {
+        $message = config('logging.failed_login.message');
+        if (!$message) {
+            return;

         }
         }

+
+        $message = str_replace("%u", $username, $message);
+        $channel = config('logging.failed_login.channel');
+        Log::channel($channel)->warning($message);

     }
 }
     }
 }