Skip to content
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

Jump to bottom

Improve default permissions of Drafts page #2246

Merged
merged 1 commit into from
Apr 16, 2015
Merged

Improve default permissions of Drafts page #2246

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions web/concrete/src/Package/StartingPointPackage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Concrete\Core\Mail\Importer\MailImporter;
use Concrete\Core\Permission\Access\Entity\ConversationMessageAuthorEntity;
use Concrete\Core\Permission\Access\Entity\GroupEntity as GroupPermissionAccessEntity;
use Concrete\Core\Permission\Access\Entity\PageOwnerEntity as PageOwnerPermissionAccessEntity;
use Concrete\Core\Updater\Migrations\Configuration;
use Concrete\Core\User\Point\Action\Action as UserPointAction;
use Config;
Expand Down Expand Up @@ -466,6 +467,42 @@ public function set_site_permissions()
$dashboard = Page::getByPath('/dashboard', "RECENT");
$dashboard->assignPermissions($g3, array('view_page'));

// drafts
$drafts = Page::getByPath('/!drafts', "RECENT");
$drafts->assignPermissions($g1, array('view_page'));
$drafts->assignPermissions(
$g3,
array(
'view_page_versions',
'view_page_in_sitemap',
'preview_page_as_user',
'edit_page_properties',
'edit_page_contents',
'edit_page_speed_settings',
'edit_page_theme',
'edit_page_template',
'edit_page_permissions',
'delete_page',
'delete_page_versions',
'approve_page_versions',
'add_subpage',
'move_or_copy_page',
'schedule_page_contents_guest_access'
)
);
$drafts->assignPermissions(
PageOwnerPermissionAccessEntity::getOrCreate(),
array(
'view_page_versions',
'edit_page_properties',
'edit_page_contents',
'edit_page_template',
'delete_page',
'delete_page_versions',
'approve_page_versions'
)
);

$config = \Core::make('config/database');
$config->save('concrete.security.token.jobs', Loader::helper('validation/identifier')->getString(64));
$config->save('concrete.security.token.encryption', Loader::helper('validation/identifier')->getString(64));
Expand Down
3 changes: 3 additions & 0 deletions web/concrete/src/Page/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use Concrete\Core\Permission\Key\PageKey as PagePermissionKey;
use PermissionAccess;
use Concrete\Core\Package\PackageList;
use Concrete\Core\Permission\Access\Entity\Entity as PermissionAccessEntity;
use Concrete\Core\Permission\Access\Entity\GroupEntity as GroupPermissionAccessEntity;
use Concrete\Core\Permission\Access\Entity\GroupCombinationEntity as GroupCombinationPermissionAccessEntity;
use Concrete\Core\Permission\Access\Entity\UserEntity as UserPermissionAccessEntity;
Expand Down Expand Up @@ -510,6 +511,8 @@ public function assignPermissions($userOrGroup, $permissions = array(), $accessT
// group combination
} elseif ($userOrGroup instanceof User || $userOrGroup instanceof UserInfo) {
$pe = UserPermissionAccessEntity::getOrCreate($userOrGroup);
} elseif ($userOrGroup instanceof PermissionAccessEntity) {
$pe = $userOrGroup;
} else {
// group;
$pe = GroupPermissionAccessEntity::getOrCreate($userOrGroup);
Expand Down