cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

log user agent for lookup requests

Browse Source
This commit is contained in:
Maxime Dor
2017-09-13 16:20:46 +02:00
parent 84afb86b77
commit ec0a9c7b80
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/groovy/io/kamax/mxisd/controller/v1/MappingController.groovy
View File

@@ -65,6 +65,8 @@ class MappingController {
if (lookupReq.isRecursive()) { if (lookupReq.isRecursive()) {
lookupReq.setRecurseHosts(Arrays.asList(xff.split(","))) lookupReq.setRecurseHosts(Arrays.asList(xff.split(",")))
} }
lookupReq.setUserAgent(req.getHeader("USER-AGENT"))
} }
@RequestMapping(value = "/lookup", method = GET) @RequestMapping(value = "/lookup", method = GET)
@@ -74,7 +76,7 @@ class MappingController {
lookupRequest.setType(medium) lookupRequest.setType(medium)
lookupRequest.setThreePid(address) lookupRequest.setThreePid(address)
log.info("Got request from {} - Is recursive? {}", lookupRequest.getRequester(), lookupRequest.isRecursive()) log.info("Got single lookup request from {} with client {} - Is recursive? {}", lookupRequest.getRequester(), lookupRequest.getUserAgent(), lookupRequest.isRecursive())
Optional<SingleLookupReply> lookupOpt = strategy.find(lookupRequest) Optional<SingleLookupReply> lookupOpt = strategy.find(lookupRequest)
if (!lookupOpt.isPresent()) { if (!lookupOpt.isPresent()) {
@@ -99,7 +101,7 @@ class MappingController {
String bulkLookup(HttpServletRequest request) { String bulkLookup(HttpServletRequest request) {
BulkLookupRequest lookupRequest = new BulkLookupRequest() BulkLookupRequest lookupRequest = new BulkLookupRequest()
setRequesterInfo(lookupRequest, request) setRequesterInfo(lookupRequest, request)
log.info("Got request from {} - Is recursive? {}", lookupRequest.getRequester(), lookupRequest.isRecursive()) log.info("Got single lookup request from {} with client {} - Is recursive? {}", lookupRequest.getRequester(), lookupRequest.getUserAgent(), lookupRequest.isRecursive())
ClientBulkLookupRequest input = (ClientBulkLookupRequest) json.parseText(request.getInputStream().getText()) ClientBulkLookupRequest input = (ClientBulkLookupRequest) json.parseText(request.getInputStream().getText())
List<ThreePidMapping> mappings = new ArrayList<>() List<ThreePidMapping> mappings = new ArrayList<>()