Merge branch 'ce-jej/fix-sso-enforced-docker-registry-auth' into 'master'

[CE backport]  Enforced SSO shouldn't break container registry authentication

See merge request gitlab-org/gitlab-ce!32110
This commit is contained in:
Kamil Trzciński 2019-08-23 17:53:14 +00:00
commit 24ff249ded
2 changed files with 9 additions and 0 deletions

View file

@ -1,6 +1,7 @@
# frozen_string_literal: true
class JwtController < ApplicationController
skip_around_action :set_session_storage
skip_before_action :authenticate_user!
skip_before_action :verify_authenticity_token
before_action :authenticate_project_or_user

View file

@ -108,6 +108,14 @@ describe JwtController do
end
end
end
it 'does not cause session based checks to be activated' do
expect(Gitlab::Session).not_to receive(:with_session)
get '/jwt/auth', params: parameters, headers: headers
expect(response).to have_gitlab_http_status(200)
end
end
context 'using invalid login' do