Relax VerifyInAssembly to also test for Assembly Location

mythz · mythz · commit 74a6874ed2b4 · 2014-07-15T13:40:16.000-04:00
diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs
@@ -463,8 +463,13 @@ public override LicenseKey VerifyLicenseKeyText(string licenseKeyText)
 
         public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
         {
-            if (!assemblyNames.Contains(accessType.Assembly.ManifestModule.Name)) //might get merged/mangled on alt platforms
-                throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);
+            //might get merged/mangled on alt platforms (also issues with Smart Assembly)
+            if (assemblyNames.Contains(accessType.Assembly.ManifestModule.Name)) 
+                return;
+            if (assemblyNames.Contains(accessType.Assembly.Location.SplitOnLast(Path.DirectorySeparatorChar).Last()))
+                return;
+
+            throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);
         }
 
         public override void BeginThreadAffinity()

Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,13 @@ public override LicenseKey VerifyLicenseKeyText(string licenseKeyText)`
`463`	`463`
`464`	`464`	`public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)`
`465`	`465`	`{`
`466`		`- if (!assemblyNames.Contains(accessType.Assembly.ManifestModule.Name)) //might get merged/mangled on alt platforms`
`467`		`- throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);`
	`466`	`+ //might get merged/mangled on alt platforms (also issues with Smart Assembly)`
	`467`	`+ if (assemblyNames.Contains(accessType.Assembly.ManifestModule.Name))`
	`468`	`+ return;`
	`469`	`+ if (assemblyNames.Contains(accessType.Assembly.Location.SplitOnLast(Path.DirectorySeparatorChar).Last()))`
	`470`	`+ return;`
	`471`	`+`
	`472`	`+ throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);`
`468`	`473`	`}`
`469`	`474`
`470`	`475`	`public override void BeginThreadAffinity()`