Consolidated XFrameOptions.

NWebsec · Mar 24, 2018 · 1fa2c30 · 1fa2c30
1 parent 884a42c
commit 1fa2c30
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 87 deletions.
diff --git a/src/NWebsec.AspNet.Owin/Middleware/XfoMiddleware.cs b/src/NWebsec.AspNet.Owin/Middleware/XfoMiddleware.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using NWebsec.Core.Common.HttpHeaders;
 using NWebsec.Core.Common.HttpHeaders.Configuration;
+using NWebsec.Core.Common.Middleware.Options;
 using NWebsec.Owin.Core;
 
 namespace NWebsec.Owin.Middleware

diff --git a/src/NWebsec.AspNetCore.Middleware/IFluentXFrameOptions.cs b/src/NWebsec.AspNetCore.Middleware/IFluentXFrameOptions.cs
diff --git a/src/NWebsec.AspNetCore.Middleware/Middleware/XfoMiddleware.cs b/src/NWebsec.AspNetCore.Middleware/Middleware/XfoMiddleware.cs
@@ -4,6 +4,7 @@
 using NWebsec.AspNetCore.Core.Extensions;
 using NWebsec.Core.Common.HttpHeaders;
 using NWebsec.Core.Common.HttpHeaders.Configuration;
+using NWebsec.Core.Common.Middleware.Options;
 
 namespace NWebsec.AspNetCore.Middleware.Middleware
 {

diff --git a/src/NWebsec.AspNetCore.Middleware/XFrameOptions.cs b/src/NWebsec.AspNetCore.Middleware/XFrameOptions.cs
diff --git a/...ebsec.AspNet.Owin/IFluentXFrameOptions.cs → ...iddleware/Options/IFluentXFrameOptions.cs b/...ebsec.AspNet.Owin/IFluentXFrameOptions.cs → ...iddleware/Options/IFluentXFrameOptions.cs
@@ -2,7 +2,7 @@
 
 using NWebsec.Core.Common.Fluent;
 
-namespace NWebsec.Owin
+namespace NWebsec.Core.Common.Middleware.Options
 {
     /// <summary>
     /// Fluent interface to configure options for X-Frame-Options.

diff --git a/src/NWebsec.AspNet.Owin/XFrameOptions.cs → ...hared/Middleware/Options/XFrameOptions.cs b/src/NWebsec.AspNet.Owin/XFrameOptions.cs → ...hared/Middleware/Options/XFrameOptions.cs
@@ -3,11 +3,11 @@
 using NWebsec.Core.Common.HttpHeaders;
 using NWebsec.Core.Common.HttpHeaders.Configuration;
 
-namespace NWebsec.Owin
+namespace NWebsec.Core.Common.Middleware.Options
 {
     public class XFrameOptions : IXFrameOptionsConfiguration, IFluentXFrameOptions
     {
-        internal XFrameOptions()
+        public XFrameOptions()
         {
             Policy = XfoPolicy.Disabled;
         }

diff --git a/src/NWebsec.Core.Shared/NWebsec.Core.Shared.projitems b/src/NWebsec.Core.Shared/NWebsec.Core.Shared.projitems
@@ -68,9 +68,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)HttpHeaders\XfoPolicy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HttpHeaders\XXssPolicy.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\IFluentReferrerPolicyOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\IFluentXFrameOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\IFluentXRobotsTagOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\IFluentXXssProtectionOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\ReferrerPolicyOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\XFrameOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\XRobotsTagOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Middleware\Options\XXssProtectionOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)NWebsecContext.cs" />

diff --git a/test/NWebsec.AspNetCore.Middleware.Tests/XFrameOptionsTests.cs b/test/NWebsec.AspNetCore.Middleware.Tests/XFrameOptionsTests.cs
diff --git a/...c.AspNet.Owin.Tests/XFrameOptionsTests.cs → .../Middleware/Options/XFrameOptionsTests.cs b/...c.AspNet.Owin.Tests/XFrameOptionsTests.cs → .../Middleware/Options/XFrameOptionsTests.cs
@@ -1,10 +1,10 @@
 // Copyright (c) André N. Klingsheim. See License.txt in the project root for license information.
 
 using NWebsec.Core.Common.HttpHeaders;
-using NWebsec.Owin;
+using NWebsec.Core.Common.Middleware.Options;
 using Xunit;
 
-namespace NWebsec.AspNet.Owin.Tests
+namespace NWebsec.Core.SharedProject.Tests.Middleware.Options
 {
     public class XFrameOptionsTests
     {