hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 13:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #997 from rradillen/DS-2299

Browse Source 
DS-2299 useProxies and X-Forwarded-FOR
This commit is contained in:
Tim Donohue
2017-03-15 14:18:19 -05:00
committed by GitHub
parent 424f01ed65 39a1e6fa19
commit 4ab43d6097
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/statistics/ElasticSearchLoggerServiceImpl.java
View File

@@ -216,6 +216,10 @@ public class ElasticSearchLoggerServiceImpl implements ElasticSearchLoggerServic
}
}
if (!isUseProxies() && request.getHeader("X-Forwarded-For") != null){
log.warn("X-Forwarded-For header detected but useProxies is not enabled. If your dspace is behind a proxy set it to true");
}
XContentBuilder docBuilder = null;
@@ -334,6 +338,10 @@ public class ElasticSearchLoggerServiceImpl implements ElasticSearchLoggerServic
}
}
if (!isUseProxies() && xforwardedfor != null){
log.warn("X-Forwarded-For header detected but useProxies is not enabled. If your dspace is behind a proxy set it to true");
}
XContentBuilder docBuilder = null;

7
dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
View File

@@ -287,6 +287,9 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
}
}
}
if (!isUseProxies() && request.getHeader("X-Forwarded-For") != null){
log.warn("X-Forwarded-For header detected but useProxies is not enabled. If your dspace is behind a proxy set it to true");
}
doc1.addField("ip", ip);
@@ -366,7 +369,9 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
SolrInputDocument doc1 = new SolrInputDocument();
// Save our basic info that we already have
if (!isUseProxies() && xforwardedfor != null){
log.warn("X-Forwarded-For header detected but useProxies is not enabled. If your dspace is behind a proxy set it to true");
}
if (isUseProxies() && xforwardedfor != null) {
/* This header is a comma delimited list */
for (String xfip : xforwardedfor.split(",")) {

2
dspace/config/dspace.cfg
View File

@@ -336,7 +336,7 @@ http.proxy.port =
# If enabled, the logging and the Solr statistics system will look for
# an X-Forwarded-For header. If it finds it, it will use this for the user IP address
#useProxies = true
useProxies = false
#### Media Filter / Format Filter plugins (through PluginService) ####
# Media/Format Filters help to full-text index content or