summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2018-08-05 22:11:37 +1000
committerAsh McKenzie <amckenzie@gitlab.com>2018-08-14 15:56:44 +1000
commitb2103cb431329cf00e3ae79e6c577f018cd66168 (patch)
tree0199d895eac8ada87eff51700fe49bff2fcb5aa6
parentbea52d827e895c9261b3b1e01980832832f7c82a (diff)
downloadgitlab-ce-ash.mckenzie/allow-auth-via-jwt.tar.gz
Allow auth via JWT (always false in CE)ash.mckenzie/allow-auth-via-jwt
-rw-r--r--lib/gitlab/git_access.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 35808149b90..258e19a340b 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -233,6 +233,8 @@ module Gitlab
end
elsif user
# User access is verified in check_change_access!
+ elsif authed_via_jwt?
+ # Authenticated via JWT
else
raise UnauthorizedError, ERROR_MESSAGES[:upload]
end
@@ -321,6 +323,10 @@ module Gitlab
!Gitlab.config.gitlab_shell.receive_pack
end
+ def authed_via_jwt?
+ false
+ end
+
protected
def changes_list