Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZCS-12859 implement CSRF in GraphQL endpoint #64

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

ZCS-12859 implement CSRF in GraphQL endpoint #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/java/com/zimbra/graphql/utilities/GQLAuthUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
import com.zimbra.common.soap.Element;
import com.zimbra.common.soap.HeaderConstants;
import com.zimbra.common.soap.SoapProtocol;
import com.zimbra.common.util.Constants;
import com.zimbra.common.util.L10nUtil;
import com.zimbra.common.util.L10nUtil.MsgKey;
import com.zimbra.common.util.StringUtil;
import com.zimbra.common.util.ZimbraCookie;
import com.zimbra.common.util.ZimbraLog;
import com.zimbra.cs.account.Account;
Expand All @@ -42,6 +44,8 @@
import com.zimbra.cs.account.ZimbraAuthToken;
import com.zimbra.cs.account.ZimbraJWToken;
import com.zimbra.cs.service.AuthProvider;
import com.zimbra.cs.servlet.util.CsrfUtil;
import com.zimbra.cs.servlet.CsrfFilter;
import com.zimbra.graphql.models.RequestContext;
import com.zimbra.soap.DocumentHandler;
import com.zimbra.soap.SoapEngine;
Expand Down Expand Up @@ -200,7 +204,7 @@ public static ZimbraSoapContext getZimbraSoapContext(RequestContext rctxt)
final Map<String, String> headers = new HashMap<String, String>(1);
headers.put("Authorization", req.getHeader("Authorization"));
final AuthToken token = getAuthToken(cookies, headers);
if (isValidToken(token)) {
if (isValidToken(token) && isValidCsrf(token, req)) {
return new ZimbraSoapContext(token, token.getAccountId(), SoapProtocol.Soap12,
SoapProtocol.Soap12);
}
Expand All @@ -209,4 +213,30 @@ public static ZimbraSoapContext getZimbraSoapContext(RequestContext rctxt)
throw ServiceException.PERM_DENIED(L10nUtil.getMessage(MsgKey.errMustAuthenticate));
}

/**
* CSRF implementation
*/
private static boolean isValidCsrf(AuthToken authToken, HttpServletRequest req) {
boolean doCsrfCheck = false;
if (req.getAttribute(CsrfFilter.CSRF_TOKEN_CHECK) != null) {
doCsrfCheck = (Boolean) req.getAttribute(CsrfFilter.CSRF_TOKEN_CHECK);
} else if (authToken != null && authToken.isCsrfTokenEnabled()) {
doCsrfCheck = true;
}

if(doCsrfCheck) {
String csrfToken = req.getHeader(Constants.CSRF_TOKEN);
if (StringUtil.isNullOrEmpty(csrfToken)) {
ZimbraLog.extensions.debug("No CSRF token received.");
return false;
}

//check for valid CSRF token
if (!CsrfUtil.isValidCsrfToken(csrfToken, authToken)) {
ZimbraLog.extensions.debug("CSRF check FAILED.");
return false;
}
}
return true;
}
}