Skip to content

Issues-373: added custom upload permissions #375

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 1 commit into from
Feb 7, 2021
Merged

Issues-373: added custom upload permissions #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions config/vanilla/bootstrap.late.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,16 @@
$CategoryModel->recalculateTree();
unset($CategoryModel);
}


// Define some permissions for the Vanilla categories.
// FIX: https://github.com/topcoder-platform/forums/issues/373
$PermissionModel->define(
[
'Vanilla.Discussions.Uploads' => 0,
'Vanilla.Comments.Uploads' => 0],
'tinyint',
'Category',
'PermissionCategoryID'
);
}
69 changes: 61 additions & 8 deletions vanilla/applications/dashboard/controllers/api/MediaApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,6 @@ public function patch_attachment(int $id, array $body): array {
* @return array
*/
public function post(array $body) {
if(!Gdn::session()->checkPermission('Garden.Uploads.Add')) {
throw new ClientException('You don\'t have permission to upload files', 403);
}

//$this->permission('Garden.Uploads.Add');

$allowedExtensions = $this->config->get('Garden.Upload.AllowedFileExtensions', []);
$uploadSchema = new UploadedFileSchema([
UploadedFileSchema::OPTION_ALLOWED_EXTENSIONS => $allowedExtensions,
Expand All @@ -380,10 +374,69 @@ public function post(array $body) {

$in = $this->schema([
'file' => $uploadSchema,
'categoryID:i?' => "CategoryID",
'discussionID:i?' => "DiscussionID",
'commentID:i?' => "CommentID",
'actionType:s?' => "ActionType"
], 'in')->setDescription('Add a media item.');
$out = $this->schema($this->fullSchema(), 'out');

$body = $in->validate($body);
$categoryID = $body['categoryID'];
$discussionID = $body['discussionID'];
$commentID = $body['commentID'];
$actionType = $body['actionType'];

if(!$categoryID && !$discussionID && !Gdn::session()->checkPermission('Garden.Uploads.Add')) {
throw new ClientException("You don't have permission to upload files", 403);
}

if(!Gdn::session()->checkPermission('Garden.Uploads.Add')) {
switch ($actionType) {
case 'NewDiscussion':
if(!$categoryID) {
throw new ClientException("You don't have permission to upload files", 403);
}
$permissionCategory = CategoryModel::permissionCategory($categoryID);
$discussionsUploads = CategoryModel::checkPermission($permissionCategory, 'Vanilla.Discussions.Uploads');
if(!$discussionsUploads) {
throw new ClientException("You don't have permission to upload files", 403);
}
break;
case 'EditDiscussion':
$discussionModel = new DiscussionModel();
$discussion = $discussionModel->getID($discussionID);
if (!$discussion) {
throw new NotFoundException('Discussion');
}
$categoryID = val('CategoryID', $discussion, false);
$permissionCategory = CategoryModel::permissionCategory($categoryID);
$discussionsUploads = CategoryModel::checkPermission($permissionCategory, 'Vanilla.Discussions.Uploads');
if(!$discussionsUploads) {
throw new ClientException("You don't have permission to upload files", 403);
}
break;
case 'NewComment':
case 'EditComment':
$discussionModel = new DiscussionModel();
$discussion = $discussionModel->getID($discussionID);
if (!$discussion) {
throw new NotFoundException('Discussion');
}

$categoryID = val('CategoryID', $discussion, false);
$permissionCategory = CategoryModel::permissionCategory($categoryID);
$commentsUploads = CategoryModel::checkPermission($permissionCategory, 'Vanilla.Comments.Uploads');
// No permissions
if(!$commentsUploads) {
throw new ClientException("You don't have permission to upload files", 403);
}
break;
default:
throw new ClientException("You don't have permission to upload files", 403);
}

}

$out = $this->schema($this->fullSchema(), 'out');

$imageExtensions = array_keys(ImageResizer::getExtType());
/** @var UploadedFile $file */
Expand Down
2 changes: 2 additions & 0 deletions vanilla/applications/vanilla/controllers/class.discussioncontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ public function index($DiscussionID = '', $DiscussionStub = '', $Page = '') {
$this->DiscussionID = $this->Discussion->DiscussionID;
$this->Form->addHidden('DiscussionID', $this->DiscussionID);
$this->Form->addHidden('CommentID', '');
$this->setData('ActionType', 'NewComment');
$this->Form->addHidden('ActionType', 'NewComment');

// Look in the session stash for a comment
$StashComment = $Session->getPublicStash('CommentForDiscussionID_'.$this->Discussion->DiscussionID);
Expand Down
11 changes: 8 additions & 3 deletions vanilla/applications/vanilla/controllers/class.postcontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function discussion($categoryUrlCode = '') {
$this->Form->setFormValue('DiscussionID', $this->Discussion->DiscussionID);

$this->title(t('Edit Discussion'));

$this->setData('ActionType', 'EditDiscussion');
if ($this->Discussion->Type) {
$this->setData('Type', $this->Discussion->Type);
} else {
Expand All @@ -197,8 +197,10 @@ public function discussion($categoryUrlCode = '') {
$this->permission('Vanilla.Discussions.Add');
}
$this->title(t('New Discussion'));
$this->setData('ActionType', 'NewDiscussion');
}

$this->Form->addHidden('ActionType', $this->data('ActionType'));
touchValue('Type', $this->Data, 'Discussion');

// Remove Announce parameter if it was injected into the form.
Expand Down Expand Up @@ -443,7 +445,7 @@ public function editDiscussion($discussionID = '', $draftID = '') {
$record = $this->Draft = $this->DraftModel->getID($draftID);
$this->CategoryID = $this->Draft->CategoryID;
$this->setData('ShowPreviewButton', $record->Format != 'Rich');

$this->setData('ActionType', 'NewDiscussion');
// FIX: https://github.com/topcoder-platform/forums/issues/347
$this->setData('_CancelUrl', '/drafts');
// Verify this is their draft
Expand All @@ -452,6 +454,7 @@ public function editDiscussion($discussionID = '', $draftID = '') {
}
} else {
$record = $this->DiscussionModel->getID($discussionID);
$this->setData('ActionType', 'EditDiscussion');
$this->setData('ShowPreviewButton', $this->Discussion->Format != 'Rich');
// FIX: Issues-308: Editor - supporting old and new formats
$this->EventArguments['Discussion'] = &$record;
Expand Down Expand Up @@ -693,7 +696,7 @@ public function comment($DiscussionID = '') {
$this->Form->addHidden('DiscussionID', $DiscussionID);
$this->Form->addHidden('CommentID', $CommentID);
$this->Form->addHidden('DraftID', $DraftID, true);

$this->Form->addHidden('ActionType', $this->data('ActionType'));
// Check permissions
if ($Discussion && $Editing) {
// Make sure that content can (still) be edited.
Expand Down Expand Up @@ -987,9 +990,11 @@ public function comment2($commentID, $inserted = false) {
*/
public function editComment($commentID = '', $draftID = '') {
if (is_numeric($commentID) && $commentID > 0) {
$this->setData('ActionType', 'EditComment');
$this->Form->setModel($this->CommentModel);
$this->Comment = $this->CommentModel->getID($commentID);
} else {
$this->setData('ActionType', 'NewComment');
$this->Form->setModel($this->DraftModel);
$this->Comment = $this->DraftModel->getID($draftID);
}
Expand Down
2 changes: 2 additions & 0 deletions vanilla/applications/vanilla/models/class.categorymodel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ private function calculateUser(array &$category, $addUserCategory = null) {
$category['PermsDiscussionsAdd'] = self::checkPermission($category, 'Vanilla.Discussions.Add');
$category['PermsDiscussionsEdit'] = self::checkPermission($category, 'Vanilla.Discussions.Edit');
$category['PermsCommentsAdd'] = self::checkPermission($category, 'Vanilla.Comments.Add');
$category['PermsDiscussionsUploads'] = self::checkPermission($category, 'Vanilla.Discussions.Uploads');
$category['PermsCommentsUploads'] = self::checkPermission($category, 'Vanilla.Comments.Uploads');

$code = $category['UrlCode'];
$category['Name'] = Gdn::translate("Categories.".$code.".Name", $category['Name']);
Expand Down
Loading