Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/Our.ModelsBuilder/Options/OptionsWebConfigReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public static void ConfigureOptions(ModelsBuilderOptions options)
var directory = GetSetting("ModelsDirectory", "");
if (string.IsNullOrWhiteSpace(directory))
{

options.ModelsDirectory = HostingEnvironment.IsHosted
? HostingEnvironment.MapPath(options.ModelsDirectory)
: options.ModelsDirectory.TrimStart("~/");
Expand Down Expand Up @@ -161,8 +162,15 @@ internal static string GetModelsDirectory(string root, string config, bool accep

if (config.StartsWith("~/"))
{
var isOutside = config.StartsWith("~/..");
if (isOutside && !acceptUnsafe)
throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");

var path = isOutside
? Path.GetFullPath(Path.Combine(HostingEnvironment.MapPath("~/") + config.TrimStart("~/")))
: HostingEnvironment.MapPath(config);
var dir = HostingEnvironment.IsHosted
? HostingEnvironment.MapPath(config)
? path
: Path.Combine(root, config.TrimStart("~/"));

if (dir == null) throw new Exception("panic");
Expand All @@ -171,11 +179,7 @@ internal static string GetModelsDirectory(string root, string config, bool accep
// segments in path, eg '../../foo.tmp' - it may throw a SecurityException
// if the combined path reaches illegal parts of the filesystem
dir = Path.GetFullPath(dir);
root = Path.GetFullPath(root);

if (!dir.StartsWith(root) && !acceptUnsafe)
throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");


return dir;
}

Expand Down