Added CefCustomScheme.IsCspBypassing

Resolves cefsharp#2038
yuanzp · Aug 29, 2017 · 7e2594d · 7e2594d
1 parent b82ce07
commit 7e2594d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -498,7 +498,7 @@ namespace CefSharp
     {
         for each (CefCustomScheme^ scheme in _schemes->AsReadOnly())
         {
-            registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, false);
+            registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, scheme->IsCSPBypassing);
         }
     }
 }
diff --git a/CefSharp.Core/Internals/CefSharpApp.h b/CefSharp.Core/Internals/CefSharpApp.h
@@ -74,7 +74,8 @@ namespace CefSharp
                     argument += (scheme->IsLocal ? "T" : "F") + "|";
                     argument += (scheme->IsDisplayIsolated ? "T" : "F") + "|";
                     argument += (scheme->IsSecure ? "T" : "F") + "|";
-                    argument += (scheme->IsCorsEnabled ? "T" : "F") + ";";
+                    argument += (scheme->IsCorsEnabled ? "T" : "F") + "|";
+                    argument += (scheme->IsCSPBypassing ? "T" : "F") + ";";
                 }
 
                 argument = argument->TrimEnd(';');
@@ -117,7 +118,7 @@ namespace CefSharp
         {
             for each (CefCustomScheme^ scheme in _cefSettings->CefCustomSchemes)
             {
-                auto success = registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, false);
+                auto success = registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, scheme->IsCSPBypassing);
 
                 if (!success)
                 {

diff --git a/CefSharp/CefCustomScheme.cs b/CefSharp/CefCustomScheme.cs
@@ -87,6 +87,12 @@ public sealed class CefCustomScheme
         /// </summary>
         public bool IsCorsEnabled { get; set; }
 
+        /// <summary>
+        /// If true the scheme can bypass Content-Security-Policy(CSP) checks. 
+        /// This value should be false in most cases where IsStandard is true.
+        /// </summary>
+        public bool IsCSPBypassing { get; set; }
+
         /// <summary>
         /// Factory Class that creates <see cref="IResourceHandler"/> instances
         /// for handling scheme requests.
@@ -103,6 +109,7 @@ public CefCustomScheme()
             IsDisplayIsolated = false;
             IsSecure = true;
             IsCorsEnabled = true;
+            IsCSPBypassing = false;
         }
 
         /// <summary>
@@ -128,7 +135,8 @@ public static List<CefCustomScheme> ParseCommandLineArguments(IEnumerable<string
                         IsLocal = tokens[2] == "T",
                         IsDisplayIsolated = tokens[3] == "T",
                         IsSecure = tokens[4] == "T",
-                        IsCorsEnabled = tokens[5] == "T"
+                        IsCorsEnabled = tokens[5] == "T",
+                        IsCSPBypassing = tokens[6] == "T"
                     };
                     customSchemes.Add(customScheme);
                 });