Add Redis and Rabbit MQ clients to list of approved clients

Author: mythz

src/ServiceStack.Text/LicenseUtils.cs

@@ -2,6 +2,7 @@
 // License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using ServiceStack.Text;
@@ -350,14 +351,32 @@ public void Dispose()
             }
         }
 
+        static class _approved
+        {
+            internal static readonly HashSet<string> __tokens = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                "ServiceStack.ServiceClientBase+AccessToken",
+                "ServiceStack.Messaging.RedisMessageProducer+AccessToken",
+                "ServiceStack.Messaging.RedisMessageQueueClient+AccessToken",
+                "ServiceStack.Messaging.RedisMessageProducer+AccessToken",
+            };
+
+            internal static readonly HashSet<string> __dlls = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                "ServiceStack.Client.dll",
+                "ServiceStack.RabbitMq.dll",
+            };
+        }
+
         public static IDisposable RequestAccess(object accessToken, LicenseFeature srcFeature, LicenseFeature requestedAccess)
         {
             var accessType = accessToken.GetType();
+
             if (srcFeature != LicenseFeature.Client || requestedAccess != LicenseFeature.Text
-                || accessToken == null || accessType.FullName != "ServiceStack.ServiceClientBase+AccessToken")
+                || accessToken == null || !_approved.__tokens.Contains(accessType.FullName))
                 throw new LicenseException(ErrorMessages.UnauthorizedAccessRequest);
 
-            PclExport.Instance.VerifyInAssembly(accessType, "ServiceStack.Client.dll");
+            PclExport.Instance.VerifyInAssembly(accessType, _approved.__dlls);
 
             return new AccessToken(requestedAccess);
         }

src/ServiceStack.Text/PclExport.Net40.cs

@@ -461,9 +461,9 @@ public override LicenseKey VerifyLicenseKeyText(string licenseKeyText)
             return key;
         }
 
-        public override void VerifyInAssembly(Type accessType, string assemblyName)
+        public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
         {
-            if (!assemblyName.EqualsIgnoreCase(accessType.Assembly.ManifestModule.Name)) //might get merged/mangled on alt platforms
+            if (!assemblyNames.Contains(accessType.Assembly.ManifestModule.Name)) //might get merged/mangled on alt platforms
                 throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);
         }
 

src/ServiceStack.Text/PclExport.cs

@@ -406,7 +406,7 @@ public virtual LicenseKey VerifyLicenseKeyText(string licenseKeyText)
             return licenseKeyText.ToLicenseKey();
         }
 
-        public virtual void VerifyInAssembly(Type accessType, string assemblyName)
+        public virtual void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
         {
         }