Skip to content

O
Openfire
Commit 0d0987d1 authored by daryl herzmann's avatar daryl herzmann Committed by GitHub
Browse files
Options

OF-1334 Don't do CSRF check unless actions are requested (#807) 

* remove unused global.css

* OF-1334 Don't do CSRF check unless actions are requested
parent bbd05665
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
src/plugins/monitoring/changelog.html
View file @ 0d0987d1
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
<h1> <h1>
Monitoring Plugin Changelog Monitoring Plugin Changelog
</h1> </h1>
<p><b>1.5.7</b> -- May 19, 2017</p>
<ul>
<li>[<a href='https://issues.igniterealtime.org/browse/OF-1334'>OF-1334</a>] - Monitoring Plugin displays "Archive index rebuild failed"</li>
</ul>
<p><b>1.5.6</b> -- February 16, 2016</p> <p><b>1.5.6</b> -- February 16, 2016</p>
<ul> <ul>
<li>[<a href='https://igniterealtime.org/issues/browse/OF-1288'>OF-1288</a>] - Add missing queryid and id attributes</li> <li>[<a href='https://igniterealtime.org/issues/browse/OF-1288'>OF-1288</a>] - Add missing queryid and id attributes</li>
......
src/plugins/monitoring/plugin.xml
View file @ 0d0987d1
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<name>Monitoring Service</name> <name>Monitoring Service</name>
<description>Monitors conversations and statistics of the server.</description> <description>Monitors conversations and statistics of the server.</description>
<author>IgniteRealtime // Jive Software</author> <author>IgniteRealtime // Jive Software</author>
<version>1.5.6</version> <version>1.5.7</version>
<date>2/16/2017</date> <date>5/19/2017</date>
<minServerVersion>4.0.99</minServerVersion><!-- Allows the beta 4.1.0 --> <minServerVersion>4.1.0</minServerVersion>
<databaseKey>monitoring</databaseKey> <databaseKey>monitoring</databaseKey>
<databaseVersion>4</databaseVersion> <databaseVersion>4</databaseVersion>
......
src/plugins/monitoring/src/web/archiving-settings.jsp
View file @ 0d0987d1
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<head> <head>
<title><fmt:message key="archive.settings.title"/></title> <title><fmt:message key="archive.settings.title"/></title>
<meta name="pageID" content="archiving-settings"/> <meta name="pageID" content="archiving-settings"/>
<link rel="stylesheet" type="text/css" href="style/global.css">
<script src="dwr/engine.js" type="text/javascript"></script> <script src="dwr/engine.js" type="text/javascript"></script>
<script src="dwr/util.js" type="text/javascript"></script> <script src="dwr/util.js" type="text/javascript"></script>
<script src="dwr/interface/conversations.js" type="text/javascript"></script> <script src="dwr/interface/conversations.js" type="text/javascript"></script>
...@@ -177,11 +176,11 @@ ...@@ -177,11 +176,11 @@
Map errors = new HashMap(); Map errors = new HashMap();
String errorMessage = ""; String errorMessage = "";
if (csrfCookie == null || csrfParam == null || !csrfCookie.getValue().equals(csrfParam)) { if ((rebuildIndex || update) && (csrfCookie == null || csrfParam == null || !csrfCookie.getValue().equals(csrfParam))) {
rebuildIndex = false; rebuildIndex = false;
update = false; update = false;
errorMessage = "CSRF Failure.";
errors.put("csrf", ""); errors.put("csrf", "");
errorMessage = "Archive Index rebuild failed.";
} }
csrfParam = StringUtils.randomString(16); csrfParam = StringUtils.randomString(16);
CookieUtils.setCookie(request, response, "csrf", csrfParam, -1); CookieUtils.setCookie(request, response, "csrf", csrfParam, -1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023