squito commented on a change in pull request #23302: [SPARK-24522][UI] Create filter to apply HTTP security checks consistently. URL: https://github.com/apache/spark/pull/23302#discussion_r245422996
########## File path: core/src/test/scala/org/apache/spark/ui/HttpSecurityFilterSuite.scala ########## @@ -0,0 +1,157 @@ +/* + * 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.spark.ui + +import java.util.UUID +import javax.servlet.FilterChain +import javax.servlet.http.{HttpServletRequest, HttpServletResponse} + +import scala.collection.JavaConverters._ + +import org.mockito.ArgumentCaptor +import org.mockito.Matchers.{any, eq => meq} +import org.mockito.Mockito.{mock, never, times, verify, when} + +import org.apache.spark._ +import org.apache.spark.internal.config._ + +class HttpSecurityFilterSuite extends SparkFunSuite { + + test("filter bad user input") { + val badValues = Map( + "encoded" -> "Encoding:base64%0d%0a%0d%0aPGh0bWw%2bjcmlwdD48L2h0bWw%2b", + "alert1" -> """>"'><script>alert(401)<%2Fscript>""", + "alert2" -> """app-20161208133404-0002<iframe+src%3Djavascript%3Aalert(1705)>""", + "alert3" -> """stdout'%2Balert(60)%2B'""", + "html" -> """stdout'"><iframe+id%3D1131+src%3Dhttp%3A%2F%2Fdemo.test.net%2Fphishing.html>""" + ) + val badKeys = badValues.map(_.swap) + val goodInput = Map("goodKey" -> "goodValue") + + val conf = new SparkConf() + val filter = new HttpSecurityFilter(conf, new SecurityManager(conf)) + + def newRequest(): HttpServletRequest = { + val req = mock(classOf[HttpServletRequest]) + when(req.getParameterMap()).thenReturn(Map.empty[String, Array[String]].asJava) + req + } + + def doRequest(k: String, v: String): HttpServletRequest = { + val req = newRequest() + when(req.getParameterMap()).thenReturn(Map(k -> Array(v)).asJava) + + val chain = mock(classOf[FilterChain]) + val res = mock(classOf[HttpServletResponse]) + filter.doFilter(req, res, chain) + + val captor = ArgumentCaptor.forClass(classOf[HttpServletRequest]) + verify(chain).doFilter(captor.capture(), any()) + captor.getValue() + } + + badKeys.foreach { case (k, v) => + val req = doRequest(k, v) + assert(req.getParameter(k) === null) + assert(req.getParameterValues(k) === null) + assert(!req.getParameterMap().containsKey(k)) + } + + badValues.foreach { case (k, v) => + val req = doRequest(k, v) + assert(req.getParameter(k) != null) + assert(req.getParameter(k) != v) + assert(req.getParameterValues(k) != null) + assert(req.getParameterValues(k) != Array(v)) Review comment: won't these pass just because its a different Array anyway? eg `assert(Array(x) != Array(x))` always passes. I think you could do `assert(req.getParameterValues(k).toSeq != Seq(v))` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
