Authenticate non-API requests with personal access tokens.

- Rename the `authenticate_user_from_token!` filter to
  `authenticate_user_from_private_token!`
- Add a new `authenticate_user_from_personal_access_token!` filter
- Add tests for both.

1 files changed, 17 insertions, 2 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c53b0b21a3..590f9383f7f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,8 @@ class ApplicationController < ActionController::Base
   include GitlabRoutingHelper
   include PageLayoutHelper
 
-  before_action :authenticate_user_from_token!
+  before_action :authenticate_user_from_private_token!
+  before_action :authenticate_user_from_personal_access_token!
   before_action :authenticate_user!
   before_action :validate_user_service_ticket!
   before_action :reject_blocked!
@@ -65,7 +66,7 @@ class ApplicationController < ActionController::Base
 
   # From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
   # https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
-  def authenticate_user_from_token!
+  def authenticate_user_from_private_token!
     user_token = if params[:authenticity_token].presence
                    params[:authenticity_token].presence
                  elsif params[:private_token].presence
@@ -84,6 +85,20 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authenticate_user_from_personal_access_token!
+    token_string = params[:personal_access_token].presence || request.headers['PERSONAL_ACCESS_TOKEN'].presence
+    personal_access_token = PersonalAccessToken.active.find_by_token(token_string)
+    user = personal_access_token && personal_access_token.user
+
+    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