Merge branch '1.12.3'

Author: ethan-sparkdevnetwork

RockWeb/App_Code/BundleConfig.cs

@@ -30,12 +30,14 @@ public static void RegisterBundles( BundleCollection bundles )
     {
         // start with a clean bundles (this seems to have fixed the javascript errors that would occur on the first time you debug after opening the solution)
         bundles.ResetAll();
-        
+
         bundles.Add( new ScriptBundle( "~/Scripts/Bundles/RockJQueryLatest" ).Include(
-            "~/Scripts/jquery-3.3.1.min.js",
-            "~/Scripts/jquery-migrate-3.0.0.min.js" ) );
+            "~/Scripts/jquery-3.5.1.min.js",
+            "~/Scripts/jquery-migrate-3.1.0.min.js" ) );
 
-        bundles.Add( new ScriptBundle( "~/bundles/WebFormsJs" ).Include(
+        bundles.Add( new ScriptBundle( "~/Scripts/Bundles/WebFormsJs" ).Include(
+            "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
+            "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js",
             "~/Scripts/WebForms/WebForms.js",
             "~/Scripts/WebForms/WebUIValidation.js",
             "~/Scripts/WebForms/MenuStandards.js",
@@ -46,7 +48,7 @@ public static void RegisterBundles( BundleCollection bundles )
             "~/Scripts/WebForms/WebParts.js" ) );
 
         bundles.Add( new ScriptBundle( "~/Scripts/Bundles/RockLibs" ).Include(
-            "~/Scripts/jquery-ui-1.10.4.custom.min.js",
+            "~/Scripts/jquery-ui-1.12.1.custom.min.js",
             "~/Scripts/bootstrap.min.js",
             "~/Scripts/bootstrap-timepicker.js",
             "~/Scripts/bootstrap-datepicker.js",
@@ -60,7 +62,7 @@ public static void RegisterBundles( BundleCollection bundles )
             "~/Scripts/jquery.stickytableheaders.js",
             "~/Scripts/iscroll.js",
             "~/Scripts/jcrop.min.js",
-            "~/Scripts/ResizeSensor.js",       
+            "~/Scripts/ResizeSensor.js",
             "~/Scripts/ion.rangeSlider/js/ion-rangeSlider/ion.rangeSlider.min.js",
             "~/Scripts/Rock/Extensions/*.js" ) );
 
@@ -77,14 +79,19 @@ public static void RegisterBundles( BundleCollection bundles )
 
         // Creating a separate "Admin" bundle specifically for JS functionality that needs
         // to be included for administrative users
-        bundles.Add( new ScriptBundle( "~/Scripts/Bundles/RockAdmin" ).Include( 
+        bundles.Add( new ScriptBundle( "~/Scripts/Bundles/RockAdmin" ).Include(
             "~/Scripts/Rock/Admin/*.js" ) );
 
         // Creating a separate "RockHtmlEditorPlugins" bundle specifically for JS functionality that needs
         // to be included for HtmlEditor
         bundles.Add( new ScriptBundle( "~/Scripts/Bundles/RockHtmlEditorPlugins" ).Include(
             "~/Scripts/summernote/plugins/*.js" ) );
 
+        // Creating a separate "StructureContentEditorPlugins" bundle specifically for JS functionality that needs
+        // to be included for HtmlEditor
+        bundles.Add( new ScriptBundle( "~/Scripts/Bundles/StructureContentEditorPlugins" ).Include(
+            "~/Scripts/editor.js/*.js" ) );
+
         // make sure the ConcatenationToken is what we want.  This is supposed to be the default, but it occasionally was an empty string.
         foreach ( var bundle in bundles )
         {

RockWeb/App_Code/FileUploader.ashx.cs

@@ -57,7 +57,7 @@ public virtual void ProcessRequest( HttpContext context )
             if ( !context.User.Identity.IsAuthenticated )
             {
                 // If not, see if there's a valid token
-                string authToken = context.Request.Headers["Authorization-Token"];
+                string authToken = context.Request.Headers[Rock.Rest.HeaderTokens.AuthorizationToken];
                 if ( string.IsNullOrWhiteSpace( authToken ) )
                 {
                     authToken = context.Request.Params["apikey"];
@@ -186,9 +186,17 @@ private void ProcessContentFile( HttpContext context, HttpPostedFile uploadedFil
             string untrustedFolderPath = context.Request.Form["folderPath"] ?? string.Empty;
             string encryptedRootFolder = context.Request.QueryString["rootFolder"];
 
-            /* Scrub the file name */
+            // Scrub the file name 
 
-            string scrubedFileName = ScrubFileName( untrustedFileName );
+            /*
+	            3/17/2020 - JME 
+	            And remove spaces, I did not add the removal of spaces to the scrub as the scrub logic
+                has existed for a while and is used in other places that may not want that. We can move
+                this to the scrub should we desire in the future.
+
+                Reason: The theme editor needs files with no spaces to be used in CSS
+            */
+            string scrubedFileName = ScrubFileName( untrustedFileName ).Replace(" ", "_");
 
             if ( string.IsNullOrWhiteSpace( scrubedFileName ) )
             {
@@ -287,7 +295,7 @@ private void ProcessContentFile( HttpContext context, HttpPostedFile uploadedFil
         /// <summary>
         /// Dictionary of deprecated or incorrect mime types and what they should be mapped to instead
         /// </summary>
-        private Dictionary<string, string> _mimeTypeRemap = new Dictionary<string, string>
+        private readonly Dictionary<string, string> _mimeTypeRemap = new Dictionary<string, string>
         {
             { "text/directory", "text/vcard" },
             { "text/directory; profile=vCard", "text/vcard" },
@@ -336,7 +344,18 @@ private void ProcessBinaryFile( HttpContext context, HttpPostedFile uploadedFile
             binaryFile.BinaryFileTypeId = binaryFileType.Id;
             binaryFile.MimeType = uploadedFile.ContentType;
             binaryFile.FileSize = uploadedFile.ContentLength;
-            binaryFile.FileName = Path.GetFileName( uploadedFile.FileName );
+
+            /*
+             * 2020-02-11 BJW
+             *
+             * The ReplaceSpecialCharacters extension call was added to remove characters that are outside the legal character range.
+             * For example, if a file is moved from a Linux system, it might have a colon that manifests as a char with int value
+             * in the thousands range (far outside typical character range. This causes unpredictable behavior with the various file
+             * storage providers (GCP might handle it differently than the database storage provider). In order to add consistency
+             * we simply replace any of these characters with an underscore. This includes spaces, which are normal, but are security
+             * risks if they fall in certain parts of the filename.
+             */
+            binaryFile.FileName = Path.GetFileName( uploadedFile.FileName.ReplaceSpecialCharacters( "_" ) );
 
             if ( _mimeTypeRemap.ContainsKey( binaryFile.MimeType ) )
             {
@@ -413,7 +432,17 @@ public string ScrubFileName( string untrustedFileName )
             // Get the base filename
             string baseFileName = Path.GetFileName( untrustedFileName );
 
-            // Scrub invalid file characters
+            /*
+             * 2020-03-25 JME
+             *
+             * While C# has a listing of invalid file characters (used below), we added a few more of our own to help
+             * with dealing with linking easily to files that have been uploaded.
+             *
+             * Specific Use Case: Theme Editor was having issues when using uploaded files from the Image Upload control
+             */
+            baseFileName = baseFileName.Replace( "(", "" ).Replace( ")", "" );
+
+            // Scrub base invalid file characters
             return Regex.Replace( baseFileName, "[" + Regex.Escape( Path.GetInvalidFileNameChars().ToString() ) + "]", string.Empty, RegexOptions.CultureInvariant );
         }
 
@@ -425,7 +454,7 @@ public string ScrubFileName( string untrustedFileName )
         public string ScrubFilePath( string untrustedFilePath )
         {
             // Scrub invalid path characters
-            return Regex.Replace( untrustedFilePath, "[" + Regex.Escape( Path.GetInvalidPathChars().ToString() ) + "]", string.Empty, RegexOptions.CultureInvariant );
+            return Regex.Replace( untrustedFilePath.Trim(), "[" + Regex.Escape( Path.GetInvalidPathChars().ToString() ) + "]", string.Empty, RegexOptions.CultureInvariant );
         }
     }
 }

RockWeb/App_Code/GetChannelFeed.cs

@@ -16,6 +16,7 @@
 //
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Web;
 using Rock;
@@ -42,7 +43,16 @@ public void ProcessRequest( HttpContext context )
             request = context.Request;
             response = context.Response;
 
-            RockContext rockContext = new RockContext();
+            string cacheKey = "Rock:GetChannelFeed:" + request.RawUrl;
+            var contentCache = RockCache.Get( cacheKey );
+            var mimeTypeCache = RockCache.Get( cacheKey + ":MimeType" );
+            if ( mimeTypeCache != null && contentCache != null )
+            {
+                response.ContentType = ( string ) mimeTypeCache;
+                response.Write( ( string ) contentCache );
+                response.StatusCode = 200;
+                return;
+            }
 
             if ( request.HttpMethod != "GET" && request.HttpMethod != "HEAD" )
             {
@@ -71,7 +81,7 @@ public void ProcessRequest( HttpContext context )
                 return;
             }
 
-            ContentChannel channel = new ContentChannelService( rockContext ).Queryable( "ContentChannelType" ).FirstOrDefault( c => c.Id == channelId.Value );
+            var channel = ContentChannelCache.Get( channelId.Value );
 
             if ( channel == null )
             {
@@ -160,13 +170,17 @@ public void ProcessRequest( HttpContext context )
             }
 
             // get channel items
+            var rockContext = new RockContext();
             ContentChannelItemService contentService = new ContentChannelItemService( rockContext );
 
-            var content = contentService.Queryable( "ContentChannelType" )
-                            .Where( c =>
-                                c.ContentChannelId == channel.Id &&
-                                ( c.Status == ContentChannelItemStatus.Approved || c.ContentChannel.ContentChannelType.DisableStatus || c.ContentChannel.RequiresApproval == false ) &&
-                                c.StartDateTime <= RockDateTime.Now );
+            var content = contentService.Queryable().AsNoTracking().Where( c =>
+                c.ContentChannelId == channel.Id &&
+                c.StartDateTime <= RockDateTime.Now );
+
+            if ( !channel.ContentChannelType.DisableStatus && channel.RequiresApproval )
+            {
+                content = content.Where( cci => cci.Status == ContentChannelItemStatus.Approved );
+            }
 
             if ( channel.ContentChannelType.DateRangeType == ContentChannelDateType.DateRange )
             {
@@ -189,15 +203,15 @@ public void ProcessRequest( HttpContext context )
                 content = content.OrderByDescending( c => c.StartDateTime );
             }
 
-            content = content.Take( rssItemLimit );
+            var contentItems = content.Take( rssItemLimit ).ToList();
 
-            foreach ( var item in content )
+            foreach ( var item in contentItems )
             {
                 item.Content = item.Content.ResolveMergeFields( mergeFields );
 
                 // resolve any relative links
                 var globalAttributes = GlobalAttributesCache.Get();
-                string publicAppRoot = globalAttributes.GetValue( "PublicApplicationRoot" ).EnsureTrailingForwardslash();
+                string publicAppRoot = globalAttributes.GetValue( "PublicApplicationRoot" );
                 item.Content = item.Content.Replace( @" src=""/", @" src=""" + publicAppRoot );
                 item.Content = item.Content.Replace( @" href=""/", @" href=""" + publicAppRoot );
 
@@ -209,12 +223,23 @@ public void ProcessRequest( HttpContext context )
                 }
             }
 
-            mergeFields.Add( "Items", content );
+            mergeFields.Add( "Items", contentItems );
 
             mergeFields.Add( "RockVersion", Rock.VersionInfo.VersionInfo.GetRockProductVersionNumber() );
 
-            response.Write( rssTemplate.ResolveMergeFields( mergeFields ) );
+            var outputContent = rssTemplate.ResolveMergeFields( mergeFields );
+            response.Write( outputContent );
 
+            var cacheDuration = dvRssTemplate.GetAttributeValue( "CacheDuration" ).AsInteger();
+            if ( cacheDuration > 0 )
+            {
+                var expiration = RockDateTime.Now.AddMinutes( cacheDuration );
+                if ( expiration > RockDateTime.Now )
+                {
+                    RockCache.AddOrUpdate( cacheKey + ":MimeType", null, response.ContentType, expiration );
+                    RockCache.AddOrUpdate( cacheKey, null, outputContent, expiration );
+                };
+            }
         }
 
         /// <summary>

RockWeb/App_Code/GetCommunication.ashx.cs

@@ -52,12 +52,11 @@ public bool IsReusable
         /// <param name="context">An <see cref="T:System.Web.HttpContext" /> object that provides references to the intrinsic server objects (for example, Request, Response, Session, and Server) used to service HTTP requests.</param>
         public void ProcessRequest( HttpContext context )
         {
-
-            int? communicationId = context.Request.QueryString["c"].AsIntegerOrNull();
-            if ( communicationId.HasValue )
+            Guid? communicationGuid = context.Request.QueryString["c"].AsGuidOrNull();
+            if ( communicationGuid.HasValue )
             {
                 var rockContext = new RockContext();
-                var communication = new CommunicationService( rockContext ).Get( communicationId.Value );
+                var communication = new CommunicationService( rockContext ).Get( communicationGuid.Value );
 
                 if ( communication != null )
                 {
@@ -142,7 +141,7 @@ public void ProcessRequest( HttpContext context )
 
                             UAParser.ClientInfo client = UAParser.Parser.GetDefault().Parse( userAgent );
                             var clientOs = client.OS.ToString();
-                            var clientBrowser = client.UserAgent.ToString();
+                            var clientBrowser = client.UA.ToString();
                             var clientType = InteractionDeviceType.GetClientType( userAgent );
 
                             interactionService.AddInteraction( interactionComponent.Id, recipient.Id, "Opened", "", recipient.PersonAliasId, RockDateTime.Now, clientBrowser, clientOs, clientType, userAgent, ipAddress, null );