opendev/gerrit
Code Issues Proposed changes

Gerrit: Move XSRF token to onModuleLoad

Browse Source 
There are various JSON requests earlier in the pipeline than the
HostPageData callback, which need to include the XSRF token. Cookies
are set in the response header, so they are available early; just move
this block to the very top.

Change-Id: I17e4f1b48a2d957c04de0f5488fdf7d8b44d80c9
This commit is contained in:
Dave Borowitz
2015-11-10 14:32:11 -05:00
parent b03dd90524
commit a1cad716cb
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
View File

@@ -415,9 +415,26 @@ public class Gerrit implements EntryPoint {
Cookies.removeCookie("GerritAccount");
}
private void setXsrfToken() {
xGerritAuth = Cookies.getCookie(XSRF_COOKIE_NAME);
Cookies.removeCookie(XSRF_COOKIE_NAME);
JsonUtil.setDefaultXsrfManager(new XsrfManager() {
@Override
public String getToken(JsonDefTarget proxy) {
return xGerritAuth;
}
@Override
public void setToken(JsonDefTarget proxy, String token) {
// Ignore the request, we always rely upon the cookie.
}
});
}
@Override
public void onModuleLoad() {
UserAgent.assertNotInIFrame();
setXsrfToken();
KeyUtil.setEncoderImpl(new KeyUtil.Encoder() {
@Override
@@ -513,8 +530,6 @@ public class Gerrit implements EntryPoint {
editPrefs = null;
onModuleLoad2(result);
}
xGerritAuth = Cookies.getCookie(XSRF_COOKIE_NAME);
Cookies.removeCookie(XSRF_COOKIE_NAME);
}
}));
}
@@ -612,17 +627,6 @@ public class Gerrit implements EntryPoint {
JsonUtil.addRpcStartHandler(RpcStatus.INSTANCE);
JsonUtil.addRpcCompleteHandler(RpcStatus.INSTANCE);
JsonUtil.setDefaultXsrfManager(new XsrfManager() {
@Override
public String getToken(JsonDefTarget proxy) {
return xGerritAuth;
}
@Override
public void setToken(JsonDefTarget proxy, String token) {
// Ignore the request, we always rely upon the cookie.
}
});
gStarting.getElement().getParentElement().removeChild(
gStarting.getElement());