root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Adjust log level for invalid SockJS or Websocket requests

This commit is contained in:
Sebastien Deleuze 2015-02-19 14:58:21 +01:00
parent 40cbede7f3
commit 90e6304b49
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/web/util/WebUtils.java
View File

@ -796,7 +796,9 @@ public abstract class WebUtils {
originComponents = UriComponentsBuilder.fromHttpUrl(origin).build();
}
catch (IllegalArgumentException ex) {
logger.error("Failed to parse Origin header value [" + origin + "]");
if (logger.isWarnEnabled()) {
logger.warn("Failed to parse Origin header value [" + origin + "]");
}
return false;
}
UriComponents requestComponents = UriComponentsBuilder.fromHttpRequest(request).build();

27
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
View File

@ -336,7 +336,9 @@ public abstract class AbstractSockJsService implements SockJsService {
String sockJsPath, WebSocketHandler wsHandler) throws SockJsException {
if (sockJsPath == null) {
logger.error("Expected SockJS path. Failing request: " + request.getURI());
if (logger.isWarnEnabled()) {
logger.warn("Expected SockJS path. Failing request: " + request.getURI());
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
@ -361,7 +363,10 @@ public abstract class AbstractSockJsService implements SockJsService {
}
else if (sockJsPath.matches("/iframe[0-9-.a-z_]*.html")) {
if (!this.allowedOrigins.isEmpty() && !this.allowedOrigins.contains("*")) {
logger.debug("Iframe support is disabled when an origin check is required, ignoring " + requestInfo);
if (logger.isDebugEnabled()) {
logger.debug("Iframe support is disabled when an origin check is required, ignoring " +
requestInfo);
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
@ -383,7 +388,9 @@ public abstract class AbstractSockJsService implements SockJsService {
else {
String[] pathSegments = StringUtils.tokenizeToStringArray(sockJsPath.substring(1), "/");
if (pathSegments.length != 3) {
logger.error("Ignoring invalid transport request " + requestInfo);
if (logger.isWarnEnabled()) {
logger.warn("Ignoring invalid transport request " + requestInfo);
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
@ -392,12 +399,16 @@ public abstract class AbstractSockJsService implements SockJsService {
String transport = pathSegments[2];
if (!isWebSocketEnabled() && transport.equals("websocket")) {
logger.debug("WebSocket transport is disabled, ignoring " + requestInfo);
if (logger.isDebugEnabled()) {
logger.debug("WebSocket transport is disabled, ignoring " + requestInfo);
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
else if (!validateRequest(serverId, sessionId, transport)) {
logger.error("Ignoring transport request " + requestInfo);
if (logger.isWarnEnabled()) {
logger.warn("Ignoring transport request " + requestInfo);
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
@ -412,12 +423,12 @@ public abstract class AbstractSockJsService implements SockJsService {
protected boolean validateRequest(String serverId, String sessionId, String transport) {
if (!StringUtils.hasText(serverId) || !StringUtils.hasText(sessionId) || !StringUtils.hasText(transport)) {
logger.error("No server, session, or transport path segment");
logger.warn("No server, session, or transport path segment");
return false;
}
// Server and session id's must not contain "."
if (serverId.contains(".") || sessionId.contains(".")) {
logger.error("Either server or session contains a \".\" which is not allowed by SockJS protocol.");
logger.warn("Either server or session contains a \".\" which is not allowed by SockJS protocol.");
return false;
}
return true;
@ -504,7 +515,7 @@ public abstract class AbstractSockJsService implements SockJsService {
}
protected void sendMethodNotAllowed(ServerHttpResponse response, HttpMethod... httpMethods) {
logger.error("Sending Method Not Allowed (405)");
logger.warn("Sending Method Not Allowed (405)");
response.setStatusCode(HttpStatus.METHOD_NOT_ALLOWED);
response.getHeaders().setAllow(new HashSet<HttpMethod>(Arrays.asList(httpMethods)));
}

16
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,8 +17,6 @@
package org.springframework.web.socket.sockjs.transport;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -194,14 +192,18 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem
TransportType transportType = TransportType.fromValue(transport);
if (transportType == null) {
logger.error("Unknown transport type for " + request.getURI());
if (logger.isWarnEnabled()) {
logger.warn("Unknown transport type for " + request.getURI());
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
TransportHandler transportHandler = this.handlers.get(transportType);
if (transportHandler == null) {
logger.error("No TransportHandler for " + request.getURI());
if (logger.isWarnEnabled()) {
logger.warn("No TransportHandler for " + request.getURI());
}
response.setStatusCode(HttpStatus.NOT_FOUND);
return;
}
@ -287,7 +289,9 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem
@Override
protected boolean validateRequest(String serverId, String sessionId, String transport) {
if (!getAllowedOrigins().contains("*") && !TransportType.fromValue(transport).supportsOrigin()) {
logger.error("Origin check has been enabled, but this transport does not support it");
if (logger.isWarnEnabled()) {
logger.warn("Origin check has been enabled, but transport " + transport + " does not support it");
}
return false;
}
return super.validateRequest(serverId, sessionId, transport);