Skip to content

Commit

Permalink
Fix for Cross Site Scripting Rule
Browse files Browse the repository at this point in the history
added UT
  • Loading branch information
sumi-mathew authored and sumi committed Nov 21, 2024
1 parent 5442d1b commit 1db627f
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.facebook.presto.execution.buffer.PageBufferInfo;
import com.facebook.presto.operator.ExchangeClientConfig;
import com.facebook.presto.spi.page.SerializedPage;
import com.facebook.presto.util.SanitizeMessage;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.ListenableFuture;
Expand Down Expand Up @@ -116,9 +117,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
protected void reportFailure(HttpServletResponse response, String message)
throws IOException
{
response.sendError(SC_BAD_REQUEST, message);
response.sendError(SC_BAD_REQUEST, SanitizeMessage.getSanitizeMessage(message));
}

protected void parseURI(String requestURI, HttpServletRequest request, HttpServletResponse response)
throws IOException
{
Expand Down Expand Up @@ -181,7 +181,7 @@ public void onError(AsyncEvent event)
{
String errorMessage = format("Server error to process task result request %s : %s", requestURI, event.getThrowable().getMessage());
log.error(event.getThrowable(), errorMessage);
response.sendError(SC_INTERNAL_SERVER_ERROR, errorMessage);
response.sendError(SC_INTERNAL_SERVER_ERROR, SanitizeMessage.getSanitizeMessage(errorMessage));
}

public void onStartAsync(AsyncEvent event)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Licensed 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 com.facebook.presto.util;

public class SanitizeMessage
{
private SanitizeMessage() {}

public static String getSanitizeMessage(String message)
{
if (message == null) {
return "";
}
StringBuilder stringBuilder = new StringBuilder(message.length());

// Traverse each character in the string and replace only when necessary
for (int i = 0; i < message.length(); i++) {
char ch = message.charAt(i);
switch (ch) {
case '&':
stringBuilder.append("&amp;");
break;
case '<':
stringBuilder.append("&lt;");
break;
case '>':
stringBuilder.append("&gt;");
break;
case '"':
stringBuilder.append("&quot;");
break;
case '\'':
stringBuilder.append("&#39;");
break;
case '/':
stringBuilder.append("&#47;");
break;
default:
stringBuilder.append(ch);
break;
}
}
return stringBuilder.toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Licensed 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 com.facebook.presto.util;

import org.testng.annotations.Test;

import static org.testng.Assert.assertEquals;

public class TestSanitizeMessage
{
@Test
public void testGetSanitizeMessage()
{
String message = "Server&> error/ to \" process < task result request ' ";
assertEquals(SanitizeMessage.getSanitizeMessage(message), "Server&amp;&gt; error&#47; to &quot; process &lt; task result request &#39; ");
}

@Test
public void testGetSanitizeMessageNullcheck()
{
String message = null;
assertEquals(SanitizeMessage.getSanitizeMessage(message), "");
}
}

0 comments on commit 1db627f

Please sign in to comment.