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

Merge pull request #28 from overleaf/auth-log-fields

Browse source 
Additional log fields for unauthorized requests
This commit is contained in:
Michael Mazour 2017-09-12 06:53:00 +01:00 committed by GitHub
commit 3674fd47f7
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,6 +85,7 @@ public class Oauth2Filter implements Filter {
) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
String capturedUsername = "(unknown)";
String authHeader = request.getHeader("Authorization");
if (authHeader != null) {
@ -103,6 +104,9 @@ public class Oauth2Filter implements Filter {
String username = split[0];
String password = split[1];
String accessToken = null;
if (username.length() > 0) {
capturedUsername = username;
}
try {
accessToken = new PasswordTokenRequest(
Instance.httpTransport,
@ -120,7 +124,7 @@ public class Oauth2Filter implements Filter {
)
).execute().getAccessToken();
} catch (TokenResponseException e) {
unauthorized(projectName, response);
unauthorized(projectName, capturedUsername, e.getStatusCode(), request, response);
return;
}
final Credential cred = new Credential.Builder(
@ -135,7 +139,7 @@ public class Oauth2Filter implements Filter {
servletResponse
);
} else {
unauthorized(projectName, response);
unauthorized(projectName, capturedUsername, 0, request, response);
}
} catch (UnsupportedEncodingException e) {
throw new Error("Couldn't retrieve authentication", e);
@ -143,7 +147,7 @@ public class Oauth2Filter implements Filter {
}
}
} else {
unauthorized(projectName, response);
unauthorized(projectName, capturedUsername, 0, request, response);
}
}
@ -152,10 +156,19 @@ public class Oauth2Filter implements Filter {
private void unauthorized(
String projectName,
ServletResponse servletResponse
String userName,
int statusCode,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse
) throws IOException {
Log.info("[{}] Unauthorized", projectName);
HttpServletResponse response = (HttpServletResponse) servletResponse;
Log.info(
"[{}] Unauthorized, User '{}' status={} ip={}",
projectName,
userName,
statusCode,
servletRequest.getRemoteAddr()
);
HttpServletResponse response = servletResponse;
response.setContentType("text/plain");
response.setHeader("WWW-Authenticate", "Basic realm=\"Git Bridge\"");
response.setStatus(401);