Skip to content

Fixed issues-178 with permissions #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2020
Merged

Fixed issues-178 with permissions #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbe4b71
Fixed issues-178 with permissions
atelomycterus Nov 15, 2020
d8b0b06
Issues-144
atelomycterus Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions addon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"settingsPermission": "Garden.Settings.Manage",
"registerPermissions": [
"Groups.Group.Add",
"Groups.Group.Edit",
"Groups.Group.Delete",
"Groups.Moderation.Manage",
"Groups.EmailInvitations.Add",
"Groups.Category.Manage"
Expand Down
180 changes: 81 additions & 99 deletions class.groups.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class GroupsPlugin extends Gdn_Plugin {
const GROUPS_ROUTE = '/groups';
const GROUP_ROUTE = '/group/';
const GROUPS_GROUP_ADD_PERMISSION = 'Groups.Group.Add';
const GROUPS_GROUP_EDIT_PERMISSION = 'Groups.Group.Edit';
const GROUPS_GROUP_DELETE_PERMISSION = 'Groups.Group.Delete';
const GROUPS_CATEGORY_MANAGE_PERMISSION = 'Groups.Category.Manage';
const GROUPS_MODERATION_MANAGE_PERMISSION = 'Groups.Moderation.Manage';
const GROUPS_EMAIL_INVITATIONS_PERMISSION = 'Groups.EmailInvitations.Add';
Expand Down Expand Up @@ -155,25 +157,62 @@ public function onDisable() {
// nothing
}

/**
* Add challenge/Group name in discussion item
* @param $sender
* @param $args
*/
public function discussionsController_beforeDiscussionMetaData_handler($sender, $args){
if($args['Discussion']) {
$discussion = $args['Discussion'];
if ($discussion->GroupID) {
$result = '/group/' . $discussion->GroupID;
$url = url($result, true);
$groupModel = new GroupModel();
$group = $groupModel->getByGroupID($discussion->GroupID);
echo '<div class="Meta Meta-Discussion Group-Info">'.
'<span class="MItem ">'.
'<span class="label">Challenge: </span>'.
'<span class="value">'.anchor($group->Name, $url).'</span>'.
'</span>'.
'</div>';
}
}
}

public function base_render_before($sender) {
$sender->addJsFile('vendors/prettify/prettify.js', 'plugins/Groups');
$sender->addJsFile('dashboard.js', 'plugins/Groups');

if(inSection('CategoryList')) {
$categoryTree = $sender->data('CategoryTree');
$selectedCategory = $sender->data('Category');
if($categoryTree) {
$displayedCategoryTree = $this->groupModel->checkGroupCategoryPermissions($categoryTree);
$sender->setData('CategoryTree', $displayedCategoryTree);
}
$categoryModel = new CategoryModel();

self::log('a list of IDs of categories visible to the current user', ['visibleCategories' => $categoryModel->getVisibleCategories([])]);

if($selectedCategory) {
$displayedCategory = $this->groupModel->checkGroupCategoryPermissions($selectedCategory);
$sender->setData('Category', $displayedCategory);
}
}
}

public function base_groupOptionsDropdown_handler($sender, $args){
$group = $args['Group'];
$currentTopcoderProjectRoles = $sender->Data['ChallengeCurrentUserProjectRoles'];
$groupModel = new GroupModel();
$groupModel->setCurrentUserTopcoderProjectRoles($currentTopcoderProjectRoles);
$groupID = $group->GroupID;
$canEdit = $groupModel->canEdit($group) ;
$canDelete = $groupModel->canDelete($group) ;
$canLeave = $groupModel->canLeave($group);
$canInviteMember = $groupModel->canInviteNewMember($group);
$canManageMembers = $groupModel->canManageMembers($group);
$canManageCategories = $groupModel->canManageCategories($group);
$canFollow = $groupModel->canFollowGroup($group);
$canWatch = $groupModel->canWatchGroup($group);
$hasFollowed = $groupModel->hasFollowedGroup($group);
$hasWatched = $groupModel->hasWatchedGroup($group);

// self::log('base_groupOptionsDropdown_handler', ['Group' => $group->GroupID,
// 'currentUserTopcoderProjectRoles' =>$currentTopcoderProjectRoles,
// 'canDelete' => $canDelete, 'canEdit' => $canEdit, 'canLeave' => $canLeave,
// 'canInviteMember' =>$canInviteMember, 'canManageMembers' => $canManageMembers, 'canManageCategories ' =>
// $canManageCategories, 'canFollow' => $canFollow ]);
}

/**
* Load CSS into head for the plugin
Expand All @@ -198,82 +237,12 @@ public function settingsController_groups_create($sender) {
$cf->renderAll();
}

private function discussionModelWhere($requestPath, $args){
GroupsPlugin::log('discussionModelWhere:enter', ['Wheres'=> $args['Wheres']]);
$wheres = [];
if(array_key_exists('Wheres', $args)) {
$wheres = &$args['Wheres'];
}
if(strpos($requestPath, 'discussions/mine') === 0) {
// show all my discussions
} else if (strpos($requestPath, 'discussions/bookmarked') === 0) {
// show all bookmarked by default
} else if (strpos($requestPath, 'discussions') === 0) {
$wheres['d.GroupID'] = ['is null'];
} else if (strpos($requestPath, 'categories') === 0) {
//checkPermissions
$groupModel = new GroupModel();
$userGroups = $groupModel->memberOf(Gdn::session()->UserID);
$publicGroupIDs = $groupModel->getAllPublicGroupIDs();
$userGroupsIDs = array();
foreach ($userGroups as $userGroup) {
array_push($userGroupsIDs, $userGroup->GroupID);
}
$showGroupsIDs = array_merge($userGroupsIDs, $publicGroupIDs);
self::log('discussionModelWhere', ['userGroups' => $userGroups, 'publicGroupsIDs'=> $publicGroupIDs, 'showGroupIDs' => $showGroupsIDs]);
$wheres['d.GroupID'] = $showGroupsIDs;
$wheres['Groups'] = 'all';
}

GroupsPlugin::log('discussionModelWhere:exit', ['Updated Wheres'=> $wheres]);

}

public function discussionModel_beforeGet_handler($sender, $args) {
GroupsPlugin::log('discussionModel_beforeGet_handler', []);
$this->discussionModelWhere(Gdn::request()->path(), $args);
}

public function discussionModel_beforeGetCount_handler($sender, $args){
GroupsPlugin::log('discussionModel_beforeGetCount_handler');
$this->discussionModelWhere(Gdn::request()->path(), $args);
}

public function discussionModel_beforeGetAnnouncements_handler($sender, $args){
GroupsPlugin::log('discussionModel_beforeGetAnnouncements_handler');
//FIX: it throws exceptions
// $this->discussionModelWhere(Gdn::request()->path(), $args);
}

/**
* Show categories based on group membership
* @param $sender
* @param $args
*/
public function base_beforeCategoryDropDown_handler($sender, $args) {
self::log('base_beforeCategoryDropDown_hander', ['args' => $args]);
$options = &$args['Options'];
$categoryData = val('CategoryData', $options);

// Grab the category data.
if (!$categoryData) {
$categoryData = CategoryModel::getByPermission(
'Discussions.Add',
null,
val('Filter', $options, ['Archived' => 0]),
val('PermFilter', $options, [])
);

$displayedCategories = $this->groupModel->checkGroupCategoryPermissions($categoryData);
$options['CategoryData'] = $displayedCategories;
return;
}
}

public function discussionController_render_before($sender, $args) {
$Discussion = $sender->data('Discussion');
if($Discussion && $Discussion->GroupID != null) {
$groupModel = new GroupModel();
$currentTopcoderProjectRoles = $sender->Data['ChallengeCurrentUserProjectRoles'];
$groupModel->setCurrentUserTopcoderProjectRoles($currentTopcoderProjectRoles);
$Group = $groupModel->getByGroupID($Discussion->GroupID);
if (!$groupModel->canView($Group)) {
throw permissionException();
Expand All @@ -300,11 +269,13 @@ public function base_BeforeCommentForm_handler($sender, $args) {
*/
public function base_discussionOptionsDropdown_handler($sender, $args){
$Discussion = $args['Discussion'];
$currentTopcoderProjectRoles = $sender->Data['ChallengeCurrentUserProjectRoles'];
if($Discussion) {
$groupModel = new GroupModel();
$groupModel->setCurrentUserTopcoderProjectRoles($currentTopcoderProjectRoles);
$canView = $groupModel->canView($Discussion);
$canEdit = $groupModel->canEditDiscussion($Discussion);
$canDelete = $groupModel->canDeleteDiscussion($Discussion);

$canDismiss = $groupModel->canDismissDiscussion($Discussion);
$canAnnounce = $groupModel->canAnnounceDiscussion($Discussion);
$canSink = $groupModel->canSinkDiscussion($Discussion);
Expand Down Expand Up @@ -346,8 +317,9 @@ public function base_discussionOptionsDropdown_handler($sender, $args){
}

self::log('discussionController_discussionOptionsDropdown_handler', ['Discussion' => $Discussion->DiscussionID,
'canDelete' => $canDelete, 'canEdit' => $canEdit, 'canDiscmiss' => $canDismiss,
'canAnnounce' =>$canAnnounce, 'canSink' => $canSink, 'canMove' => $canMove, 'canFetch' => $canRefetch ]);
'currentUserTopcoderProjectRoles' =>$currentTopcoderProjectRoles, 'canView' => $canView,
'canDelete' => $canDelete, 'canEdit' => $canEdit, 'canDismiss' => $canDismiss,
'canAnnounce' =>$canAnnounce, 'canSink' => $canSink, 'canMove' => $canMove, 'canReFetch' => $canRefetch ]);
}
}

Expand Down Expand Up @@ -571,9 +543,9 @@ public function base_userAnchor_handler($sender, $args){
if($sender instanceof DiscussionController || $sender instanceof GroupController) {
$user = $args['User'];
$anchorText = &$args['Text'];
$resources = $sender->data('Resources');
$roleResources = $sender->data('RoleResources');
$anchorText = $anchorText . $this->getTopcoderRoles($user, $resources, $roleResources);
$resources = $sender->data('ChallengeResources');
$roleResources = $sender->data('ChallengeRoleResources');
$anchorText = $anchorText . $this->topcoderProjectRolesText($user, $resources, $roleResources);
}
}

Expand All @@ -586,16 +558,29 @@ public function base_userPhoto_handler($sender, $args){
if($sender instanceof DiscussionController || $sender instanceof GroupController) {
$user = $args['User'];
$anchorText = &$args['Title'];
$resources = $sender->data('Resources');
$roleResources = $sender->data('RoleResources');
$anchorText = $anchorText . $this->getTopcoderRoles($user, $resources, $roleResources);
$resources = $sender->data('ChallengeResources');
$roleResources = $sender->data('ChallengeRoleResources');
$anchorText = $anchorText . $this->topcoderProjectRolesText($user, $resources, $roleResources);
}
}

private function getTopcoderRoles($user, $resources = null, $roleResources = null) {
private function topcoderProjectRolesText($user, $resources = null, $roleResources = null) {
$roles = $this->getTopcoderProjectRoles($user, $resources, $roleResources);
return count($roles) > 0 ? '(' . implode(', ', $roles) . ')' : '';

}

/**
* Get a list of Topcoder Project Roles for an user
* @param $user object User
* @param array $resources
* @param array $roleResources
* @return array
*/
private function getTopcoderProjectRoles($user, $resources = null, $roleResources = null) {
$topcoderUsername = val('Name', $user, t('Unknown'));
$roles = [];
if (isset($resources) && isset($roleResources)) {
$roles = [];
$allResourcesByMember = array_filter($resources, function ($k) use ($topcoderUsername) {
return $k->memberHandle == $topcoderUsername;
});
Expand All @@ -605,11 +590,8 @@ private function getTopcoderRoles($user, $resources = null, $roleResources = nul
});
array_push($roles, reset($roleResource)->name);
}
return count($roles) > 0 ? '(' . implode(', ', $roles) . ')' : '';

}

return '';
return $roles;
}

/**
Expand Down
5 changes: 2 additions & 3 deletions controllers/api/GroupsApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ public function post_members($id, array $body) {
* @throws NotFoundException if the group or user could not be found.
*/
public function delete_members($id, $userid) {
$this->permission();

$this->idUserIdParamSchema()->setDescription('Remove a member from a group.');
$this->schema([], 'out');
Expand All @@ -218,9 +217,9 @@ public function delete_members($id, $userid) {
throw new NotFoundException('User');
}

if(!$this->groupModel->canRemoveMember($group)) {
if(!$this->groupModel->canRemoveMember($group)) {
throw new ClientException('Don\'t have permissions to remove this member from the group.');
}
}

$this->groupModel->removeMember($group->GroupID, $user->UserID);
}
Expand Down
11 changes: 6 additions & 5 deletions controllers/class.groupcontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ public function follow($GroupID) {
}
$this->setData('Group', $Group);
if ($this->Form->authenticatedPostBack(true)) {
$this->GroupModel->followGroup($Group);
$this->GroupModel->followGroup($Group, Gdn::session()->UserID);
$this->setRedirectTo('group/' . $GroupID);
}
$this->render();
Expand All @@ -412,7 +412,7 @@ public function unfollow($GroupID) {
}
$this->setData('Group', $Group);
if ($this->Form->authenticatedPostBack(true)) {
$this->GroupModel->unfollowGroup($Group);
$this->GroupModel->unfollowGroup($Group, Gdn::session()->UserID);
$this->setRedirectTo('group/'.$GroupID);
}
$this->render();
Expand All @@ -430,7 +430,7 @@ public function watch($GroupID) {
}
$this->setData('Group', $Group);
if ($this->Form->authenticatedPostBack(true)) {
$this->GroupModel->watchGroup($Group);
$this->GroupModel->watchGroup($Group, Gdn::session()->UserID);
$this->setRedirectTo('group/' . $GroupID);
}
$this->render();
Expand All @@ -449,7 +449,7 @@ public function unwatch($GroupID) {
}
$this->setData('Group', $Group);
if ($this->Form->authenticatedPostBack(true)) {
$this->GroupModel->unwatchGroup($Group);
$this->GroupModel->unwatchGroup($Group, Gdn::session()->UserID);
$this->setRedirectTo('group/'.$GroupID);
}
$this->render();
Expand Down Expand Up @@ -742,7 +742,7 @@ public function setDiscussionData($Group,$Announce = '0') {
public function category($GroupID) {
$Group = $this->findGroup($GroupID);

if(!$this->GroupModel->canManageCategories()) {
if(!$this->GroupModel->canManageCategories($Group)) {
throw permissionException();
}

Expand All @@ -754,6 +754,7 @@ public function category($GroupID) {
$this->Form->addHidden('DisplayAs', 'Discussions');
$this->Form->addHidden('AllowFileUploads',1);
$this->Form->addHidden('UrlCode','');
$this->Form->addHidden('GroupID',$GroupID);
if ($this->Form->authenticatedPostBack(true)) {
$this->Form->setFormValue('UrlCode', $Group->ChallengeID.'-'.$slugify->slugify($this->Form->getValue('Name'), '-'));
$newCategoryID = $this->Form->save();
Expand Down
Loading