Fixed: Prevent FreeMarker Template Injection (SSTI)
(OFBIZ-11709)
Since Freemarker 2.3.17 a known solution to these issues is to register a
TemplateClassResolver in Freemarker configuration in order to limit which
TemplateModels can be instantiated in the templates. The predefined resolver
SAFER_RESOLVER doesn't allow to instantiate the Execute class[4].
So the solution is to add the line
newConfig.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
in FreeMarkerWorker.java
Conflicts handled by hand
This commit is contained in:
@@ -35,6 +35,7 @@ import java.util.TimeZone;
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.ofbiz.base.component.ComponentConfig;
|
||||
import org.apache.ofbiz.base.location.FlexibleLocation;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
@@ -49,6 +50,7 @@ import freemarker.cache.StringTemplateLoader;
|
||||
import freemarker.cache.TemplateLoader;
|
||||
import freemarker.cache.URLTemplateLoader;
|
||||
import freemarker.core.Environment;
|
||||
import freemarker.core.TemplateClassResolver;
|
||||
import freemarker.ext.beans.BeanModel;
|
||||
import freemarker.ext.beans.BeansWrapper;
|
||||
import freemarker.ext.beans.BeansWrapperBuilder;
|
||||
@@ -115,6 +117,7 @@ public final class FreeMarkerWorker {
|
||||
} catch (TemplateException e) {
|
||||
Debug.logError("Unable to set date/time and number formats in FreeMarker: " + e, module);
|
||||
}
|
||||
newConfig.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
|
||||
// Transforms properties file set up as key=transform name, property=transform class name
|
||||
ClassLoader loader = Thread.currentThread().getContextClassLoader();
|
||||
Enumeration<URL> resources;
|
||||
|
||||
Reference in New Issue
Block a user