mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-04-21 07:31:53 +02:00
Code Issues Projects Releases Wiki Activity

Deny to view a public content from private container

Browse Source
This commit is contained in:
Yuriy Bakhtin 2023-03-24 15:15:34 +03:00
parent bb0d8a5f1f
commit d06760f422
4 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protected/humhub/modules/content/components/ContentContainerActiveRecord.php
View File

@ -158,6 +158,17 @@ abstract class ContentContainerActiveRecord extends ActiveRecord
return false;
}
/**
* Checks if the user is allowed to view a content in this container
*
* @param User|null $user
* @return bool
*/
public function canView(?User $user = null): bool
{
return false;
}
/**
* Returns the wall output for this content container.
* This is e.g. used in search results.

12
protected/humhub/modules/content/models/Content.php
View File

@ -859,13 +859,17 @@ class Content extends ActiveRecord implements Movable, ContentOwner
return $this->checkGuestAccess();
}
// Public visible content
if ($this->isPublic()) {
// Check system admin can see all content module configuration
if ($user->canViewAllContent()) {
return true;
}
// Check system admin can see all content module configuration
if ($user->canViewAllContent()) {
if ($this->getContainer() !== null && !$this->getContainer()->canView($user)) {
return false;
}
// Public visible content
if ($this->isPublic()) {
return true;
}

22
protected/humhub/modules/space/models/Space.php
View File

@ -515,6 +515,28 @@ class Space extends ContentContainerActiveRecord implements Searchable
return ($this->isMember($user));
}
/**
* @inheritdoc
*/
public function canView(?User $user = null): bool
{
if ($this->visibility === Space::VISIBILITY_ALL) {
return true;
}
$user = !$user && !Yii::$app->user->isGuest ? Yii::$app->user->getIdentity() : $user;
if (!$user) {
return false;
}
if ($this->visibility === Space::VISIBILITY_REGISTERED_ONLY) {
return true;
}
return $this->visibility === Space::VISIBILITY_NONE && $this->canAccessPrivateContent($user);
}
/**
* @inheritdoc
*/

22
protected/humhub/modules/user/models/User.php
View File

@ -743,6 +743,28 @@ class User extends ContentContainerActiveRecord implements IdentityInterface, Se
return false;
}
/**
* @inheritdoc
*/
public function canView(?User $user = null): bool
{
if ($this->visibility === User::VISIBILITY_ALL) {
return true;
}
$user = !$user && !Yii::$app->user->isGuest ? Yii::$app->user->getIdentity() : $user;
if (!$user) {
return false;
}
if ($this->visibility === User::VISIBILITY_REGISTERED_ONLY) {
return true;
}
return $this->visibility === User::VISIBILITY_HIDDEN && $this->canAccessPrivateContent($user);
}
/**
* Checks if the user is allowed to view all content
*