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

Fixes: #U4-2214 - encrypted cookie value issue when it is invalid

Browse Source
This commit is contained in:
Shannon Deminick
2013-05-12 21:07:16 -10:00
parent 7d1a18638b
commit b38397868e
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,9 +379,16 @@ namespace Umbraco.Web.Security
return encTicket.DecryptWithMachineKey();
}
}
catch (HttpException ex)
catch (Exception ex)
{
// we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set
if (ex is ArgumentException || ex is FormatException || ex is HttpException)
{
StateHelper.Cookies.UserContext.Clear();
}
else
{
throw;
}
}
}
return "";

11
src/umbraco.businesslogic/BasePages/BasePage.cs
View File

@@ -267,9 +267,16 @@ namespace umbraco.BasePages
return encTicket.DecryptWithMachineKey();
}
}
catch (HttpException ex)
catch (Exception ex)
{
// we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set
if (ex is ArgumentException || ex is FormatException || ex is HttpException)
{
StateHelper.Cookies.UserContext.Clear();
}
else
{
throw;
}
}
}
return "";