Merge branch 'master' into master

den-run-ai · web-flow · commit c2cd097355c4 · 2018-06-12T00:50:59.000-05:00
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -395,6 +395,14 @@ public static Assembly AddReference(string name)
             {
                 assembly = AssemblyManager.LoadAssemblyFullPath(name);
             }
+            if (System.IO.File.Exists(name))
+            {
+                var zone = System.Security.Policy.Zone.CreateFromUrl(name);
+                if (zone.SecurityZone != System.Security.SecurityZone.MyComputer)
+                {
+                     throw new Exception($"File is blocked (NTFS Security)");
+                }
+            }
             if (assembly == null)
             {
                 throw new FileNotFoundException($"Unable to find assembly '{name}'.");

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,14 @@ public static Assembly AddReference(string name)`
`395`	`395`	`{`
`396`	`396`	`assembly = AssemblyManager.LoadAssemblyFullPath(name);`
`397`	`397`	`}`
	`398`	`+ if (System.IO.File.Exists(name))`
	`399`	`+ {`
	`400`	`+ var zone = System.Security.Policy.Zone.CreateFromUrl(name);`
	`401`	`+ if (zone.SecurityZone != System.Security.SecurityZone.MyComputer)`
	`402`	`+ {`
	`403`	`+ throw new Exception($"File is blocked (NTFS Security)");`
	`404`	`+ }`
	`405`	`+ }`
`398`	`406`	`if (assembly == null)`
`399`	`407`	`{`
`400`	`408`	`throw new FileNotFoundException($"Unable to find assembly '{name}'.");`