yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge issues and WebSecurity with the correct encryption (from failed merge along time ago).

Browse Source 
Fixes ContentType to ensure that ALL property type values get reset, not just ones assigned to a group.
Fixes logic in ContentTypeService to ensure that xml is re-generated when a property type alias is changed too.
This commit is contained in:
Shannon Deminick
2013-04-25 21:09:07 -10:00
parent d2a285c120
commit 6cffa67518
6 changed files with 86 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Umbraco.Web/Security/WebSecurity.cs
View File

@@ -366,34 +366,23 @@ namespace Umbraco.Web.Security
/// </summary>
/// <value>The umbraco user context ID.</value>
public string UmbracoUserContextId
{
//TODO: Clean this up!! We also have extension methods in StringExtensions for decrypting/encrypting in med trust
// ... though an existing cookie may fail decryption, in that case they'd just get logged out. no problems.
{
get
{
// zb-00004 #29956 : refactor cookies names & handling
if (StateHelper.Cookies.HasCookies && StateHelper.Cookies.UserContext.HasValue)
return StateHelper.Cookies.UserContext.GetValue();
try
{
var encTicket = StateHelper.Cookies.UserContext.GetValue();
if (string.IsNullOrEmpty(encTicket) == false)
try
{
var formsAuthenticationTicket = FormsAuthentication.Decrypt(encTicket);
if (formsAuthenticationTicket != null)
return formsAuthenticationTicket.UserData;
var encTicket = StateHelper.Cookies.UserContext.GetValue();
if (string.IsNullOrEmpty(encTicket) == false)
{
return encTicket.DecryptWithMachineKey();
}
}
catch (HttpException ex)
{
// we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set
}
}
catch (HttpException)
{
// we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set
}
catch (ArgumentException ex)
{
// we swallow this one because it's 99.99% certaincy is legacy based. We'll still log it, though
LogHelper.Error(typeof(WebSecurity), "An error occurred reading auth cookie value", ex);
}
return "";
}
@@ -408,19 +397,11 @@ namespace Umbraco.Web.Security
if (string.IsNullOrEmpty(value) == false)
{
var ticket = new FormsAuthenticationTicket(1,
value,
DateTime.Now,
DateTime.Now.AddDays(1),
false,
value,
FormsAuthentication.FormsCookiePath);
// Encrypt the value
var encTicket = value.EncryptWithMachineKey();
// Encrypt the ticket.
FormsAuthentication.Encrypt(ticket);
// Create new cookie.
StateHelper.Cookies.UserContext.SetValue(value, 1);
StateHelper.Cookies.UserContext.SetValue(encTicket, 1);
}
else
{