mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-10 21:26:07 +10:00
Allow creating Personal Access Tokens through the website Related to #2979 - Allow a user to create personal access tokens, and use them to authenticate - Refactor `API::Helpers` into `API::Helpers::Core` and `API::Helpers::Authentication` # Tasks - [ ] #2979 (!3749) - Personal Access Tokens - [x] Basic Implementation - [x] Add UI to add "Personal Access Tokens" - [x] Reload `lib/api` on every request - [x] Respect these tokens for API requests - [x] Just a param or a header too? - [x] Allow revoking tokens - [x] Expire tokens - [x] Left bar should have a "PAT" icon - [x] Scopes? - [x] Copy to Clipboard - [x] Show active/inactive tokens separately - [x] No need to check for expired/revoked in the appropriate places - [x] Why does regular ApplicationController check for private token? - [x] Support non-API requests - [x] Revert (or work on) `lib/api` eager loading - [x] Create MR - [x] Refactoring - [x] Fix tests - [x] Write more tests - [x] Add screenshots to MR - [x] Add description of query performance to MR - [x] Limit the number of queries in the `personal_access_tokens` page - [x] Wait for CI to pass - [x] Fix merge issues in schema.rb - [x] Assign MR to endboss - [x] Wait for feedback - [x] Fix feedback - [x] Wait for CI to pass - [x] Assign to @rspeicher - [x] Fix @rspeicher's comments - [x] Wait for CI to pass - [x] Assign back to @rspeicher - [x] Write documentation and ping @axil - [x] Wait for Axil to respond - [x] Assign to endboss - [x] Address Douwe's feedback - [x] Use the `private_token` or `authentication_token` param instead of `personal_access_token` - [x] Ditto for the header - [x] Assign to endboss - [x] Make sure CI is green - [x] Address Douwe's feedback - [x] Don't go through the `authenticate_user_from_private_token!` method, if a private token is supplied (or combine them) - [x] In `authenticate_user_from_personal_access_token!` don't hit DB if `token_string` is `nil` - [x] Use `current_user.personal_access_tokens.build` in the controller - [x] Remove the "We aren't using `personal_access_token` as the root param" comment - [x] `No need for = "...", we can just have the Inactive ... #{...} on the next line` in the view - [x] Render dates in a (more) human format - [x] CSS issue with table - [x] Don't show the tokens in the UI indefinitely - [x] How to implement scopes? Add-on to current impl? Doorkeeper? - [x] Wait for @DouweM's comments about scopes - [x] Address @DouweM's second review - [x] Try not using `native['innerHTML']` - [x] use contexts for all "when ..." - [x] Ensure consistency (styling) with other pages for "You don't have any tokens" message - [x] "Actions" table column doesn't need a label - [x] %td can be moved outside of the if/else statement - [x] The header title should be "Profile Settings" - [x] Can this be a `before_create`, so we don't need to use `generate`? - [x] If it couldn't be revoked, will we show an error? - [x] If it couldn't be saved, will we show an error? - [x] Merge master - [x] Update CHANGELOG entry - [x] Add tests for form errors? - [x] Post screenshots - [x] Tag @jschatz1 for review - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/0dff6fd/builds) to pass - [x] Respond to @jschatz1's comments - [x] Hardcoded colors should be variables - [x] Should not be allowed to chose a date in the past - [x] Use the same table as in the Applications tab - [x] button should say "Create Personal Access Token" - [x] Float the revoke to the right on the `a` - [x] Change revocation message. "Are you sure you want to revoke this certificate? This action cannot be undone." - [x] Date stays selected and looks selected even though date is set as "never". - [x] ~~hover on the calendar button shifts~~ (not caused by this MR - happens on `milestones#new` as well) - [x] Don't use the panel for the created token - [x] Use a normal flash for "Your new personal access token has been created" - [x] Show the input (with the token) below it full width. - [x] Put the "Make sure you save it - you won't be able to access it again." message near the input - [x] Have the input highlight all on single click - [x] Update screenshots - [x] Merge master in + conflicts - [x] Assign to @jschatz1 again - [x] Respond to @jschatz1's comments - [x] No button for clipboard, only link - [x] text-danger - [x] highlight fade on that area where the token was created - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/d754d99179f1ffe846fcc1d8e858163b39efc5dc/builds) is green - [x] Assign to @jschatz1 - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/faa0e3f7580bc38d4d12916b4589c64d6c2678a7/builds) to pass - [x] Respond to @DouweM's feedback - [x] move the redirect_to out of the if/else - [x] certificate -> token - [x] datepicker back to text field - [x] combine the get_user_from_private_token and get_user_from_personal_access_token methods in ApplicationController - [x] combine the get_user_from_private_token and get_user_from_personal_access_token methods in `lib/api/helpers` - [x] don't need the new constants - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/9d7cda3ddce52baad9618466a5d00319b333be57/builds) to pass - [ ] Wait for merge # Screenshots     See merge request !3749
387 lines
11 KiB
Ruby
387 lines
11 KiB
Ruby
require 'gon'
|
|
require 'fogbugz'
|
|
|
|
class ApplicationController < ActionController::Base
|
|
include Gitlab::CurrentSettings
|
|
include Gitlab::GonHelper
|
|
include GitlabRoutingHelper
|
|
include PageLayoutHelper
|
|
include WorkhorseHelper
|
|
|
|
before_action :authenticate_user_from_private_token!
|
|
before_action :authenticate_user!
|
|
before_action :validate_user_service_ticket!
|
|
before_action :reject_blocked!
|
|
before_action :check_password_expiration
|
|
before_action :check_2fa_requirement
|
|
before_action :ldap_security_check
|
|
before_action :sentry_context
|
|
before_action :default_headers
|
|
before_action :add_gon_variables
|
|
before_action :configure_permitted_parameters, if: :devise_controller?
|
|
before_action :require_email, unless: :devise_controller?
|
|
|
|
protect_from_forgery with: :exception
|
|
|
|
helper_method :abilities, :can?, :current_application_settings
|
|
helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :gitorious_import_enabled?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled?
|
|
|
|
rescue_from Encoding::CompatibilityError do |exception|
|
|
log_exception(exception)
|
|
render "errors/encoding", layout: "errors", status: 500
|
|
end
|
|
|
|
rescue_from ActiveRecord::RecordNotFound do |exception|
|
|
log_exception(exception)
|
|
render_404
|
|
end
|
|
|
|
def redirect_back_or_default(default: root_path, options: {})
|
|
redirect_to request.referer.present? ? :back : default, options
|
|
end
|
|
|
|
protected
|
|
|
|
def sentry_context
|
|
if Rails.env.production? && current_application_settings.sentry_enabled
|
|
if current_user
|
|
Raven.user_context(
|
|
id: current_user.id,
|
|
email: current_user.email,
|
|
username: current_user.username,
|
|
)
|
|
end
|
|
|
|
Raven.tags_context(program: sentry_program_context)
|
|
end
|
|
end
|
|
|
|
def sentry_program_context
|
|
if Sidekiq.server?
|
|
'sidekiq'
|
|
else
|
|
'rails'
|
|
end
|
|
end
|
|
|
|
# This filter handles both private tokens and personal access tokens
|
|
def authenticate_user_from_private_token!
|
|
token_string = params[:private_token].presence || request.headers['PRIVATE-TOKEN'].presence
|
|
user = User.find_by_authentication_token(token_string) || User.find_by_personal_access_token(token_string)
|
|
|
|
if user
|
|
# Notice we are passing store false, so the user is not
|
|
# actually stored in the session and a token is needed
|
|
# for every request. If you want the token to work as a
|
|
# sign in token, you can simply remove store: false.
|
|
sign_in user, store: false
|
|
end
|
|
end
|
|
|
|
def authenticate_user!(*args)
|
|
if redirect_to_home_page_url?
|
|
redirect_to current_application_settings.home_page_url and return
|
|
end
|
|
|
|
super(*args)
|
|
end
|
|
|
|
def log_exception(exception)
|
|
application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
|
|
application_trace.map!{ |t| " #{t}\n" }
|
|
logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}"
|
|
end
|
|
|
|
def reject_blocked!
|
|
if current_user && current_user.blocked?
|
|
sign_out current_user
|
|
flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
|
|
redirect_to new_user_session_path
|
|
end
|
|
end
|
|
|
|
def after_sign_in_path_for(resource)
|
|
if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked?
|
|
sign_out resource
|
|
flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
|
|
new_user_session_path
|
|
else
|
|
stored_location_for(:redirect) || stored_location_for(resource) || root_path
|
|
end
|
|
end
|
|
|
|
def after_sign_out_path_for(resource)
|
|
current_application_settings.after_sign_out_path.presence || new_user_session_path
|
|
end
|
|
|
|
def abilities
|
|
Ability.abilities
|
|
end
|
|
|
|
def can?(object, action, subject)
|
|
abilities.allowed?(object, action, subject)
|
|
end
|
|
|
|
def access_denied!
|
|
render "errors/access_denied", layout: "errors", status: 404
|
|
end
|
|
|
|
def git_not_found!
|
|
render "errors/git_not_found.html", layout: "errors", status: 404
|
|
end
|
|
|
|
def render_403
|
|
head :forbidden
|
|
end
|
|
|
|
def render_404
|
|
render file: Rails.root.join("public", "404"), layout: false, status: "404"
|
|
end
|
|
|
|
def no_cache_headers
|
|
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
|
|
response.headers["Pragma"] = "no-cache"
|
|
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
|
end
|
|
|
|
def default_headers
|
|
headers['X-Frame-Options'] = 'DENY'
|
|
headers['X-XSS-Protection'] = '1; mode=block'
|
|
headers['X-UA-Compatible'] = 'IE=edge'
|
|
headers['X-Content-Type-Options'] = 'nosniff'
|
|
# Enabling HSTS for non-standard ports would send clients to the wrong port
|
|
if Gitlab.config.gitlab.https and Gitlab.config.gitlab.port == 443
|
|
headers['Strict-Transport-Security'] = 'max-age=31536000'
|
|
end
|
|
end
|
|
|
|
def validate_user_service_ticket!
|
|
return unless signed_in? && session[:service_tickets]
|
|
|
|
valid = session[:service_tickets].all? do |provider, ticket|
|
|
Gitlab::OAuth::Session.valid?(provider, ticket)
|
|
end
|
|
|
|
unless valid
|
|
session[:service_tickets] = nil
|
|
sign_out current_user
|
|
redirect_to new_user_session_path
|
|
end
|
|
end
|
|
|
|
def check_password_expiration
|
|
if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
|
|
redirect_to new_profile_password_path and return
|
|
end
|
|
end
|
|
|
|
def check_2fa_requirement
|
|
if two_factor_authentication_required? && current_user && !current_user.two_factor_enabled? && !skip_two_factor?
|
|
redirect_to profile_two_factor_auth_path
|
|
end
|
|
end
|
|
|
|
def ldap_security_check
|
|
if current_user && current_user.requires_ldap_check?
|
|
return unless current_user.try_obtain_ldap_lease
|
|
|
|
unless Gitlab::LDAP::Access.allowed?(current_user)
|
|
sign_out current_user
|
|
flash[:alert] = "Access denied for your LDAP account."
|
|
redirect_to new_user_session_path
|
|
end
|
|
end
|
|
end
|
|
|
|
def event_filter
|
|
filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
|
|
@event_filter ||= EventFilter.new(filters)
|
|
end
|
|
|
|
def gitlab_ldap_access(&block)
|
|
Gitlab::LDAP::Access.open { |access| block.call(access) }
|
|
end
|
|
|
|
# JSON for infinite scroll via Pager object
|
|
def pager_json(partial, count)
|
|
html = render_to_string(
|
|
partial,
|
|
layout: false,
|
|
formats: [:html]
|
|
)
|
|
|
|
render json: {
|
|
html: html,
|
|
count: count
|
|
}
|
|
end
|
|
|
|
def view_to_html_string(partial, locals = {})
|
|
render_to_string(
|
|
partial,
|
|
locals: locals,
|
|
layout: false,
|
|
formats: [:html]
|
|
)
|
|
end
|
|
|
|
def configure_permitted_parameters
|
|
devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :email, :password, :login, :remember_me, :otp_attempt])
|
|
end
|
|
|
|
def hexdigest(string)
|
|
Digest::SHA1.hexdigest string
|
|
end
|
|
|
|
def require_email
|
|
if current_user && current_user.temp_oauth_email?
|
|
redirect_to profile_path, notice: 'Please complete your profile with email address' and return
|
|
end
|
|
end
|
|
|
|
def set_filters_params
|
|
set_default_sort
|
|
|
|
params[:scope] = 'all' if params[:scope].blank?
|
|
params[:state] = 'opened' if params[:state].blank?
|
|
|
|
@sort = params[:sort]
|
|
@filter_params = params.dup
|
|
|
|
if @project
|
|
@filter_params[:project_id] = @project.id
|
|
elsif @group
|
|
@filter_params[:group_id] = @group.id
|
|
else
|
|
# TODO: this filter ignore issues/mr created in public or
|
|
# internal repos where you are not a member. Enable this filter
|
|
# or improve current implementation to filter only issues you
|
|
# created or assigned or mentioned
|
|
# @filter_params[:authorized_only] = true
|
|
end
|
|
|
|
@filter_params
|
|
end
|
|
|
|
def get_issues_collection
|
|
set_filters_params
|
|
@issuable_finder = IssuesFinder.new(current_user, @filter_params)
|
|
@issuable_finder.execute
|
|
end
|
|
|
|
def get_merge_requests_collection
|
|
set_filters_params
|
|
@issuable_finder = MergeRequestsFinder.new(current_user, @filter_params)
|
|
@issuable_finder.execute
|
|
end
|
|
|
|
def import_sources_enabled?
|
|
!current_application_settings.import_sources.empty?
|
|
end
|
|
|
|
def github_import_enabled?
|
|
current_application_settings.import_sources.include?('github')
|
|
end
|
|
|
|
def github_import_configured?
|
|
Gitlab::OAuth::Provider.enabled?(:github)
|
|
end
|
|
|
|
def gitlab_import_enabled?
|
|
request.host != 'gitlab.com' && current_application_settings.import_sources.include?('gitlab')
|
|
end
|
|
|
|
def gitlab_import_configured?
|
|
Gitlab::OAuth::Provider.enabled?(:gitlab)
|
|
end
|
|
|
|
def bitbucket_import_enabled?
|
|
current_application_settings.import_sources.include?('bitbucket')
|
|
end
|
|
|
|
def bitbucket_import_configured?
|
|
Gitlab::OAuth::Provider.enabled?(:bitbucket) && Gitlab::BitbucketImport.public_key.present?
|
|
end
|
|
|
|
def gitorious_import_enabled?
|
|
current_application_settings.import_sources.include?('gitorious')
|
|
end
|
|
|
|
def google_code_import_enabled?
|
|
current_application_settings.import_sources.include?('google_code')
|
|
end
|
|
|
|
def fogbugz_import_enabled?
|
|
current_application_settings.import_sources.include?('fogbugz')
|
|
end
|
|
|
|
def git_import_enabled?
|
|
current_application_settings.import_sources.include?('git')
|
|
end
|
|
|
|
def gitlab_project_import_enabled?
|
|
current_application_settings.import_sources.include?('gitlab_project')
|
|
end
|
|
|
|
def two_factor_authentication_required?
|
|
current_application_settings.require_two_factor_authentication
|
|
end
|
|
|
|
def two_factor_grace_period
|
|
current_application_settings.two_factor_grace_period
|
|
end
|
|
|
|
def two_factor_grace_period_expired?
|
|
date = current_user.otp_grace_period_started_at
|
|
date && (date + two_factor_grace_period.hours) < Time.current
|
|
end
|
|
|
|
def skip_two_factor?
|
|
session[:skip_tfa] && session[:skip_tfa] > Time.current
|
|
end
|
|
|
|
def browser_supports_u2f?
|
|
browser.chrome? && browser.version.to_i >= 41 && !browser.device.mobile?
|
|
end
|
|
|
|
def redirect_to_home_page_url?
|
|
# If user is not signed-in and tries to access root_path - redirect him to landing page
|
|
# Don't redirect to the default URL to prevent endless redirections
|
|
return false unless current_application_settings.home_page_url.present?
|
|
|
|
home_page_url = current_application_settings.home_page_url.chomp('/')
|
|
root_urls = [Gitlab.config.gitlab['url'].chomp('/'), root_url.chomp('/')]
|
|
|
|
return false if root_urls.include?(home_page_url)
|
|
|
|
current_user.nil? && root_path == request.path
|
|
end
|
|
|
|
# U2F (universal 2nd factor) devices need a unique identifier for the application
|
|
# to perform authentication.
|
|
# https://developers.yubico.com/U2F/App_ID.html
|
|
def u2f_app_id
|
|
request.base_url
|
|
end
|
|
|
|
private
|
|
|
|
def set_default_sort
|
|
key = if is_a_listing_page_for?('issues') || is_a_listing_page_for?('merge_requests')
|
|
'issuable_sort'
|
|
end
|
|
|
|
cookies[key] = params[:sort] if key && params[:sort].present?
|
|
params[:sort] = cookies[key] if key
|
|
params[:sort] ||= 'id_desc'
|
|
end
|
|
|
|
def is_a_listing_page_for?(page_type)
|
|
controller_name, action_name = params.values_at(:controller, :action)
|
|
|
|
(controller_name == "projects/#{page_type}" && action_name == 'index') ||
|
|
(controller_name == 'groups' && action_name == page_type) ||
|
|
(controller_name == 'dashboard' && action_name == page_type)
|
|
end
|
|
end
|