Return-Path: X-Original-To: apmail-struts-dev-archive@www.apache.org Delivered-To: apmail-struts-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2983B93E for ; Sun, 8 Jan 2012 12:03:42 +0000 (UTC) Received: (qmail 3178 invoked by uid 500); 8 Jan 2012 12:03:41 -0000 Delivered-To: apmail-struts-dev-archive@struts.apache.org Received: (qmail 2776 invoked by uid 500); 8 Jan 2012 12:03:34 -0000 Mailing-List: contact dev-help@struts.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Struts Developers List" Reply-To: "Struts Developers List" Delivered-To: mailing list dev@struts.apache.org Received: (qmail 2757 invoked by uid 99); 8 Jan 2012 12:03:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 12:03:25 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of lukasz.lenart@googlemail.com designates 209.85.210.176 as permitted sender) Received: from [209.85.210.176] (HELO mail-iy0-f176.google.com) (209.85.210.176) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 12:03:18 +0000 Received: by iapp10 with SMTP id p10so6954097iap.35 for ; Sun, 08 Jan 2012 04:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:content-type:content-transfer-encoding; bh=EeDcpG7BRCkCV1yEJcbPwx94nfz0o7miTQc2EBSjEHw=; b=KF8HA7zyQ8aVNrbwUQAbr9i7ndmMD3whpNultWea/cl5xkoiCV2lsmZlrRXiw9JjRK J71WpCKVPvX+wfTfa+D9AJsNXQjnoA8YBxkHu/vdglkLfjVIXiG+spm5CKksDX9BBp7G UwmwYP4GjffWBljUN3ACS8bSzv92W/4gT1xjs= MIME-Version: 1.0 Received: by 10.50.195.135 with SMTP id ie7mr14640470igc.6.1326024177869; Sun, 08 Jan 2012 04:02:57 -0800 (PST) Received: by 10.42.3.1 with HTTP; Sun, 8 Jan 2012 04:02:57 -0800 (PST) Reply-To: lukasz.lenart@gmail.com In-Reply-To: <6441878A-2F21-4FFB-9C53-4CB63421F5B5@newplanetsoftware.com> References: <20120106231932.90E6423889E1@eris.apache.org> <6441878A-2F21-4FFB-9C53-4CB63421F5B5@newplanetsoftware.com> Date: Sun, 8 Jan 2012 13:02:57 +0100 Message-ID: Subject: Re: svn commit: r1228497 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java From: =?UTF-8?Q?=C5=81ukasz_Lenart?= To: Struts Developers List Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Oh... right :-) 2012/1/7 John Lindal : > No, because convertParam expands the wildcard expression :) > > John > > On Jan 7, 2012, at 11:58 AM, =C5=81ukasz Lenart wrote: > >> Wouldn't be better to first check if it's an allowed-method and then >> call convertParam() method ? >> >> if (!orig.isAllowedMethod(methodName)) { >> =C2=A0 =C2=A0return null; >> } >> String methodName =3D convertParam(orig.getMethodName(), vars); >> >> >> Regards >> -- =C5=81ukasz >> + 48 606 323 122=C2=A0http://www.lenart.org.pl/ >> Warszawa JUG conference - Confitura http://confitura.pl/ >> >> 2012/1/7 =C2=A0: >>> >>> Author: jafl >>> Date: Fri Jan =C2=A06 23:19:32 2012 >>> New Revision: 1228497 >>> >>> URL: http://svn.apache.org/viewvc?rev=3D1228497&view=3Drev >>> Log: >>> WW-3740 apply allowed-methods filter to wildcard actions >>> >>> Modified: >>> >>> struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/c= onfig/impl/ActionConfigMatcher.java >>> >>> Modified: >>> struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/c= onfig/impl/ActionConfigMatcher.java >>> URL: >>> http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/j= ava/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java?rev=3D1228= 497&r1=3D1228496&r2=3D1228497&view=3Ddiff >>> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- >>> struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/c= onfig/impl/ActionConfigMatcher.java >>> (original) >>> +++ >>> struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/c= onfig/impl/ActionConfigMatcher.java >>> Fri Jan =C2=A06 23:19:32 2012 >>> @@ -109,13 +109,17 @@ public class ActionConfigMatcher extends >>> =C2=A0 =C2=A0 */ >>> =C2=A0 =C2=A0@Override public ActionConfig convert(String path, ActionC= onfig orig, >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0Map vars) { >>> - >>> - =C2=A0 =C2=A0 =C2=A0 =C2=A0String className =3D convertParam(orig.get= ClassName(), vars); >>> + >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0String methodName =3D convertParam(orig.getM= ethodName(), vars); >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0if (!orig.isAllowedMethod(methodName)) { >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return null; >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0} >>> + >>> + =C2=A0 =C2=A0 =C2=A0 =C2=A0String className =3D convertParam(orig.get= ClassName(), vars); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0String pkgName =3D convertParam(orig.getPack= ageName(), vars); >>> - >>> + >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0Map params =3D replaceParamet= ers(orig.getParams(), >>> vars); >>> - >>> + >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0Map results =3D new >>> LinkedHashMap(); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0for (String name : orig.getResults().keySet(= )) { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ResultConfig result =3D orig.g= etResults().get(name); >>> @@ -125,7 +129,7 @@ public class ActionConfigMatcher extends >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.b= uild(); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0results.put(name, r); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0} >>> - >>> + >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0List exs =3D new >>> ArrayList(); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0for (ExceptionMappingConfig ex : orig.getExc= eptionMappings()) { >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0String name =3D convertParam(e= x.getName(), vars); >>> @@ -135,7 +139,7 @@ public class ActionConfigMatcher extends >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ExceptionMappingConfig e =3D n= ew >>> ExceptionMappingConfig.Builder(name, exClassName, >>> exResult).addParams(exParams).build(); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exs.add(e); >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0} >>> - >>> + >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0return new ActionConfig.Builder(pkgName, ori= g.getName(), >>> className) >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.methodName(meth= odName) >>> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.addParams(param= s) >>> >>> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org >> For additional commands, e-mail: dev-help@struts.apache.org >> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org > For additional commands, e-mail: dev-help@struts.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org For additional commands, e-mail: dev-help@struts.apache.org