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

Works on #U4-2078

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-09 06:31:26 +06:00
parent 8e8ec41dae
commit e25ee246fb
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs
View File

@@ -8,17 +8,19 @@ using System.Web.Services;
using System.Linq;
using System.Xml;
using Umbraco.Core;
using Umbraco.Web.WebServices;
using umbraco.BusinessLogic;
namespace umbraco.webservices
{
public class Settings : WebService
public class Settings : UmbracoAuthorizedWebService
{
[WebMethod]
public XmlNode GetTabs(string ContextID, int ContentTypeId)
{
if (BasePages.BasePage.ValidateUserContextID(ContextID))
if (!AuthorizeRequest(DefaultApps.settings.ToString()))
{
var xmlDoc = new XmlDocument();
var tabs = xmlDoc.CreateElement("tabs");

7
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs
View File

@@ -5,6 +5,7 @@ using System.Data;
using System.Diagnostics;
using System.Web;
using System.Web.Services;
using Umbraco.Web.WebServices;
namespace presentation.umbraco.webservices
{
@@ -12,12 +13,14 @@ namespace presentation.umbraco.webservices
/// Summary description for progressStatus.
/// </summary>
[WebService(Namespace="http://umbraco.org/webservices/")]
public class progressStatus : System.Web.Services.WebService
public class progressStatus : UmbracoAuthorizedWebService
{
[WebMethod]
public int GetStatus(string key)
public int GetStatus(string key)
{
if (!AuthorizeRequest()) return 0;
try
{
return int.Parse(Application[key].ToString());

19
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs
View File

@@ -2,6 +2,8 @@ using System;
using System.ComponentModel;
using System.Web.Services;
using System.Web.Script.Services;
using Umbraco.Web.WebServices;
using umbraco.BusinessLogic;
using umbraco.presentation.webservices;
namespace umbraco.webservices
@@ -11,14 +13,15 @@ namespace umbraco.webservices
/// </summary>
[WebService(Namespace="http://umbraco.org/webservices/")]
[ScriptService]
public class publication : WebService
public class publication : UmbracoAuthorizedWebService
{
[WebMethod]
[ScriptMethod]
public int GetPublicationStatus(string key)
public int GetPublicationStatus(string key)
{
legacyAjaxCalls.Authorize();
if (!AuthorizeRequest(DefaultApps.content.ToString()))
return 0;
try
{
@@ -34,7 +37,8 @@ namespace umbraco.webservices
[ScriptMethod]
public int GetPublicationStatusMax(string key)
{
legacyAjaxCalls.Authorize();
if (!AuthorizeRequest(DefaultApps.content.ToString()))
return 0;
try
{
@@ -50,6 +54,9 @@ namespace umbraco.webservices
[ScriptMethod]
public int GetPublicationStatusMaxAll(string key)
{
if (!AuthorizeRequest(DefaultApps.content.ToString()))
return 0;
try
{
return int.Parse(Application["publishTotalAll" + key].ToString());
@@ -60,6 +67,7 @@ namespace umbraco.webservices
}
}
[Obsolete("This doesn't do anything and will be removed in future versions")]
[WebMethod]
public void HandleReleaseAndExpireDates(Guid PublishingServiceKey)
{
@@ -68,7 +76,8 @@ namespace umbraco.webservices
[WebMethod]
public void SaveXmlCacheToDisk()
{
legacyAjaxCalls.Authorize();
if (!AuthorizeRequest(DefaultApps.content.ToString()))
return;
content.Instance.PersistXmlToFile();
}

15
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs
View File

@@ -9,6 +9,8 @@ using System.Xml;
using System.Web.Script.Services;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Web.WebServices;
using umbraco.BusinessLogic;
using umbraco.presentation.webservices;
namespace umbraco.webservices
@@ -18,13 +20,13 @@ namespace umbraco.webservices
/// </summary>
[WebService(Namespace="http://umbraco.org/webservices/")]
[ScriptService]
public class templates : WebService
public class templates : UmbracoAuthorizedWebService
{
[WebMethod]
public XmlNode GetTemplates(string Login, string Password)
{
if (BusinessLogic.User.validateCredentials(Login, Password))
if (ValidateCredentials(Login, Password) && UserHasAppAccess(DefaultApps.settings.ToString(), Login))
{
var xmlDoc = new XmlDocument();
xmlDoc.LoadXml("<templates/>");
@@ -43,7 +45,7 @@ namespace umbraco.webservices
[WebMethod]
public XmlNode GetTemplate(int Id, string Login, string Password)
{
if (BusinessLogic.User.validateCredentials(Login, Password))
if (ValidateCredentials(Login, Password) && UserHasAppAccess(DefaultApps.settings.ToString(), Login))
{
var t = new cms.businesslogic.template.Template(Id);
var xmlDoc = new XmlDocument();
@@ -60,7 +62,7 @@ namespace umbraco.webservices
[WebMethod]
public bool UpdateTemplate(int Id, int Master, string Design, string Login, string Password)
{
if (BusinessLogic.User.validateCredentials(Login, Password))
if (ValidateCredentials(Login, Password) && UserHasAppAccess(DefaultApps.settings.ToString(), Login))
{
try
{
@@ -84,8 +86,9 @@ namespace umbraco.webservices
[WebMethod]
[ScriptMethod]
public string GetCodeSnippet(object templateId)
{
legacyAjaxCalls.Authorize();
{
//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));