Merge pull request #147 from AndyButland/u4-2958

Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor

src/Umbraco.Web.UI/install/steps/Database.ascx.designer.cs

@@ -101,7 +101,7 @@ namespace Umbraco.Web.UI.Install.Steps {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox DatabaseName;
-        
+
         /// <summary>
         /// DatabaseIntegratedSecurity control.
         /// </summary>

src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs

@@ -114,11 +114,18 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
 					NameTxt.Text = OriginalFileName;
 					var file = IOHelper.MapPath(SystemDirectories.MvcViews.EnsureEndsWith('/') + OriginalFileName);
 
+                    // validate file path
+                    if (file.StartsWith(IOHelper.MapPath(SystemDirectories.MvcViews.EnsureEndsWith('/')))) {
+
 					using (var sr = File.OpenText(file))
 					{
 						var s = sr.ReadToEnd();
 						editorSource.Text = s;
-					}					
+					}
+                    } else
+                    {
+                        throw new ArgumentException("Couldn't open file - illegal path");
+                    }
 				
 				}							
 			}

src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs

@@ -60,7 +60,11 @@ namespace umbraco.presentation.umbraco.Search
             }
             else
             {
-                var operation = criteria.Field("__nodeName", txt.MultipleCharacterWildcard());
+				var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();
+				var operation = criteria.GroupedOr(new[] { "__nodeName" }, new[] { words[0] });
+				words.RemoveAt(0);
+				foreach (var word in words)
+					operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });
 
                 // ensure the user can only find nodes they are allowed to see
                 if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0)

src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMemberType.aspx.cs

@@ -64,7 +64,7 @@ namespace umbraco.cms.presentation.members
 				}
 				handled = true;
 			}
-			setupExtraEditorControls();
+			
 			return handled;
 		}
 		private void setupExtraEditorControls(){

src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs

@@ -89,13 +89,24 @@ namespace umbraco.webservices
 	    {
             //NOTE: The legacy code threw an exception so will continue to do that.
 	        AuthorizeRequest(DefaultApps.settings.ToString(), true);
-            
-	        var templateFile = 
-                System.IO.File.OpenText(IOHelper.MapPath(SystemDirectories.Umbraco + "/scripting/templates/cshtml/" + templateId));
-            var content = templateFile.ReadToEnd();
-            templateFile.Close();
 
-            return content;
+	        var snippetPath = SystemDirectories.Umbraco + "/scripting/templates/cshtml/";
+	        var filePath = IOHelper.MapPath(snippetPath + templateId);
+
+            //Directory check.. only allow files in script dir and below to be edited
+            if (filePath.StartsWith(IOHelper.MapPath(snippetPath)))
+            {
+                var templateFile =
+                    System.IO.File.OpenText(filePath);
+                var content = templateFile.ReadToEnd();
+                templateFile.Close();
+                return content;
+            }
+            else
+            {
+                throw new ArgumentException("Couldn't open snippet - Illegal path");
+                
+            }
         }
 		
 	}