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

Merge branch 'dev-v7' into dev-v7.5

Browse Source
This commit is contained in:
Shannon
2016-04-13 15:16:28 +02:00
parent c9c391e477 cf7756a96d
commit dbff25bd6d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
View File

@@ -60,7 +60,7 @@ namespace umbraco.presentation.webservices
return jsonRefresher;
}
private bool NotAutorized(string login, string rawPassword)
private bool Authorized(string login, string rawPassword)
{
//TODO: This technique of passing the raw password in is a legacy idea and isn't really
// a very happy way to secure this webservice. To prevent brute force attacks, we need
@@ -92,7 +92,7 @@ namespace umbraco.presentation.webservices
[WebMethod]
public void BulkRefresh(RefreshInstruction[] instructions, string appId, string login, string password)
{
if (NotAutorized(login, password)) return;
if (Authorized(login, password) == false) return;
if (SelfMessage(appId)) return; // do not process self-messages
// only execute distinct instructions - no sense in running the same one more than once
@@ -131,29 +131,29 @@ namespace umbraco.presentation.webservices
[WebMethod]
public void RefreshAll(Guid uniqueIdentifier, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
if (Authorized(Login, Password) == false) return;
GetRefresher(uniqueIdentifier).RefreshAll();
}
[WebMethod]
public void RefreshByGuid(Guid uniqueIdentifier, Guid Id, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
if (Authorized(Login, Password) == false) return;
GetRefresher(uniqueIdentifier).Refresh(Id);
}
[WebMethod]
public void RefreshById(Guid uniqueIdentifier, int Id, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
if (Authorized(Login, Password) == false) return;
GetRefresher(uniqueIdentifier).Refresh(Id);
}
[WebMethod]
public void RefreshByIds(Guid uniqueIdentifier, string jsonIds, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
var refresher = GetRefresher(uniqueIdentifier);
if (Authorized(Login, Password) == false) return;
var refresher = GetRefresher(uniqueIdentifier);
foreach (var id in JsonConvert.DeserializeObject<int[]>(jsonIds))
refresher.Refresh(id);
}
@@ -161,21 +161,21 @@ namespace umbraco.presentation.webservices
[WebMethod]
public void RefreshByJson(Guid uniqueIdentifier, string jsonPayload, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
if (Authorized(Login, Password) == false) return;
GetJsonRefresher(uniqueIdentifier).Refresh(jsonPayload);
}
[WebMethod]
public void RemoveById(Guid uniqueIdentifier, int Id, string Login, string Password)
{
if (NotAutorized(Login, Password)) return;
if (Authorized(Login, Password) == false) return;
GetRefresher(uniqueIdentifier).Remove(Id);
}
[WebMethod]
public XmlDocument GetRefreshers(string Login, string Password)
{
if (NotAutorized(Login, Password)) return null;
if (Authorized(Login, Password) == false) return null;
var xd = new XmlDocument();
xd.LoadXml("<cacheRefreshers/>");