Skip to content

Commit

Permalink
fix(webserver): use the canonicalPath when serving local directories …
Browse files Browse the repository at this point in the history
…to get around jetty's simlink checks
  • Loading branch information
notthetup authored and mchitre committed Feb 3, 2023
1 parent b8b6909 commit 4bdc4ab
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions src/main/java/org/arl/fjage/connectors/WebServer.java
Expand Up @@ -287,15 +287,20 @@ public void add(String context, String resource) {
* @param cacheControl cache control header.
*/
public void add(String context, File dir, String cacheControl) {
ContextHandler handler = new ContextHandler(context);
ResourceHandler resHandler = new ResourceHandler();
resHandler.setResourceBase(dir.getAbsolutePath());
resHandler.setWelcomeFiles(new String[]{ "index.html" });
resHandler.setDirectoriesListed(false);
resHandler.setCacheControl(cacheControl);
handler.setHandler(resHandler);
staticContexts.put(context, handler);
add(handler);
try {
ContextHandler handler = new ContextHandler(context);
ResourceHandler resHandler = new ResourceHandler();
resHandler.setResourceBase(dir.getCanonicalPath());
resHandler.setWelcomeFiles(new String[]{ "index.html" });
resHandler.setDirectoriesListed(false);
resHandler.setCacheControl(cacheControl);
handler.setHandler(resHandler);
staticContexts.put(context, handler);
add(handler);
}catch (IOException ex){
log.warning("Unable to find the directory : " + dir.toString());
return;
}
}

/**
Expand Down

0 comments on commit 4bdc4ab

Please sign in to comment.