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.

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

Fix access permissions for sub-pages and "Quick Add" dashlet #245

Merged
merged 1 commit into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions includes/admin-metaboxes/civicrm.metabox.contact.add.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ public function __construct() {
*/
public function register_hooks() {

// Bail if the current WordPress User cannot add Contacts.
if (!$this->civi->users->check_civicrm_permission('add_contacts')) {
return;
}

// Add our meta boxes.
add_action('wp_dashboard_setup', [$this, 'meta_box_add']);

Expand Down
29 changes: 26 additions & 3 deletions includes/admin-pages/civicrm.page.integration.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,25 @@ public function register_hooks() {

}

/**
* Get the capability required to access the Settings Page.
*
* @since 5.35
*/
public function access_capability() {

/**
* Return default capability but allow overrides.
*
* @since 5.35
*
* @param str The default access capability.
* @return str The modified access capability.
*/
return apply_filters('civicrm/admin/integration/cap', 'manage_options');

}

/**
* Adds CiviCRM sub-menu items to WordPress admin menu.
*
Expand All @@ -100,12 +119,15 @@ public function add_menu_items() {
return;
}

// Get access capability.
$capability = $this->access_capability();

// Add Integration submenu item.
$integration_page = add_submenu_page(
'CiviCRM',
__('Integrating CiviCRM with WordPress', 'civicrm'),
__('Integration', 'civicrm'),
'access_civicrm',
$capability,
'civi_integration',
[$this, 'page_integration']
);
Expand Down Expand Up @@ -208,8 +230,9 @@ public function meta_boxes_integration_add($screen_id) {
return;
}

// Bail if user cannot access CiviCRM.
if (!current_user_can('access_civicrm')) {
// Bail if user cannot access the Integration Page.
$capability = $this->access_capability();
if (!current_user_can($capability)) {
return;
}

Expand Down
29 changes: 26 additions & 3 deletions includes/admin-pages/civicrm.page.options.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,41 @@ public function register_hooks() {

}

/**
* Get the capability required to access the Settings Page.
*
* @since 5.35
*/
public function access_capability() {

/**
* Return default capability but allow overrides.
*
* @since 5.35
*
* @param str The default access capability.
* @return str The modified access capability.
*/
return apply_filters('civicrm/admin/settings/cap', 'manage_options');

}

/**
* Adds CiviCRM sub-menu items to WordPress admin menu.
*
* @since 5.34
*/
public function add_menu_items() {

// Get access capability.
$capability = $this->access_capability();

// Add Settings submenu item.
$options_page = add_submenu_page(
'CiviCRM',
__('CiviCRM Settings for WordPress', 'civicrm'),
__('Settings', 'civicrm'),
'access_civicrm',
$capability,
$this->slug,
[$this, 'page_options']
);
Expand Down Expand Up @@ -260,8 +282,9 @@ public function meta_boxes_options_add($screen_id) {
return;
}

// Bail if user cannot access CiviCRM.
if (!current_user_can('access_civicrm')) {
// Bail if user cannot access the Settings Page.
$capability = $this->access_capability();
if (!current_user_can($capability)) {
return;
}

Expand Down
27 changes: 27 additions & 0 deletions includes/civicrm.users.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,33 @@ public function check_permission($args) {

}

/**
* Check a CiviCRM permission.
*
* @since 5.35
*
* @param str $permission The permission string.
* @return bool $permitted True if allowed, false otherwise.
*/
public function check_civicrm_permission($permission) {

// Always deny if CiviCRM is not initialised.
if (!$this->civi->initialize()) {
return FALSE;
}

// Deny by default.
$permitted = FALSE;

// Check CiviCRM permissions.
if (CRM_Core_Permission::check($permission)) {
$permitted = TRUE;
}

return $permitted;

}

/**
* Get "permission denied" text.
*
Expand Down