github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #20996 from overleaf/ls-proper-error-for-wrong-git-url-format

Browse source 
proper error message for wrong git url format

GitOrigin-RevId: a6278850c2eca7e85c2526135d1c769fcbe94729
This commit is contained in:
Liangjun Song 2024-10-11 19:42:02 +08:00 committed by Copybot
parent e00831761a
commit 51b46f3909
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/server/Oauth2Filter.java
View file

@ -122,7 +122,7 @@ public class Oauth2Filter implements Filter {
cred.setAccessToken(password); cred.setAccessToken(password);
} else if (this.isUserPasswordEnabled) { } else if (this.isUserPasswordEnabled) {
// password auth has been deprecated for git-bridge // password auth has been deprecated for git-bridge
handlePasswordAuthenticationDeprecation(projectId, request, response); handlePasswordAuthenticationDeprecation(projectId, username, request, response);
return; return;
} else { } else {
handleNeedAuthorization(projectId, username, request, response); handleNeedAuthorization(projectId, username, request, response);
@ -265,14 +265,24 @@ public class Oauth2Filter implements Filter {
} }
private void handlePasswordAuthenticationDeprecation( private void handlePasswordAuthenticationDeprecation(
String projectId, HttpServletRequest request, HttpServletResponse response) String projectId, String username, HttpServletRequest request, HttpServletResponse response)
throws IOException { throws IOException {
Log.info("[{}] Password authentication deprecated, ip={}", projectId, getClientIp(request)); if (username.contains("@")) {
sendResponse( Log.info("[{}] Password authentication deprecated, ip={}", projectId, getClientIp(request));
response, sendResponse(
403, response,
Arrays.asList( 403,
"Overleaf now only supports Git authentication tokens to access git. See: https://www.overleaf.com/learn/how-to/Git_integration_authentication_tokens")); Arrays.asList(
"Overleaf now only supports Git authentication tokens to access git. See: https://www.overleaf.com/learn/how-to/Git_integration_authentication_tokens"));
} else {
Log.info("[{}] Wrong git URL format, ip={}", projectId, getClientIp(request));
sendResponse(
response,
403,
Arrays.asList(
"Overleaf now only supports Git authentication tokens to access git. See: https://www.overleaf.com/learn/how-to/Git_integration_authentication_tokens",
"Please make sure your Git URL is correctly formatted. For example: https://git@git.overleaf.com/<YOUR_PROJECT_ID> or https://git:<AUTHENTICATION_TOKEN>@git.overleaf.com/<YOUR_PROJECT_ID>"));
}
} }
/* /*