Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8074: LoadAdminUIServlet directly references admin.html 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1710271 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2015-10-23 17:23:55 +00:00
parent 4af4c701b2
commit d3d9d353af
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -373,6 +373,8 @@ Other Changes
* SOLR-8116: SearchGroupsResultTransformer tweaks (String literals, list/map initialCapacity) * SOLR-8116: SearchGroupsResultTransformer tweaks (String literals, list/map initialCapacity)
(Christine Poerschke) (Christine Poerschke)
* SOLR-8074: LoadAdminUIServlet directly references admin.html (Mark Miller, Upayavira)
================== 5.3.1 ================== ================== 5.3.1 ==================
Bug Fixes Bug Fixes

3
solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
View File

@ -47,8 +47,9 @@ public final class LoadAdminUiServlet extends BaseSolrServlet {
response.addHeader("X-Frame-Options", "DENY"); // security: SOLR-7966 - avoid clickjacking for admin interface response.addHeader("X-Frame-Options", "DENY"); // security: SOLR-7966 - avoid clickjacking for admin interface
// This attribute is set by the SolrDispatchFilter // This attribute is set by the SolrDispatchFilter
String admin = request.getRequestURI().substring(request.getContextPath().length());
CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer"); CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer");
InputStream in = getServletContext().getResourceAsStream("/admin.html"); InputStream in = getServletContext().getResourceAsStream(admin);
if(in != null && cores != null) { if(in != null && cores != null) {
try { try {
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");