From cbec567ef4ab567bd925d2792aa560eff5a857f2 Mon Sep 17 00:00:00 2001 From: SIkebe Date: Sun, 12 Jan 2020 10:26:05 +0900 Subject: [PATCH] Make Authorization header auth-scheme case-insencitive (#2416) --- src/main/scala/ScalatraBootstrap.scala | 2 +- .../scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala | 2 +- src/main/scala/gitbucket/core/util/Directory.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala index bc80bfd9d..f49e529df 100644 --- a/src/main/scala/ScalatraBootstrap.scala +++ b/src/main/scala/ScalatraBootstrap.scala @@ -16,7 +16,7 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService { context.getSessionCookieConfig.setSecure(true) } - // Register TransactionFilter and BasicAuthenticationFilter at first + // Register TransactionFilter at first context.addFilter("transactionFilter", new TransactionFilter) context .getFilterRegistration("transactionFilter") diff --git a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala index 3593a202d..dfda6033d 100644 --- a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala @@ -24,7 +24,7 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun val response = res.asInstanceOf[HttpServletResponse] Option(request.getHeader("Authorization")) .map { - case auth if auth.startsWith("token ") => + case auth if auth.toLowerCase().startsWith("token ") => AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(()) case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(()) case _ => Left(()) diff --git a/src/main/scala/gitbucket/core/util/Directory.scala b/src/main/scala/gitbucket/core/util/Directory.scala index 416b7a5a8..0ba52386e 100644 --- a/src/main/scala/gitbucket/core/util/Directory.scala +++ b/src/main/scala/gitbucket/core/util/Directory.scala @@ -62,7 +62,7 @@ object Directory { new File(getRepositoryFilesDir(owner, repository), "releases") /** - * Directory for files which are attached to issue. + * Directory for Git LFS files. */ def getLfsDir(owner: String, repository: String): File = new File(getRepositoryFilesDir(owner, repository), "lfs")