3bf34face4
Replace issue access checks with use of IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? ⚠️ - Potentially untested 💣 - No test coverage 🚥 - Test coverage of some sort exists (a test failed when error raised) 🚦 - Test coverage of return value (a test failed when nil used) ✅ - Permissions check tested ### Issue lookup with access check Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells). - [x] 🚦 app/finders/notes_finder.rb:15 [`visible_to_user`] - [x] 🚥 app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`] - [x] ✅ app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`] - [x] ✅ lib/api/issues.rb:112 [`visible_to_user`] - CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone - [x] ✅ lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too? - [x] ✅ lib/gitlab/search_results.rb:53 [`visible_to_user`] ### Previous discussions - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126 - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87 See merge request !2031
264 lines
10 KiB
Ruby
264 lines
10 KiB
Ruby
module API
|
|
# Issues API
|
|
class Issues < Grape::API
|
|
before { authenticate! }
|
|
|
|
helpers do
|
|
def filter_issues_state(issues, state)
|
|
case state
|
|
when 'opened' then issues.opened
|
|
when 'closed' then issues.closed
|
|
else issues
|
|
end
|
|
end
|
|
|
|
def filter_issues_labels(issues, labels)
|
|
issues.includes(:labels).where('labels.title' => labels.split(','))
|
|
end
|
|
|
|
def filter_issues_milestone(issues, milestone)
|
|
issues.includes(:milestone).where('milestones.title' => milestone)
|
|
end
|
|
|
|
def issue_params
|
|
new_params = declared(params, include_parent_namespace: false, include_missing: false).to_h
|
|
new_params = new_params.with_indifferent_access
|
|
new_params.delete(:id)
|
|
new_params.delete(:issue_id)
|
|
|
|
new_params
|
|
end
|
|
end
|
|
|
|
resource :issues do
|
|
# Get currently authenticated user's issues
|
|
#
|
|
# Parameters:
|
|
# state (optional) - Return "opened" or "closed" issues
|
|
# labels (optional) - Comma-separated list of label names
|
|
# order_by (optional) - Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`
|
|
# sort (optional) - Return requests sorted in `asc` or `desc` order. Default is `desc`
|
|
#
|
|
# Example Requests:
|
|
# GET /issues
|
|
# GET /issues?state=opened
|
|
# GET /issues?state=closed
|
|
# GET /issues?labels=foo
|
|
# GET /issues?labels=foo,bar
|
|
# GET /issues?labels=foo,bar&state=opened
|
|
get do
|
|
issues = current_user.issues.inc_notes_with_associations
|
|
issues = filter_issues_state(issues, params[:state]) unless params[:state].nil?
|
|
issues = filter_issues_labels(issues, params[:labels]) unless params[:labels].nil?
|
|
issues = issues.reorder(issuable_order_by => issuable_sort)
|
|
|
|
present paginate(issues), with: Entities::Issue, current_user: current_user
|
|
end
|
|
end
|
|
|
|
resource :groups do
|
|
# Get a list of group issues
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a group
|
|
# state (optional) - Return "opened" or "closed" issues
|
|
# labels (optional) - Comma-separated list of label names
|
|
# milestone (optional) - Milestone title
|
|
# order_by (optional) - Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`
|
|
# sort (optional) - Return requests sorted in `asc` or `desc` order. Default is `desc`
|
|
#
|
|
# Example Requests:
|
|
# GET /groups/:id/issues
|
|
# GET /groups/:id/issues?state=opened
|
|
# GET /groups/:id/issues?state=closed
|
|
# GET /groups/:id/issues?labels=foo
|
|
# GET /groups/:id/issues?labels=foo,bar
|
|
# GET /groups/:id/issues?labels=foo,bar&state=opened
|
|
# GET /groups/:id/issues?milestone=1.0.0
|
|
# GET /groups/:id/issues?milestone=1.0.0&state=closed
|
|
get ":id/issues" do
|
|
group = find_group!(params[:id])
|
|
|
|
params[:state] ||= 'opened'
|
|
params[:group_id] = group.id
|
|
params[:milestone_title] = params.delete(:milestone)
|
|
params[:label_name] = params.delete(:labels)
|
|
|
|
if params[:order_by] || params[:sort]
|
|
# The Sortable concern takes 'created_desc', not 'created_at_desc' (for example)
|
|
params[:sort] = "#{issuable_order_by.sub('_at', '')}_#{issuable_sort}"
|
|
end
|
|
|
|
issues = IssuesFinder.new(current_user, params).execute
|
|
|
|
present paginate(issues), with: Entities::Issue, current_user: current_user
|
|
end
|
|
end
|
|
|
|
params do
|
|
requires :id, type: String, desc: 'The ID of a project'
|
|
end
|
|
|
|
resource :projects do
|
|
# Get a list of project issues
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a project
|
|
# iid (optional) - Return the project issue having the given `iid`
|
|
# state (optional) - Return "opened" or "closed" issues
|
|
# labels (optional) - Comma-separated list of label names
|
|
# milestone (optional) - Milestone title
|
|
# order_by (optional) - Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`
|
|
# sort (optional) - Return requests sorted in `asc` or `desc` order. Default is `desc`
|
|
#
|
|
# Example Requests:
|
|
# GET /projects/:id/issues
|
|
# GET /projects/:id/issues?state=opened
|
|
# GET /projects/:id/issues?state=closed
|
|
# GET /projects/:id/issues?labels=foo
|
|
# GET /projects/:id/issues?labels=foo,bar
|
|
# GET /projects/:id/issues?labels=foo,bar&state=opened
|
|
# GET /projects/:id/issues?milestone=1.0.0
|
|
# GET /projects/:id/issues?milestone=1.0.0&state=closed
|
|
# GET /issues?iid=42
|
|
get ":id/issues" do
|
|
issues = IssuesFinder.new(current_user, project_id: user_project.id).execute.inc_notes_with_associations
|
|
issues = filter_issues_state(issues, params[:state]) unless params[:state].nil?
|
|
issues = filter_issues_labels(issues, params[:labels]) unless params[:labels].nil?
|
|
issues = filter_by_iid(issues, params[:iid]) unless params[:iid].nil?
|
|
|
|
unless params[:milestone].nil?
|
|
issues = filter_issues_milestone(issues, params[:milestone])
|
|
end
|
|
|
|
issues = issues.reorder(issuable_order_by => issuable_sort)
|
|
|
|
present paginate(issues), with: Entities::Issue, current_user: current_user, project: user_project
|
|
end
|
|
|
|
# Get a single project issue
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a project
|
|
# issue_id (required) - The ID of a project issue
|
|
# Example Request:
|
|
# GET /projects/:id/issues/:issue_id
|
|
get ":id/issues/:issue_id" do
|
|
@issue = find_project_issue(params[:issue_id])
|
|
present @issue, with: Entities::Issue, current_user: current_user, project: user_project
|
|
end
|
|
|
|
# Create a new project issue
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a project
|
|
# title (required) - The title of an issue
|
|
# description (optional) - The description of an issue
|
|
# assignee_id (optional) - The ID of a user to assign issue
|
|
# milestone_id (optional) - The ID of a milestone to assign issue
|
|
# labels (optional) - The labels of an issue
|
|
# created_at (optional) - Date time string, ISO 8601 formatted
|
|
# due_date (optional) - Date time string in the format YEAR-MONTH-DAY
|
|
# confidential (optional) - Boolean parameter if the issue should be confidential
|
|
# Example Request:
|
|
# POST /projects/:id/issues
|
|
post ':id/issues' do
|
|
required_attributes! [:title]
|
|
|
|
keys = [:title, :description, :assignee_id, :milestone_id, :due_date, :confidential, :labels]
|
|
keys << :created_at if current_user.admin? || user_project.owner == current_user
|
|
attrs = attributes_for_keys(keys)
|
|
|
|
# Convert and filter out invalid confidential flags
|
|
attrs['confidential'] = to_boolean(attrs['confidential'])
|
|
attrs.delete('confidential') if attrs['confidential'].nil?
|
|
|
|
issue = ::Issues::CreateService.new(user_project, current_user, attrs.merge(request: request, api: true)).execute
|
|
|
|
if issue.spam?
|
|
render_api_error!({ error: 'Spam detected' }, 400)
|
|
end
|
|
|
|
if issue.valid?
|
|
present issue, with: Entities::Issue, current_user: current_user, project: user_project
|
|
else
|
|
render_validation_error!(issue)
|
|
end
|
|
end
|
|
|
|
desc 'Update an existing issue' do
|
|
success Entities::Issue
|
|
end
|
|
params do
|
|
requires :id, type: String, desc: 'The ID of a project'
|
|
requires :issue_id, type: Integer, desc: "The ID of a project issue"
|
|
optional :title, type: String, desc: 'The new title of the issue'
|
|
optional :description, type: String, desc: 'The description of an issue'
|
|
optional :assignee_id, type: Integer, desc: 'The ID of a user to assign issue'
|
|
optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign issue'
|
|
optional :labels, type: String, desc: 'The labels of an issue'
|
|
optional :state_event, type: String, values: ['close', 'reopen'], desc: 'The state event of an issue'
|
|
# TODO 9.0, use the Grape DateTime type here
|
|
optional :updated_at, type: String, desc: 'Date time string, ISO 8601 formatted'
|
|
optional :due_date, type: String, desc: 'Date time string in the format YEAR-MONTH-DAY'
|
|
# TODO 9.0, use the Grape boolean type here
|
|
optional :confidential, type: String, desc: 'Boolean parameter if the issue should be confidential'
|
|
end
|
|
put ':id/issues/:issue_id' do
|
|
issue = user_project.issues.find(params[:issue_id])
|
|
authorize! :update_issue, issue
|
|
|
|
# Convert and filter out invalid confidential flags
|
|
params[:confidential] = to_boolean(params[:confidential])
|
|
params.delete(:confidential) if params[:confidential].nil?
|
|
|
|
params.delete(:updated_at) unless current_user.admin? || user_project.owner == current_user
|
|
|
|
issue = ::Issues::UpdateService.new(user_project, current_user, issue_params).execute(issue)
|
|
|
|
if issue.valid?
|
|
present issue, with: Entities::Issue, current_user: current_user, project: user_project
|
|
else
|
|
render_validation_error!(issue)
|
|
end
|
|
end
|
|
|
|
# Move an existing issue
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a project
|
|
# issue_id (required) - The ID of a project issue
|
|
# to_project_id (required) - The ID of the new project
|
|
# Example Request:
|
|
# POST /projects/:id/issues/:issue_id/move
|
|
post ':id/issues/:issue_id/move' do
|
|
required_attributes! [:to_project_id]
|
|
|
|
issue = user_project.issues.find(params[:issue_id])
|
|
new_project = Project.find(params[:to_project_id])
|
|
|
|
begin
|
|
issue = ::Issues::MoveService.new(user_project, current_user).execute(issue, new_project)
|
|
present issue, with: Entities::Issue, current_user: current_user, project: user_project
|
|
rescue ::Issues::MoveService::MoveError => error
|
|
render_api_error!(error.message, 400)
|
|
end
|
|
end
|
|
|
|
#
|
|
# Delete a project issue
|
|
#
|
|
# Parameters:
|
|
# id (required) - The ID of a project
|
|
# issue_id (required) - The ID of a project issue
|
|
# Example Request:
|
|
# DELETE /projects/:id/issues/:issue_id
|
|
delete ":id/issues/:issue_id" do
|
|
issue = user_project.issues.find_by(id: params[:issue_id])
|
|
|
|
authorize!(:destroy_issue, issue)
|
|
issue.destroy
|
|
end
|
|
end
|
|
end
|
|
end
|