From 6a69202f5e8382eeeb7dd3dc8bb2484fbf158720 Mon Sep 17 00:00:00 2001 From: slace Date: Thu, 16 Dec 2010 00:28:45 -1100 Subject: [PATCH] some clean up of the restExtension.cs file to make it a bit more robust --- .hgignore | 18 ++ umbraco.suo | Bin 0 -> 228864 bytes umbraco/presentation/Web.SLACEBOX.config | 210 ++++++++++++++++++ .../webservices/api/DocumentService.asmx | 1 + .../umbraco/webservices/api/FileService.asmx | 1 + .../webservices/api/MaintanceService.asmx | 1 + .../umbraco/webservices/api/MediaService.asmx | 1 + .../webservices/api/MemberService.asmx | 1 + .../webservices/api/StylesheetService.asmx | 1 + .../webservices/api/TemplateService.asmx | 1 + .../presentation/umbracobase/restExtension.cs | 108 +++++---- umbraco/presentation/web.config | 210 ++++++++++++++++++ 12 files changed, 495 insertions(+), 58 deletions(-) create mode 100644 .hgignore create mode 100644 umbraco.suo create mode 100644 umbraco/presentation/Web.SLACEBOX.config create mode 100644 umbraco/presentation/umbraco/webservices/api/DocumentService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/FileService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/MediaService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/MemberService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx create mode 100644 umbraco/presentation/umbraco/webservices/api/TemplateService.asmx create mode 100644 umbraco/presentation/web.config diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000000..b61636dd2b --- /dev/null +++ b/.hgignore @@ -0,0 +1,18 @@ +# use glob syntax +syntax: glob + +*.obj +*.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +[Bb]in +[Db]ebug*/ +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +[Bb]uild[Ll]og.* +*.[Pp]ublish.xml diff --git a/umbraco.suo b/umbraco.suo new file mode 100644 index 0000000000000000000000000000000000000000..bcd5d23a232c1f538f5552f23f7e26b9c7333d04 GIT binary patch literal 228864 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 literal 0 HcmV?d00001 diff --git a/umbraco/presentation/Web.SLACEBOX.config b/umbraco/presentation/Web.SLACEBOX.config new file mode 100644 index 0000000000..49c948647f --- /dev/null +++ b/umbraco/presentation/Web.SLACEBOX.config @@ -0,0 +1,210 @@ + + + +
+ + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx b/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx new file mode 100644 index 0000000000..dcb6614dda --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class=umbraco.webservices.documents.documentService %> \ No newline at end of file diff --git a/umbraco/presentation/umbraco/webservices/api/FileService.asmx b/umbraco/presentation/umbraco/webservices/api/FileService.asmx new file mode 100644 index 0000000000..e8a68ff354 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/FileService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="FileService.asmx.cs" Class="umbraco.webservices.files.fileService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx b/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx new file mode 100644 index 0000000000..fc9f8aba21 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MaintanceService.asmx.cs" Class="umbraco.webservices.maintenance.maintenanceService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MediaService.asmx b/umbraco/presentation/umbraco/webservices/api/MediaService.asmx new file mode 100644 index 0000000000..cfaded1cb1 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MediaService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MediaService.asmx.cs" Class="umbraco.webservices.media.mediaService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MemberService.asmx b/umbraco/presentation/umbraco/webservices/api/MemberService.asmx new file mode 100644 index 0000000000..f65beb00c6 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MemberService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MemberService.asmx.cs" Class="umbraco.webservices.members.memberService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx b/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx new file mode 100644 index 0000000000..4d98082f6c --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="StylesheetService.asmx.cs" Class="umbraco.webservices.stylesheets.stylesheetService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx b/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx new file mode 100644 index 0000000000..8af78e62dd --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="TemplateService.asmx.cs" Class="umbraco.webservices.templates.templateService" %> diff --git a/umbraco/presentation/umbracobase/restExtension.cs b/umbraco/presentation/umbracobase/restExtension.cs index 7fde8acfe1..e079a00e53 100644 --- a/umbraco/presentation/umbracobase/restExtension.cs +++ b/umbraco/presentation/umbracobase/restExtension.cs @@ -1,22 +1,9 @@ using System; -using System.Data; -using System.Text; -using System.Text.RegularExpressions; -using System.Configuration; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; +using System.Linq; using System.Reflection; -using System.Collections.Specialized; using System.Xml; - -using umbraco; -using umbraco.cms.businesslogic; +using umbraco.BusinessLogic.Utils; using umbraco.cms.businesslogic.member; -using umbraco.cms.businesslogic.property; using umbraco.IO; namespace umbraco.presentation.umbracobase @@ -60,7 +47,8 @@ namespace umbraco.presentation.umbracobase set { _isAllowed = value; } } - public bool returnXML { + public bool returnXML + { get { return _returnXml; } set { _returnXml = value; } } @@ -107,55 +95,59 @@ namespace umbraco.presentation.umbracobase { //check for RestExtensionAttribute - foreach(Type t in BusinessLogic.Utils.TypeFinder.FindClassesMarkedWithAttribute(typeof(RestExtension))) + foreach (Type t in TypeFinder.FindClassesMarkedWithAttribute(typeof(RestExtension))) { - - var temp = t.GetCustomAttributes(typeof(RestExtension), false); - if(((RestExtension)temp[0]).GetAlias() == extensionAlias) + var temp = t.GetCustomAttributes(typeof(RestExtension), false).OfType(); + + if (temp.Where(x => x.GetAlias() == extensionAlias) + .Any()) { + MethodInfo mi = t.GetMethod(methodName); - if (mi == null) - { - //method not found - } - else + if (mi != null) { //check allowed - var attri = mi.GetCustomAttributes(typeof(RestExtensionMethod), false); + var attributes = mi.GetCustomAttributes(typeof(RestExtensionMethod), false).OfType(); - fromFile = false; - - allowed = ((RestExtensionMethod)attri[0]).allowAll; - - if (!allowed) + //check to make sure the method was decorated properly + if (attributes.Any()) { - //Member Based permissions.. check for group, type and ID... - Member currentMem = Member.GetCurrentMember(); + fromFile = false; - //not basic.. and not logged in? - out.. - if (currentMem == null) + var attribute = attributes.First(); + allowed = attribute.allowAll; + + if (!allowed) { - allowed = false; - } - else //do member authentication stuff... - allowed = memberAuthentication(((RestExtensionMethod)attri[0]), currentMem); - } + //Member Based permissions.. check for group, type and ID... + Member currentMem = Member.GetCurrentMember(); - if (allowed) - { - this.isAllowed = true; - this.alias = extensionAlias; - this.assembly = t.Assembly; - this.method = t.GetMethod(methodName); - this.type = t; + //not basic.. and not logged in? - out.. + if (currentMem == null) + { + allowed = false; + } + else + { + //do member authentication stuff... + allowed = memberAuthentication(attribute, currentMem); + } + } + + if (allowed) + { + this.isAllowed = true; + this.alias = extensionAlias; + this.assembly = t.Assembly; + this.method = t.GetMethod(methodName); + this.type = t; + } } } - } } - } if (allowed) @@ -194,8 +186,8 @@ namespace umbraco.presentation.umbracobase if (!string.IsNullOrEmpty(baseExt.GetAllowGroup())) { - - //Groups array + + //Groups array string[] groupArray = baseExt.GetAllowGroup().Split(','); foreach (MemberGroup mg in currentMem.Groups.Values) @@ -206,14 +198,14 @@ namespace umbraco.presentation.umbracobase memberAccess = true; } } - + } //Membertype allowed? if (!string.IsNullOrEmpty(baseExt.GetAllowType()) && !memberAccess) { - - //Types array + + //Types array string[] typeArray = baseExt.GetAllowType().Split(','); foreach (string type in typeArray) @@ -221,17 +213,17 @@ namespace umbraco.presentation.umbracobase if (type == currentMem.ContentType.Alias) memberAccess = true; } - + } //Member ID allowed? should this work with loginName instead? - if (!string.IsNullOrEmpty(baseExt.GetAllowMember())&& !memberAccess) + if (!string.IsNullOrEmpty(baseExt.GetAllowMember()) && !memberAccess) { if (int.Parse((string)baseExt.GetAllowMember().Trim()) == currentMem.Id) memberAccess = true; - + } return memberAccess; } @@ -287,6 +279,6 @@ namespace umbraco.presentation.umbracobase } return memberAccess; } - + } } diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config new file mode 100644 index 0000000000..49c948647f --- /dev/null +++ b/umbraco/presentation/web.config @@ -0,0 +1,210 @@ + + + +
+ + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file