Skip to content

based on scan of authorize statements #3100

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
raycarrick-ed merged 4 commits into from
Jan 31, 2022
Merged

based on scan of authorize statements #3100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75c2661
based on scan of authorize statements
raycarrick-ed Jan 28, 2022
c068c30
Fix spacing
raycarrick-ed Jan 28, 2022
5962f2d
rubocop
raycarrick-ed Jan 28, 2022
d42ab02
Unknown local variable
raycarrick-ed Jan 31, 2022
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: 1 addition & 1 deletion app/controllers/contributors_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def edit
# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
# POST /plans/:plan_id/contributors
def create
authorize @plan
authorize @plan, :edit?

args = translate_roles(hash: contributor_params)
args = process_org(hash: args)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/org_admin/phase_versions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class PhaseVersionsController < ApplicationController
# POST /org_admin/templates/:template_id/phases/:phase_id/versions
def create
@phase = Phase.find(params[:phase_id])
authorize @phase, :create?
authorize @phase
@new_phase = get_modifiable(@phase)
flash[:notice] = if @new_phase == @phase
'This template is already a draft'
Expand Down
6 changes: 2 additions & 4 deletions app/controllers/paginable/plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class PlansController < ApplicationController

# /paginable/plans/privately_visible/:page
def privately_visible
raise Pundit::NotAuthorizedError unless Paginable::PlanPolicy.new(current_user).privately_visible?
authorize Plan

paginable_renderise(
partial: 'privately_visible',
Expand All @@ -19,9 +19,7 @@ def privately_visible

# GET /paginable/plans/organisationally_or_publicly_visible/:page
def organisationally_or_publicly_visible
unless Paginable::PlanPolicy.new(current_user).organisationally_or_publicly_visible?
raise Pundit::NotAuthorizedError
end
authorize Plan

paginable_renderise(
partial: 'organisationally_or_publicly_visible',
Expand Down
5 changes: 5 additions & 0 deletions app/policies/department_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
class DepartmentPolicy < ApplicationPolicy
# NOTE: @user is the signed_in_user and @record is an instance of Department

def index?
(@user.can_org_admin? && @user.org.id == @department.org_id) ||
@user.can_super_admin?
end

def new?
@user.can_org_admin? || @user.can_super_admin?
end
Expand Down
18 changes: 11 additions & 7 deletions app/policies/phase_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,34 @@ class PhasePolicy < ApplicationPolicy
# - The template which they are modifying belongs to their org

def show?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def preview?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def edit?
user.can_modify_templates? && (@record.template.org_id == user.org_id)
end

def update?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def new?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def create?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def destroy?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end

def sort?
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
@user.can_modify_templates? && (@record.template.org_id == @user.org_id)
end
end
12 changes: 12 additions & 0 deletions app/policies/plan_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
class PlanPolicy < ApplicationPolicy
# NOTE: @user is the signed_in_user and @record is an instance of Plan

def index?
@user.present?
end

def show?
@record.readable_by?(@user.id)
end
Expand Down Expand Up @@ -70,4 +74,12 @@ def select_guidances_list?
def update_guidances_list?
@record.editable_by?(@user.id)
end

def privately_visible?
@user.present?
end

def organisationally_or_publicly_visible?
@user.present?
end
end