Merge pull request #453 from poppastring/gdpr-support

Gdpr support close #358
poppastring · Aug 30, 2020 · 1aff31d · 1aff31d
2 parents 39852ba + a316484
commit 1aff31d
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 14 deletions.
diff --git a/source/DasBlog All.sln b/source/DasBlog All.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DasBlog.Services", "DasBlog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DasBlog.Test.Integration", "DasBlog.Tests\DasBlog.Test.Integration\DasBlog.Test.Integration.csproj", "{48500D1A-9780-412B-81C1-9DD810FECCAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DasBlog.CLI", "DasBlog.CLI\DasBlog.CLI.csproj", "{3DEF6C9E-293A-4E41-9CEC-3466E3EEC754}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DasBlog.CLI", "DasBlog.CLI\DasBlog.CLI.csproj", "{3DEF6C9E-293A-4E41-9CEC-3466E3EEC754}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs b/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs
@@ -335,7 +335,9 @@ public interface ISiteConfig
 
 		bool UseAspxExtension { get; set; }
 
-        [XmlAnyElement]
+		bool CookieConsentEnabled { get; set; }
+
+		[XmlAnyElement]
         XmlElement[] anyElements { get; set; }
 
         [XmlAnyAttribute]

diff --git a/source/DasBlog.Services/ConfigFile/SiteConfig.cs b/source/DasBlog.Services/ConfigFile/SiteConfig.cs
@@ -206,5 +206,6 @@ public SiteConfig() { }
 		public ValidCommentTags [] ValidCommentTags { get; set; }
 
 		public bool UseAspxExtension { get; set; }
+		public bool CookieConsentEnabled { get; set; }
 	}
 }
diff --git a/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs b/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs
@@ -155,6 +155,7 @@ public class SiteConfigTest : ISiteConfig
 		public XmlAttribute[] anyAttributes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 		public bool ShowItemSummaryInAggregatedViews { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 		public bool UseAspxExtension { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+		public bool CookieConsentEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 		ValidCommentTags[] ISiteConfig.ValidCommentTags { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 	}
 }
diff --git a/source/DasBlog.Web.UI/Config/site.Development.config b/source/DasBlog.Web.UI/Config/site.Development.config
@@ -98,8 +98,6 @@
 
   <EnableBloggerApi>true</EnableBloggerApi>
 
-
-
   <EnableDailyReportEmail>false</EnableDailyReportEmail>
   <SendCommentsByEmail>false</SendCommentsByEmail>
 
@@ -110,6 +108,8 @@
   <UseSSLForSMTP>false</UseSSLForSMTP>
   <EnableSmtpAuthentication>true</EnableSmtpAuthentication>
 
+  <CookieConsentEnabled>false</CookieConsentEnabled>
+
   <!-- Settings below this line are not currently in use -->
   <!-- _________________________________________________ -->
   <CommentsAllowHtml>true</CommentsAllowHtml>

diff --git a/source/DasBlog.Web.UI/Config/site.config b/source/DasBlog.Web.UI/Config/site.config
@@ -110,6 +110,8 @@
   <UseSSLForSMTP>false</UseSSLForSMTP>
   <EnableSmtpAuthentication>true</EnableSmtpAuthentication>
 
+  <CookieConsentEnabled>false</CookieConsentEnabled>
+
   <!-- Settings below this line are not currently in use -->
   <!-- _________________________________________________ -->
   <CommentsAllowHtml>true</CommentsAllowHtml>

diff --git a/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs b/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs
@@ -246,6 +246,9 @@ public class SiteViewModel
 		[Description("")]
 		public bool UseAspxExtension { get; set; }
 
+		[DisplayName("Cookie Consent (GDPR Support)")]
+		[Description("Help meet some of the EU General Data Protection Regulation (GDPR) requirements")]
+		public bool CookieConsentEnabled { get; set; }
 
 		public bool EntryTitleAsLink { get; set; }
 		public bool ObfuscateEmail { get; set; }

diff --git a/source/DasBlog.Web.UI/Startup.cs b/source/DasBlog.Web.UI/Startup.cs
@@ -4,7 +4,13 @@
 using DasBlog.Managers.Interfaces;
 using DasBlog.Services.ActivityLogs;
 using DasBlog.Services.ConfigFile.Interfaces;
+using DasBlog.Services;
+using DasBlog.Services.ConfigFile;
 using DasBlog.Services.FileManagement;
+using DasBlog.Services.FileManagement.Interfaces;
+using DasBlog.Services.Scheduler;
+using DasBlog.Services.Site;
+using DasBlog.Services.Users;
 using DasBlog.Web.Identity;
 using DasBlog.Web.Settings;
 using DasBlog.Web.Mappers;
@@ -14,28 +20,22 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Quartz;
 using System;
 using System.IO;
 using System.Linq;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
-using DasBlog.Services.Site;
-using DasBlog.Services.ConfigFile;
-using DasBlog.Services.Users;
-using DasBlog.Services;
-using Microsoft.AspNetCore.HttpOverrides;
-using DasBlog.Services.FileManagement.Interfaces;
-using Microsoft.Extensions.Logging;
-using Quartz;
-using DasBlog.Services.Scheduler;
 
 namespace DasBlog.Web
 {
@@ -226,6 +226,14 @@ public void ConfigureServices(IServiceCollection services)
 				.AddControllersWithViews()
 				.AddRazorRuntimeCompilation();
 
+			services.Configure<CookiePolicyOptions>(options =>
+			{
+				bool.TryParse(Configuration.GetSection("CookieConsentEnabled").Value, out var flag);
+
+				options.CheckConsentNeeded = context => flag;
+				options.MinimumSameSitePolicy = SameSiteMode.None;
+			});
+
 			services.AddQuartz(q =>
 			{
 				q.SchedulerId = "Scheduler-Core";
@@ -311,6 +319,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IDasBlog
 			app.UseForwardedHeaders();
 
 			app.UseStaticFiles();
+			app.UseCookiePolicy();
 
 			app.UseStaticFiles(new StaticFileOptions()
 			{

diff --git a/source/DasBlog.Web.UI/Themes/darkly/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/darkly/_Layout.cshtml
@@ -51,6 +51,8 @@
 
     <div class="container body-content">
 
+        <partial name="_CookieConsentPartial" />
+
         @RenderBody()
 
         <div class="container text-center">

diff --git a/source/DasBlog.Web.UI/Themes/darkly/custom.css b/source/DasBlog.Web.UI/Themes/darkly/custom.css
@@ -11080,7 +11080,7 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .alert-info {
-    background-color: #3498DB
+    background-color: #00bc8c
 }
 
 .alert-warning {

diff --git a/source/DasBlog.Web.UI/Themes/dasblog/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/dasblog/_Layout.cshtml
@@ -54,6 +54,8 @@
 
     <div class="container body-content">
 
+        <partial name="_CookieConsentPartial" />
+
         @RenderBody()
 
         <div class="container text-center">

diff --git a/source/DasBlog.Web.UI/Themes/dasblog/custom.css b/source/DasBlog.Web.UI/Themes/dasblog/custom.css
@@ -39,3 +39,4 @@
         width: 100%;
         height: 100%;
     }
+
diff --git a/source/DasBlog.Web.UI/Themes/fulcrum/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/fulcrum/_Layout.cshtml
@@ -53,7 +53,11 @@
     </div>
 
     <div class="container body-content">
+
+        <partial name="_CookieConsentPartial" />
+
         @RenderBody()
+
         <footer>
             <div class="col-12 text-center">
                 <site-copyright />

diff --git a/source/DasBlog.Web.UI/Themes/journal/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/journal/_Layout.cshtml
@@ -51,6 +51,8 @@
 
     <div class="container body-content">
 
+        <partial name="_CookieConsentPartial" />
+
         @RenderBody()
 
         <div class="container text-center">

diff --git a/source/DasBlog.Web.UI/Themes/median/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/median/_Layout.cshtml
@@ -52,9 +52,13 @@
                     <div class="clear"></div>
                 </header>
 
+                <partial name="_CookieConsentPartial" />
+
                 <section class="row">
+
                     <div class="col-sm-12">
                         <section class="row">
+
                             <div class="col-md-12 col-lg-8">
                                 @RenderBody()
                             </div>

diff --git a/source/DasBlog.Web.UI/Themes/median/custom.css b/source/DasBlog.Web.UI/Themes/median/custom.css
@@ -812,3 +812,7 @@ table, td, tr, th, thead {
   background: #f7f7f7; }
   .error-page h1 {
     font-size: 4rem; }
+
+.alert-info {
+    background-color: #7376df;
+}
diff --git a/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml b/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml
@@ -431,6 +431,13 @@
 
     </div>
 
+    <div class="dbc-form-check row">
+
+        @Html.LabelFor(m => @Model.SiteConfig.CookieConsentEnabled, null, new { @class = "dbc-col-form-label col-3" })
+        @Html.CheckBoxFor(m => @Model.SiteConfig.CookieConsentEnabled, new { @class = "dbc-form-check-input" })
+
+    </div>
+
     <div class="dbc-form-check row">
 
         @Html.LabelFor(m => @Model.SiteConfig.UseAspxExtension, null, new { @class = "dbc-col-form-label col-3" })

diff --git a/source/DasBlog.Web.UI/Views/Shared/_CookieConsentPartial.cshtml b/source/DasBlog.Web.UI/Views/Shared/_CookieConsentPartial.cshtml
@@ -0,0 +1,25 @@
+@using Microsoft.AspNetCore.Http.Features
+
+@{
+    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
+    var showBanner = !consentFeature?.CanTrack ?? false;
+    var cookieString = consentFeature?.CreateConsentCookie();
+}
+
+@if (showBanner)
+{
+    <div id="cookieConsent" class="alert alert-info alert-dismissible fade show" role="alert">
+        This website uses cookies to ensure you get the best experience on our website. <a href="http://cookiesandyou.com/">Learn More</a>.
+        <button type="button" class="accept-policy close" data-dismiss="alert" aria-label="Close" data-cookie-string="@cookieString">
+            <span aria-hidden="true">Accept</span>
+        </button>
+    </div>
+    <script>
+        (function () {
+            var button = document.querySelector("#cookieConsent button[data-cookie-string]");
+            button.addEventListener("click", function (event) {
+                document.cookie = button.dataset.cookieString;
+            }, false);
+        })();
+    </script>
+}