arina-ielchiieva commented on a change in pull request #1864: DRILL-7351: Added tokens to Web forms to prevent CSRF attacks URL: https://github.com/apache/drill/pull/1864#discussion_r330017190
########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/CsrfTokenInjectFilter.java ########## @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.drill.exec.server.rest; + +import org.apache.commons.lang3.RandomStringUtils; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.ws.rs.HttpMethod; +import java.io.IOException; +import java.security.SecureRandom; + +/** + * Generates and adds a CSRF token to a HTTP session. It is used to prevent CSRF attacks. + */ +public class CsrfTokenInjectFilter implements Filter { + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + HttpServletRequest httpRequest = (HttpServletRequest) request; + if (HttpMethod.GET.equalsIgnoreCase(httpRequest.getMethod())) { + HttpSession session = httpRequest.getSession(false); + if (session != null) { + String csrfToken = (String) session.getAttribute(WebServerConstants.CSRF_TOKEN); + if (csrfToken == null) { + csrfToken = RandomStringUtils.random(20, 0, 0, true, true, null, new SecureRandom()); Review comment: Could you please explain why `RandomStringUtils.random` was chosen to generate csrf token? Looking thought web sources, using it might be worse than `UUID.randomUUID()` which also uses `SecureRandom()` under the hood. Though even UUID might not give full security (for example, according to this article - https://neilmadden.blog/2018/08/30/moving-away-from-uuids/). Please investigate this issue more thoroughly, chose proper generator and justify why. > Consider leveraging the java.security.SecureRandom class for Java applications to generate a sufficiently long random token. Alternative generation algorithms include the use of 256-bit BASE64 encoded hashes. Developers that choose this generation algorithm must make sure that there is randomness and uniqueness utilized in the data that is hashed to generate the random token. https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
