opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Set XSRF on '/' under PolyGerrit

Change-Id: Ia3da453253c84a8e04fce42f188dbcb700da0b1e
This commit is contained in:
David Pursehouse
2019-08-27 21:12:16 +09:00
parent aacff85663 0f1eb1d5e7
commit 41dcad8cc5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/httpd/raw/StaticModule.java
View File

@@ -247,8 +247,8 @@ public class StaticModule extends ServletModule {
public void configureServlets() { public void configureServlets() {
for (String p : POLYGERRIT_INDEX_PATHS) { for (String p : POLYGERRIT_INDEX_PATHS) {
// Skip XsrfCookieFilter for /, since that is already done in the GWT UI // Skip XsrfCookieFilter for /, since that is already done in the GWT UI
// path (UrlModule). // path (UrlModule) if it is enabled.
if (!p.equals("/")) { if (!(p.equals("/") && options.enableGwtUi())) {
filter(p).through(XsrfCookieFilter.class); filter(p).through(XsrfCookieFilter.class);
} }
} }