Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v4: fix unsecure path #250

Open
wants to merge 1 commit into
base: v4/dev
Choose a base branch
from
Open

v4: fix unsecure path #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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