public class ConnectorResourceHandler implements RequestHandler {
// APP/connector/[uiid]/[cid]/[filename.xyz]
private static final Pattern CONNECTOR_RESOURCE_PATTERN = Pattern
- .compile("^/?" + ApplicationConstants.APP_REQUEST_PATH
+ .compile("^/?" + ApplicationConstants.APP_REQUEST_PATH + '/'
+ ConnectorResource.CONNECTOR_REQUEST_PATH
+ "(\\d+)/(\\d+)/(.*)");
}
return true;
+ } else if (requestPath.matches('/'
+ + ApplicationConstants.APP_REQUEST_PATH + "(/.*)?")) {
+ /*
+ * This should be the last request handler before we get to
+ * bootstrap logic. Prevent /APP requests from reaching bootstrap
+ * handlers to help protect the /APP name space for framework usage.
+ */
+ return error(request, response,
+ "Returning 404 for /APP request not yet handled.");
} else {
return false;
}
// APP/global/[uiid]/[type]/[id]
private static final Matcher matcher = Pattern.compile(
- "^/?" + ApplicationConstants.APP_REQUEST_PATH
+ "^/?" + ApplicationConstants.APP_REQUEST_PATH + '/'
+ RESOURCE_REQUEST_PATH + "(\\d+)/(([^/]+)(/.*))").matcher(
"");
String uri = legacyResourceKeys.get(resource);
if (uri != null && !uri.isEmpty()) {
return ApplicationConstants.APP_PROTOCOL_PREFIX
- + ApplicationConstants.APP_REQUEST_PATH
+ + ApplicationConstants.APP_REQUEST_PATH + '/'
+ RESOURCE_REQUEST_PATH + connector.getUI().getUIId() + '/'
+ uri;
} else {
private static String getConnectorResourceBase(String filename,
ClientConnector connector) {
String uri = ApplicationConstants.APP_PROTOCOL_PREFIX
- + ApplicationConstants.APP_REQUEST_PATH
+ + ApplicationConstants.APP_REQUEST_PATH + '/'
+ ConnectorResource.CONNECTOR_REQUEST_PATH
+ connector.getUI().getUIId() + '/'
+ connector.getConnectorId() + '/' + encodeFileName(filename);
}
public static boolean isAppRequest(VaadinRequest request) {
- return hasPathPrefix(request, ApplicationConstants.APP_REQUEST_PATH);
+ return hasPathPrefix(request,
+ ApplicationConstants.APP_REQUEST_PATH + '/');
}
public static boolean isHeartbeatRequest(VaadinRequest request) {
// This indicates the whole page is generated by us (not embedded)
public static final String GENERATED_BODY_CLASSNAME = "v-generated-body";
- public static final String APP_REQUEST_PATH = "APP/";
+ public static final String APP_REQUEST_PATH = "APP";
public static final String UIDL_REQUEST_PATH = "UIDL/";
public static final String HEARTBEAT_REQUEST_PATH = "HEARTBEAT/";
public static final String DEPENDENCY_RESOURCE_PREFIX = APP_REQUEST_PATH
- + "DEPENDENCY";
+ + '/' + "DEPENDENCY";
public static final String APP_PROTOCOL_PREFIX = "app://";
public static final String DEPENDENCY_PROTOCOL_NAME = "dependency";
</tr>
<tr>
<td>assertTextPresent</td>
- <td>RequestURI=/run/com.vaadin.tests.requesthandlers.AppResource404/APP/12341234/</td>
+ <td>/APP/connector/0/4/asdfasdf can not be found</td>
<td></td>
</tr>
<tr>
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestsrequesthandlersAppResource404::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>mouseClickAndWait</td>
+ <td>vaadin=runcomvaadintestsrequesthandlersAppResource404::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[2]/VLink[0]/domChild[0]/domChild[0]</td>
+ <td>97,5</td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>/APP can not be found</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.requesthandlers.AppResource404</td>
<td></td>
</tr>
<tr>
<td>mouseClickAndWait</td>
- <td>vaadin=runcomvaadintestsrequesthandlersAppResource404::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLink[0]/domChild[0]/domChild[0]</td>
- <td>47,9</td>
+ <td>vaadin=runcomvaadintestsrequesthandlersAppResource404::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VLink[0]/domChild[0]/domChild[0]</td>
+ <td>99,7</td>
</tr>
<tr>
- <td>assertTextPresent</td>
- <td>RequestURI=/run/com.vaadin.tests.requesthandlers.AppResource404/APP/1//com/vaadin/tests/integration/se.gif</td>
+ <td>assertTextNotPresent</td>
+ <td>can not be found</td>
<td></td>
</tr>
</tbody></table>
package com.vaadin.tests.requesthandlers;
+import javax.servlet.http.HttpServletRequest;
+
import com.vaadin.server.ExternalResource;
+import com.vaadin.server.VaadinServletService;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.integration.FlagSeResource;
import com.vaadin.ui.Link;
final FlagSeResource resource = new FlagSeResource();
resource.setCacheTime(0);
+ HttpServletRequest request = VaadinServletService
+ .getCurrentServletRequest();
+ String baseUrl = request.getContextPath() + request.getServletPath();
+
addComponent(new Link("Existing resource", resource));
addComponent(new Link("Non-existing resource", new ExternalResource(
- getURL().toString() + "APP/12341234/")));
+ baseUrl + "/APP/connector/0/4/asdfasdf")));
+ addComponent(new Link("/APP url that should give 404",
+ new ExternalResource(baseUrl + "/APP")));
+ addComponent(new Link("/APPLE url that should go to UI providers",
+ new ExternalResource(baseUrl + "/APPLE")));
}
@Override