60245bbe22
1. Don't use case statements for dispatch anymore. This leads to a lot
of duplication, and makes the logic harder to follow.
2. Remove duplicated logic.
- For example, the `can_push_to_branch?` exists, but we also have a
different way of checking the same condition within `change_access_check`.
- This kind of duplication is removed, and the `can_push_to_branch?`
method is used in both places.
3. Move checks returning true/false to `UserAccess`.
- All public methods in `GitAccess` now return an instance of
`GitAccessStatus`. Previously, some methods would return
true/false as well, which was confusing.
- It makes sense for these kinds of checks to be at the level of a
user, so the `UserAccess` class was repurposed for this. The prior
`UserAccess.allowed?` classmethod is converted into an instance
method.
- All external uses of these checks have been migrated to use the
`UserAccess` class
4. Move the "change_access_check" into a separate class.
- Create the `GitAccess::ChangeAccessCheck` class to run these
checks, which are quite substantial.
- `ChangeAccessCheck` returns an instance of `GitAccessStatus` as
well.
5. Break out the boolean logic in `ChangeAccessCheck` into `if/else`
chains - this seems more readable.
6. I can understand that this might look like overkill for !4892, but I
think this is a good opportunity to clean it up.
- http://martinfowler.com/bliki/OpportunisticRefactoring.html
72 lines
2.2 KiB
Ruby
72 lines
2.2 KiB
Ruby
module Files
|
|
class BaseService < ::BaseService
|
|
class ValidationError < StandardError; end
|
|
|
|
def execute
|
|
@source_project = params[:source_project] || @project
|
|
@source_branch = params[:source_branch]
|
|
@target_branch = params[:target_branch]
|
|
|
|
@commit_message = params[:commit_message]
|
|
@file_path = params[:file_path]
|
|
@file_content = if params[:file_content_encoding] == 'base64'
|
|
Base64.decode64(params[:file_content])
|
|
else
|
|
params[:file_content]
|
|
end
|
|
|
|
validate
|
|
|
|
# Create new branch if it different from source_branch
|
|
if different_branch?
|
|
create_target_branch
|
|
end
|
|
|
|
if commit
|
|
success
|
|
else
|
|
error('Something went wrong. Your changes were not committed')
|
|
end
|
|
rescue Repository::CommitError, Gitlab::Git::Repository::InvalidBlobName, GitHooksService::PreReceiveError, ValidationError => ex
|
|
error(ex.message)
|
|
end
|
|
|
|
private
|
|
|
|
def different_branch?
|
|
@source_branch != @target_branch || @source_project != @project
|
|
end
|
|
|
|
def raise_error(message)
|
|
raise ValidationError.new(message)
|
|
end
|
|
|
|
def validate
|
|
allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
|
|
|
|
unless allowed
|
|
raise_error("You are not allowed to push into this branch")
|
|
end
|
|
|
|
unless project.empty_repo?
|
|
unless @source_project.repository.branch_names.include?(@source_branch)
|
|
raise_error('You can only create or edit files when you are on a branch')
|
|
end
|
|
|
|
if different_branch?
|
|
if repository.branch_names.include?(@target_branch)
|
|
raise_error('Branch with such name already exists. You need to switch to this branch in order to make changes')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def create_target_branch
|
|
result = CreateBranchService.new(project, current_user).execute(@target_branch, @source_branch, source_project: @source_project)
|
|
|
|
unless result[:status] == :success
|
|
raise_error("Something went wrong when we tried to create #{@target_branch} for you: #{result[:message]}")
|
|
end
|
|
end
|
|
end
|
|
end
|