JBoss Portal SVN: r13394 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-05-20 05:43:03 -0400 (Wed, 20 May 2009)
New Revision: 13394
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
Log:
[selenium] - locators for wizard mode portal admin
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-05-19 17:54:23 UTC (rev 13393)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-05-20 09:43:03 UTC (rev 13394)
@@ -457,6 +457,14 @@
portal.e2e.inp.net.search=//div[@id='bilto']/div/div[3]/form/input[1]
portal.e2e.sub.net.search=//div[@id='bilto']/div/div[3]/form/input[2]
+# AdminPortalWizardTestCase
+
+portal.admin.wiz.sel.portlet.type=//select[contains(@id,'portlet-wiz-form:menu')]
+portal.admin.wiz.sub.portlet.type=//input[contains(@id,'portlet-wiz-form:wiz-change')]
+portal.admin.wiz.lnk.reg.c=//a[contains(@id,'region-wiz-form:region-1')]
+portal.admin.wiz.sub.sub=//input[contains(@id,'wiz-conf-form:confirm')]
+portal.admin.wiz.sub.can=//input[contains(@id,'wiz-conf-form:cancel')]
+
# PortalSamplesTestCase
samples.ses.lnk.invalidate=link=invalidate
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13393 - in branches/JBoss_Portal_Branch_2_7/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-19 13:54:23 -0400 (Tue, 19 May 2009)
New Revision: 13393
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- JBEPP-86: Added lots of checking for XSS injection. Error reporting is weak but improving would require major work. :(
- Fixed typo in CSS class
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-05-19 15:40:11 UTC (rev 13392)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-05-19 17:54:23 UTC (rev 13393)
@@ -107,8 +107,11 @@
private ApprovePublish approvePublish;
private AuthorizationManager authorizationManager;
private ResourceBundle resources = null;
+
private static final Pattern CHECK_FOR_XSS_PATTERN = ParameterValidation.XSS_CHECK;
private static final String SLASH = "/";
+ private static final String INVALID_TITLE = "Invalid title";
+ private static final String INVALID_DESCRIPTION = "Invalid description";
public void init() throws PortletException
@@ -1018,8 +1021,12 @@
String sBasePath = FileUtil.cleanDoubleSlashes(sPath + SLASH + sFilename);
file.setBasePath(sBasePath);
+ sTitle = ParameterValidation.sanitizeFromPattern(sTitle, CHECK_FOR_XSS_PATTERN, "");
content.setTitle(sTitle);
+
+ sDescription = ParameterValidation.sanitizeFromPattern(sDescription, CHECK_FOR_XSS_PATTERN, "");
content.setDescription(sDescription);
+
content.setBasePath(sBasePath + SLASH + new Locale(sLanguage));
content.setBytes(item.get());
file.setContent(new Locale(sLanguage), content);
@@ -1078,7 +1085,8 @@
}
else if (CMSAdminConstants.OP_DOSEARCH.equals(op))
{
- String search = (String)aReq.getParameter("search");
+ String search = aReq.getParameter("search");
+ search = ParameterValidation.sanitizeFromPattern(search, CHECK_FOR_XSS_PATTERN, "");
aRes.setRenderParameter("search", search);
aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWSEARCHRESULTS);
@@ -1318,6 +1326,10 @@
{
content.setMimeType("");
}
+
+ sTitle = ParameterValidation.sanitizeFromPattern(sTitle, CHECK_FOR_XSS_PATTERN, "");
+ sDescription = ParameterValidation.sanitizeFromPattern(sDescription, CHECK_FOR_XSS_PATTERN, "");
+
content.setTitle(sTitle);
content.setDescription(sDescription);
content.setBasePath(sBasePath + SLASH + sLanguage);
@@ -1374,8 +1386,14 @@
String sDescription = aReq.getParameter("description");
String sLanguage = aReq.getParameter("language");
+ sFileName = ParameterValidation.sanitizeFromPattern(sFileName, CHECK_FOR_XSS_PATTERN, "");
+ sDirectory = ParameterValidation.sanitizeFromPattern(sDirectory, CHECK_FOR_XSS_PATTERN, SLASH);
+ sTitle = ParameterValidation.sanitizeFromPattern(sTitle, CHECK_FOR_XSS_PATTERN, INVALID_TITLE);
+ sDescription = ParameterValidation.sanitizeFromPattern(sDescription, CHECK_FOR_XSS_PATTERN, INVALID_DESCRIPTION);
+ sLanguage = ParameterValidation.sanitizeFromPattern(sLanguage, CHECK_FOR_XSS_PATTERN, "en");
+
//Perform server side data validation
- if (sFileName == null || sFileName.trim().length() == 0)
+ if (sFileName == null || INVALID_TITLE.equals(sTitle) || INVALID_DESCRIPTION.equals(sDescription) || sFileName.trim().length() == 0)
{
//Validation Error occurred
//FileName should not be empty
@@ -1386,8 +1404,8 @@
//used to remember the data already submitted by the user
aRes.setRenderParameter("error:content", aReq.getParameter("elm1"));
- aRes.setRenderParameter("error:description", aReq.getParameter("description"));
- aRes.setRenderParameter("error:title", aReq.getParameter("title"));
+ aRes.setRenderParameter("error:description", sDescription);
+ aRes.setRenderParameter("error:title", sTitle);
aRes.setRenderParameter("error:language", aReq.getParameter("language"));
return;
@@ -1482,6 +1500,11 @@
String sTitle = aReq.getParameter("title");
String sDescription = aReq.getParameter("description");
String sLanguage = aReq.getParameter("language");
+
+ sTitle = ParameterValidation.sanitizeFromPattern(sTitle, CHECK_FOR_XSS_PATTERN, "");
+ sDescription = ParameterValidation.sanitizeFromPattern(sDescription, CHECK_FOR_XSS_PATTERN, "");
+ sLanguage = ParameterValidation.sanitizeFromPattern(sLanguage, CHECK_FOR_XSS_PATTERN, "en");
+
String sMakeLive = "off";
if (aReq.getParameterValues("makelive") != null)
{
@@ -1541,6 +1564,7 @@
{
String sTarget = aReq.getParameter("destination");
String sLanguage = aReq.getParameter("language");
+ sLanguage = ParameterValidation.sanitizeFromPattern(sLanguage, CHECK_FOR_XSS_PATTERN, "en");
if (sTarget != null)
{
@@ -1720,6 +1744,7 @@
{
String path = aReq.getParameter("path");
String language = aReq.getParameter("language");
+ language = ParameterValidation.sanitizeFromPattern(language, CHECK_FOR_XSS_PATTERN, "en");
String version = aReq.getParameter("version");
//Perform the change in live version here
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-05-19 15:40:11 UTC (rev 13392)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-05-19 17:54:23 UTC (rev 13393)
@@ -75,7 +75,7 @@
if (parser.hasMoreTokens())
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
@@ -89,7 +89,7 @@
else
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="selected"><%= EntityEncoder.FULL.encode(sPathChunk) %>
</li>
<%
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-05-19 15:40:11 UTC (rev 13392)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-05-19 17:54:23 UTC (rev 13393)
@@ -43,7 +43,7 @@
if (parser.hasMoreTokens())
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
@@ -57,7 +57,7 @@
else
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="selected"><%= sPathChunk %>
</li>
<%
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-05-19 15:40:11 UTC (rev 13392)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-05-19 17:54:23 UTC (rev 13393)
@@ -72,7 +72,7 @@
if (parser.hasMoreTokens())
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
@@ -86,7 +86,7 @@
else
{
%>
- <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathSeparator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
<li class="selected"><%= EntityEncoder.FULL.encode(sPathChunk) %>
</li>
<%
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13392 - branches.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-05-19 11:40:11 -0400 (Tue, 19 May 2009)
New Revision: 13392
Added:
branches/JBoss_Portal_Branch_2_7_Security_POC/
Log:
POC branch for new Security component
Copied: branches/JBoss_Portal_Branch_2_7_Security_POC (from rev 13391, branches/JBoss_Portal_Branch_2_7)
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13391 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-19 08:57:53 -0400 (Tue, 19 May 2009)
New Revision: 13391
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
Log:
- JBEPP-83: Relax validation for ControlPropertyBean to allow / and . in paths.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-05-18 21:21:45 UTC (rev 13390)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-05-19 12:57:53 UTC (rev 13391)
@@ -44,6 +44,14 @@
super(container, info, inherited, inheritable, value);
//
this.container = container;
+ setValidator(new DefaultPropertyValidator()
+ {
+ @Override
+ public String doSimpleChecks(String name)
+ {
+ return name; // no-op as we want to allow / and . in paths
+ }
+ });
}
public void setInherited(boolean inherited)
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13390 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF/classes and 4 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-18 17:21:45 -0400 (Mon, 18 May 2009)
New Revision: 13390
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
Log:
- JBPORTAL-2393:
+ PropertyValidator now provides doSimpleChecks method to validate properties after checking for null but
before checking for XSS or duplicates. In particular, we now forbid names containing . or /
+ Made ManagedBean.DefaultPropertyValidator an inner class so that we can reuse more code
+ Updated localization resources
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-05-18 21:21:45 UTC (rev 13390)
@@ -42,15 +42,12 @@
*/
public class CreateInstanceAction extends ManagedBean
{
-
- /** . */
private String instanceId;
- /** . */
private PortletManagerBean portletMgr;
- /** . */
private InstanceManagerBean instanceMgr;
+
private static final String MESSAGE_TARGET = "add_instance_form:instanceId";
protected static final String INSTANCE_TYPE = "INSTANCE_TYPE";
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '/', '.', '\\', '<', '>', '(', ')', '=' or '%5c'
NO_SELECTED_PORTLET_ERROR=No portlet was selected!
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
bean_support_unexpected_error=Unexpected error:
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -70,7 +70,6 @@
DESCRIPTION=Beschreibung
REMOTE=Remote
REMOTABLE=Remote-f\u00e4hig
-ACTIONS=Aktionen
CREATE_INSTANCE=Instanz erstellen
PORTLET_DEFINITIONS=Portlet-Definitionen
DETAILS=Details
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=collegamento al parametro
COORDINATION_ALIAS=collegamento all'alias
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non pu\u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non pu\u00f2 essere null, vuoto o contenere '/', '.', '\\', '<', '>', '(', ')', '=' o '%5c'
NO_SELECTED_PORTLET_ERROR=Non \u00e8 stata selezionata nessuna portlet!
DUPLICATE_ERROR=Esiste gi\u00e0 un {1} chiamato ''{0}''!
bean_support_unexpected_error=Errore inatteso:
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o pode ser nulo, vazio, ou que contenha ''\\', '<', '>', '(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o pode ser nulo, vazio, ou que contenha '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
NO_SELECTED_PORTLET_ERROR=Nenhum portlet foi selecionado!
DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00e1 existe\!
bean_support_unexpected_error=Erro inesperado:
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-18 21:21:45 UTC (rev 13390)
@@ -84,13 +84,8 @@
}
}
- private class DisplayNameValidator implements PropertyValidator
+ private class DisplayNameValidator extends DefaultPropertyValidator
{
- public boolean checkForDuplicates()
- {
- return true;
- }
-
public String getObjectTypeName()
{
return ROLE_DISPLAY_TYPE;
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -178,7 +178,7 @@
ROLE_TYPE=role
ROLE_DISPLAY_TYPE=role display
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '/', '.', '\\', '<', '>', '(', ')', '=' or '%5c'
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
# Example usage for dynamic values
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -299,4 +299,4 @@
ROLE_TYPE=r\u00f4le
ROLE_DISPLAY_TYPE=affichage r\u00f4le
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
-INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\', '<', '>', '(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -186,5 +186,5 @@
javax.faces.component.UIInput.REQUIRED=Il valore \u00e8 richiesto
ROLE_TYPE=ruolo
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '/', '.', '\\', '<', '>', '(', ')', '=' o '%5c'
DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0!
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -186,5 +186,5 @@
javax.faces.component.UIInput.REQUIRED=Valor obrigat\u00f3rio
ROLE_TYPE=perfil
-INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\: n\u00e3o deve ser nulo, vazio ou conter os caracteres '\\', '<', '>', '(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\: n\u00e3o deve ser nulo, vazio ou conter os caracteres '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\!
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -178,5 +178,5 @@
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '/', '.', '\\', '<', '>', '(', ')', '=' or '%5c'
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -147,4 +147,4 @@
consumers_table_reload=Recharger consommateurs
CONSUMER_TYPE=Consommateur
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
-INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\', '<', '>', '(', ')', '=' ou '%5c'
\ No newline at end of file
+INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -178,5 +178,5 @@
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '\\', '<', '>', '(', ')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2 essere null, vuoto o contenere '/', '.', '\\', '<', '>', '(', ')', '=' o '%5c'
DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0!
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18 21:21:45 UTC (rev 13390)
@@ -24,31 +24,31 @@
## WSRP GUI localization
# JBoss Portal display information
-org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00E7\u00E3o WSRP
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configura\u00E7\u00E3o WSRP
+org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00e7\u00e3o WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configura\u00e7\u00e3o WSRP
# Tabs
-nav_tabs_consumers = Configura\u00E7\u00E3o de Consumidores
-nav_tabs_producer_config = Configura\u00E7\u00E3o de Produtores
+nav_tabs_consumers = Configura\u00e7\u00e3o de Consumidores
+nav_tabs_producer_config = Configura\u00e7\u00e3o de Produtores
nav_tabs_producer_management = Gerenciamento de Produtores
# Object path in consumer template
path_consumers_root = Consumidores
-path_consumers_consumer = Configura\u00E7\u00E3o do Consumidor ''{0}''
+path_consumers_consumer = Configura\u00e7\u00e3o do Consumidor ''{0}''
path_consumers_active = ativo
path_consumers_inactive = inativo
-path_consumers_refreshNeeded = (atualiza\u00E7\u00E3o necess\u00E1ria)
+path_consumers_refreshNeeded = (atualiza\u00e7\u00e3o necess\u00e1ria)
# Confirm deletion of a consumer screen
confirm_delete_consumer_title = Excluir o consumidor ''{0}''?
-confirm_delete_consumer_message = Voc\u00EA est\u00E1 prestes a excluir o consumidor ''{0}''\!
+confirm_delete_consumer_message = Voc\u00ea est\u00e1 prestes a excluir o consumidor ''{0}''\!
confirm_detete_consumer_proceed = Tem certeza de que deseja continuar?
confirm_delete_consumer_submit = Excluir consumidor
confirm_delete_consumer_cancel = Cancelar
# Confirm deletion of local registration information screen
confirm_delete_registration_title = Excluir registro local para o consumidor ''{0}''?
-confirm_delete_registration_message = Voc\u00EA est\u00E1 prestes a eliminar o registro local de informa\u00E7\u00F5es para o consumidor ''{0}'\! \nIsso s\u00F3 \u00E9 necess\u00E1rio se esse consumidor tinha anteriormente se registrado com o produtor remoto, e esse produtor tiver sido modificado para n\u00E3o mais exigir registro. \nApenas apague informa\u00E7\u00F5es locais de registro, se esse produtor apresentar erros devido a essa situa\u00E7\u00E3o particular. Apagar o registro local quando n\u00E3o obrigat\u00F3rio pode conduzir \u00E0 incapacidade de utilizar esse produtor.
+confirm_delete_registration_message = Voc\u00ea est\u00e1 prestes a eliminar o registro local de informa\u00e7\u00f5es para o consumidor ''{0}'\! \nIsso s\u00f3 \u00e9 necess\u00e1rio se esse consumidor tinha anteriormente se registrado com o produtor remoto, e esse produtor tiver sido modificado para n\u00e3o mais exigir registro. \nApenas apague informa\u00e7\u00f5es locais de registro, se esse produtor apresentar erros devido a essa situa\u00e7\u00e3o particular. Apagar o registro local quando n\u00e3o obrigat\u00f3rio pode conduzir \u00e0 incapacidade de utilizar esse produtor.
confirm_delete_registration_proceed = Tem certeza de que deseja continuar?
confirm_delete_registration_submit = Excluir registro local
confirm_delete_registration_cancel = Cancelar
@@ -61,7 +61,7 @@
# Consumers list
consumers_table_column_consumer = Consumidor
consumers_table_column_consumer_status = status:
-consumers_table_column_actions = A\u00E7\u00F5es
+consumers_table_column_actions = A\u00e7\u00f5es
consumers_table_action_configure = Configurar
consumers_table_action_refresh = Atualizar
consumers_table_action_activate = Ativar
@@ -73,55 +73,55 @@
# Consumer editing screen
edit_consumer_producer = Id do produtor\:
-edit_consumer_cache = Expira\u00E7\u00E3o do cache\:
+edit_consumer_cache = Expira\u00e7\u00e3o do cache\:
edit_consumer_cache_seconds = (segundos antes de expirar)
-edit_consumer_endpoint = Configura\u00E7\u00E3o do endpoint\:
+edit_consumer_endpoint = Configura\u00e7\u00e3o do endpoint\:
edit_consumer_endpoint_wsdl = Utilizar WSDL?
edit_consumer_endpoint_sd = URL do Service Description\:
edit_consumer_endpoint_m = URL do Markup\:
edit_consumer_endpoint_r = URL do Registro\:
edit_consumer_endpoint_pm = URL do Portlet de Gerenciamento\:
-edit_consumer_registration = Informa\u00E7\u00F5es do registro\:
-edit_consumer_registration_current = Informa\u00E7\u00F5es do registro atual\:
+edit_consumer_registration = Informa\u00e7\u00f5es do registro\:
+edit_consumer_registration_current = Informa\u00e7\u00f5es do registro atual\:
edit_consumer_prop_name = Nome
-edit_consumer_prop_desc = Descri\u00E7\u00E3o
+edit_consumer_prop_desc = Descri\u00e7\u00e3o
edit_consumer_prop_value = Valor
edit_consumer_registration_update_props = Atualizar propriedades
-edit_consumer_registration_no_props = O registro \u00E9 indicado como obrigat\u00F3rio sem as propriedades do registro.
+edit_consumer_registration_no_props = O registro \u00e9 indicado como obrigat\u00f3rio sem as propriedades do registro.
edit_consumer_registration_modify = Modificar registro
edit_consumer_registration_modify_title = Modificar o registro realizado com este produtor
-edit_consumer_registration_expected = Informa\u00E7\u00F5es de registro esperadas\:
-edit_consumer_no_registration = O produtor n\u00E3o requer registro.
+edit_consumer_registration_expected = Informa\u00e7\u00f5es de registro esperadas\:
+edit_consumer_no_registration = O produtor n\u00e3o requer registro.
edit_consumer_registration_context = Contexto do registro\:
edit_consumer_registration_context_handle = Handle:
edit_consumer_registration_context_erase = Excluir registro local
-edit_consumer_registration_context_erase_title = Excluir informa\u00E7\u00F5es locais de registro (potencialmente perigoso\!)
+edit_consumer_registration_context_erase_title = Excluir informa\u00e7\u00f5es locais de registro (potencialmente perigoso\!)
edit_consumer_refresh = Atualizar e Gravar
-edit_consumer_refresh_title = Gravar altera\u00E7\u00F5es e atualizar as informa\u00E7\u00F5es do produtor
+edit_consumer_refresh_title = Gravar altera\u00e7\u00f5es e atualizar as informa\u00e7\u00f5es do produtor
edit_consumer_cancel = Cancelar
# Confirm registration property deletion screen
-confirm_delete_reg_property_title = Excluir a descri\u00E7\u00E3o da propriedade de registro ' '(0)''?
-confirm_delete_reg_property_message = Voc\u00EA est\u00E1 prestes a eliminar a descri\u00E7\u00E3o da propriedade de registro ''{0}''\!\n Isso acionar\u00E1 a invalida\u00E7\u00E3o dos registros dos consumidores que ter\u00E3o de modificar suas informa\u00E7\u00E3o de registro.
+confirm_delete_reg_property_title = Excluir a descri\u00e7\u00e3o da propriedade de registro ' '(0)''?
+confirm_delete_reg_property_message = Voc\u00ea est\u00e1 prestes a eliminar a descri\u00e7\u00e3o da propriedade de registro ''{0}''\!\n Isso acionar\u00e1 a invalida\u00e7\u00e3o dos registros dos consumidores que ter\u00e3o de modificar suas informa\u00e7\u00e3o de registro.
confirm_delete_reg_property_proceed = Tem certeza de que deseja continuar?
confirm_delete_reg_property_submit = Excluir propriedade
confirm_delete_reg_property_cancel = Cancelar
# Producer configuration screen
-producer_config_title = Configura\u00E7\u00E3o do Produtor
-producer_config_sd_requires_reg = O acesso \u00E0 descri\u00E7\u00E3o completa do servi\u00E7o exige que os consumidores estejam registrados.
+producer_config_title = Configura\u00e7\u00e3o do Produtor
+producer_config_sd_requires_reg = O acesso \u00e0 descri\u00e7\u00e3o completa do servi\u00e7o exige que os consumidores estejam registrados.
producer_config_strict = Utilizar compatibilidade estrita ao WSRP.
-producer_config_requires_reg = Registro obrigat\u00F3rio. Modificar essa informa\u00E7\u00E3o invalidar\u00E1 os registros dos consumidores.
-producer_config_reg_policy = Nome da classe de pol\u00EDtica do registro\:
-producer_config_reg_prop_validator = Nome da classe de valida\u00E7\u00E3o da propriedade do registro\:
+producer_config_requires_reg = Registro obrigat\u00f3rio. Modificar essa informa\u00e7\u00e3o invalidar\u00e1 os registros dos consumidores.
+producer_config_reg_policy = Nome da classe de pol\u00edtica do registro\:
+producer_config_reg_prop_validator = Nome da classe de valida\u00e7\u00e3o da propriedade do registro\:
producer_config_reg_props = Propriedades do registro
producer_config_reg_prop_name = Nome
producer_config_reg_prop_type = Tipo
-producer_config_reg_prop_label = R\u00F3tulo
+producer_config_reg_prop_label = R\u00f3tulo
producer_config_reg_prop_hint = Dica
-producer_config_reg_prop_action = A\u00E7\u00E3o
+producer_config_reg_prop_action = A\u00e7\u00e3o
producer_config_reg_prop_remove = Excluir
-producer_config_no_reg_props = Propriedades obrigat\u00F3rias do registro n\u00E3o especificadas.
+producer_config_no_reg_props = Propriedades obrigat\u00f3rias do registro n\u00e3o especificadas.
producer_config_add_reg_prop = Adicionar propriedade
producer_config_save = Gravar
producer_config_cancel = Cancelar
@@ -133,41 +133,41 @@
CONSUMER_TYPE = Consumidor
# ConsumerBean
-bean_consumer_cannot_find_consumer = N\u00E3o foi poss\u00EDvel encontrar o consumidor ''{0}''\!
-bean_consumer_cannot_update_consumer = N\u00E3o foi poss\u00EDvel atualizar o consumidor\!
-bean_consumer_cannot_refresh_consumer = N\u00E3o foi poss\u00EDvel atualizar o consumidor\!
+bean_consumer_cannot_find_consumer = N\u00e3o foi poss\u00edvel encontrar o consumidor ''{0}''\!
+bean_consumer_cannot_update_consumer = N\u00e3o foi poss\u00edvel atualizar o consumidor\!
+bean_consumer_cannot_refresh_consumer = N\u00e3o foi poss\u00edvel atualizar o consumidor\!
bean_consumer_modify_reg_success = Registro modificado com sucesso\!
-bean_consumer_invalid_modify = Tentativa inv\u00E1lida de modificar um registro que n\u00E3o foi modificado localmente\!
-bean_consumer_cannot_modify_reg = N\u00E3o foi poss\u00EDvel modificar o registro\!
-bean_consumer_cannot_erase_reg = N\u00E3o foi poss\u00EDvel excluir o registro local\!
-bean_consumer_malformed_url = ''{0}'' n\u00E3o \u00E9 uma URL v\u00E1lida\: {1}
-bean_consumer_update_success = Atualiza\u00E7\u00E3o do consumidor realizada com sucesso\!
+bean_consumer_invalid_modify = Tentativa inv\u00e1lida de modificar um registro que n\u00e3o foi modificado localmente\!
+bean_consumer_cannot_modify_reg = N\u00e3o foi poss\u00edvel modificar o registro\!
+bean_consumer_cannot_erase_reg = N\u00e3o foi poss\u00edvel excluir o registro local\!
+bean_consumer_malformed_url = ''{0}'' n\u00e3o \u00e9 uma URL v\u00e1lida\: {1}
+bean_consumer_update_success = Atualiza\u00e7\u00e3o do consumidor realizada com sucesso\!
# ConsumerManagerBean
-bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00E3o nulo, n\u00E3o vazio para o novo consumidor\!
+bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00e3o nulo, n\u00e3o vazio para o novo consumidor\!
bean_consumermanager_no_consumer = Nenhum consumidor foi selecionado\!
-bean_consumermanager_refresh_bypassed = N\u00E3o \u00E9 necess\u00E1rio atualizar.
-bean_consumermanager_refresh_success = Atualiza\u00E7\u00E3o bem sucedida.
-bean_consumermanager_refresh_failure = A atualiza\u00E7\u00E3o falhou (provavelmente porque a informa\u00E7\u00E3o de registro n\u00E3o era v\u00E1lida).
+bean_consumermanager_refresh_bypassed = N\u00e3o \u00e9 necess\u00e1rio atualizar.
+bean_consumermanager_refresh_success = Atualiza\u00e7\u00e3o bem sucedida.
+bean_consumermanager_refresh_failure = A atualiza\u00e7\u00e3o falhou (provavelmente porque a informa\u00e7\u00e3o de registro n\u00e3o era v\u00e1lida).
bean_consumermanager_refresh_exception = Ocorreu um erro inesperado.
-bean_consumermanager_refresh_modify = Informa\u00E7\u00E3o local ou remota foi alterada. Voc\u00EA deve modificar o registro com o produtor remoto. \\n Os novos locais de informa\u00E7\u00E3o ser\u00E3o salvos, mas o seu atual registro de dados ser\u00E1 usado at\u00E9 que voc\u00EA modifique o registro com o produtor com sucesso.
+bean_consumermanager_refresh_modify = Informa\u00e7\u00e3o local ou remota foi alterada. Voc\u00ea deve modificar o registro com o produtor remoto. \\n Os novos locais de informa\u00e7\u00e3o ser\u00e3o salvos, mas o seu atual registro de dados ser\u00e1 usado at\u00e9 que voc\u00ea modifique o registro com o produtor com sucesso.
# ProducerBean
-bean_producer_regpolicy_unset = RegistrationPolicy n\u00E3o definida
-bean_producer_cannot_save = N\u00E3o foi poss\u00EDvel salvar a configura\u00E7\u00E3o do produtor. Motivo\: (0)
-bean_producer_cannot_reload = N\u00E3o foi poss\u00EDvel recarregar a configura\u00E7\u00E3o do produtor. Motivo\: {0}
-bean_producer_save_success = Configura\u00E7\u00E3o do producer gravada com sucesso\!
-bean_producer_cancel_success = Todas as modifica\u00E7\u00F5es feitas na configura\u00E7\u00E3o do produtor foram canceladas\!
+bean_producer_regpolicy_unset = RegistrationPolicy n\u00e3o definida
+bean_producer_cannot_save = N\u00e3o foi poss\u00edvel salvar a configura\u00e7\u00e3o do produtor. Motivo\: (0)
+bean_producer_cannot_reload = N\u00e3o foi poss\u00edvel recarregar a configura\u00e7\u00e3o do produtor. Motivo\: {0}
+bean_producer_save_success = Configura\u00e7\u00e3o do producer gravada com sucesso\!
+bean_producer_cancel_success = Todas as modifica\u00e7\u00f5es feitas na configura\u00e7\u00e3o do produtor foram canceladas\!
## RegistrationProperty Status localization
registration_property_status_inexistent = Produtor inexistente
-registration_property_status_missing = N\u00E3o est\u00E1 presente
-registration_property_status_missing_value = Valor n\u00E3o est\u00E1 presente
+registration_property_status_missing = N\u00e3o est\u00e1 presente
+registration_property_status_missing_value = Valor n\u00e3o est\u00e1 presente
registration_property_status_unchecked_value = Status indeterminado
-registration_property_status_invalid_value = Valor inv\u00E1lido
-registration_property_status_valid = V\u00E1lido
+registration_property_status_invalid_value = Valor inv\u00e1lido
+registration_property_status_valid = V\u00e1lido
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' \u00E9 um nome inv\u00E1lido para {1}\: n\u00E3o deve ser nulo, vazio ou conter os caracteres '\\', '<', '>', '(', ')', '\=' ou '%5c'
-DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00E1 existe\!
\ No newline at end of file
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\: n\u00e3o deve ser nulo, vazio ou conter os caracteres '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c'
+DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\!
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-05-18 20:46:08 UTC (rev 13389)
+++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-05-18 21:21:45 UTC (rev 13390)
@@ -47,26 +47,17 @@
String getObjectTypeName();
boolean isAlreadyExisting(String propertyName);
+
+ String doSimpleChecks(String name);
}
- public final PropertyValidator DEFAULT_PROPERTY_VALIDATOR = new PropertyValidator()
+ private PropertyValidator validator = new DefaultPropertyValidator();
+
+ protected void setValidator(PropertyValidator validator)
{
- public boolean checkForDuplicates()
- {
- return true;
- }
+ this.validator = validator;
+ }
- public String getObjectTypeName()
- {
- return ManagedBean.this.getObjectTypeName();
- }
-
- public boolean isAlreadyExisting(String propertyName)
- {
- return ManagedBean.this.isAlreadyExisting(propertyName);
- }
- };
-
public void setBeanContext(BeanContext beanContext)
{
this.beanContext = beanContext;
@@ -74,7 +65,7 @@
public String checkNameValidity(String name, String targetForErrorMessage)
{
- return checkNameValidity(name, targetForErrorMessage, DEFAULT_PROPERTY_VALIDATOR);
+ return checkNameValidity(name, targetForErrorMessage, validator);
}
public String checkNameValidity(String name, String targetForErrorMessage, PropertyValidator validator)
@@ -89,6 +80,16 @@
}
else
{
+ String original = name;
+ name = validator.doSimpleChecks(name);
+
+ // we got an invalid name after simple checks, fail!
+ if (name == null)
+ {
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME, original, getLocalizedType(objectTypeName));
+ return null;
+ }
+
// Trim name
name = name.trim();
@@ -118,11 +119,6 @@
beanContext.createTargetedErrorMessage(targetForErrorMessage, DUPLICATE, name, getLocalizedType(objectTypeName));
}
- private String getLocalizedType()
- {
- return getLocalizedType(getObjectTypeName());
- }
-
private String getLocalizedType(String objectTypeName)
{
return beanContext.getMessageFromBundle(objectTypeName);
@@ -193,4 +189,28 @@
return null;
}
}
+
+ protected class DefaultPropertyValidator implements PropertyValidator
+ {
+ public boolean checkForDuplicates()
+ {
+ return true;
+ }
+
+ public String getObjectTypeName()
+ {
+ return ManagedBean.this.getObjectTypeName();
+ }
+
+ public boolean isAlreadyExisting(String propertyName)
+ {
+ return ManagedBean.this.isAlreadyExisting(propertyName);
+ }
+
+ public String doSimpleChecks(String name)
+ {
+ // if name contains . or /, it's invalid for a Portal object
+ return (name.indexOf('.') != -1 || name.indexOf('/') != -1) ? null : name;
+ }
+ }
}
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13389 - in modules/authorization/trunk: core-components-api/src/main/java/org/jboss/security/authz/components/subject and 8 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-05-18 16:46:08 -0400 (Mon, 18 May 2009)
New Revision: 13389
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java
modules/authorization/trunk/http-profile/pom.xml
modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestRoles.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java
modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/client/enforcement/Response.java
modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml
modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestHierarchialPropagation.java
modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java
modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliesHierarchialPropagation.java
modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestPolicyServer.java
modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java
Log:
stabilizing the testsuite including http-profile with the new client layer
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/.classpath 2009-05-18 20:46:08 UTC (rev 13389)
@@ -7,11 +7,7 @@
<classpathentry kind="src" path="core-components-api/src/main/java"/>
<classpathentry kind="src" path="core-components-api/src/main/resources"/>
<classpathentry kind="src" path="core-components-api/src/test/java"/>
- <classpathentry kind="src" path="core-components-api/src/test/resources"/>
- <classpathentry kind="src" path="enforcement/src/main/java"/>
- <classpathentry kind="src" path="enforcement/src/main/resources"/>
- <classpathentry kind="src" path="enforcement/src/test/java"/>
- <classpathentry kind="src" path="enforcement/src/test/resources"/>
+ <classpathentry kind="src" path="core-components-api/src/test/resources"/>
<classpathentry kind="src" path="policy-server/src/main/java"/>
<classpathentry kind="src" path="policy-server/src/main/resources"/>
<classpathentry kind="src" path="policy-server/src/test/java"/>
Modified: modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java
===================================================================
--- modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -72,6 +72,11 @@
"insert(Boolean.TRUE);\n"+
"end\n";
+ /**
+ * Some useful constants
+ */
+ public static final String ANONYMOUS = "anonymous";
+
/**
* Role Names
*/
Modified: modules/authorization/trunk/http-profile/pom.xml
===================================================================
--- modules/authorization/trunk/http-profile/pom.xml 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/pom.xml 2009-05-18 20:46:08 UTC (rev 13389)
@@ -67,11 +67,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
<configuration>
- <includes>
- <!--
- <include>**/components/Test*.java</include>
- -->
- <include>**/provisioning/Test*.java</include>
+ <includes>
+ <include>**/components/Test*.java</include>
+ <include>**/provisioning/Test*.java</include>
</includes>
</configuration>
</plugin>
@@ -281,6 +279,13 @@
<properties>
<cargo.jboss.configuration>cargo</cargo.jboss.configuration>
</properties>
+
+ <configfiles>
+ <configfile>
+ <file>${jboss.home}/server/cargo/conf/jboss-log4j.xml</file>
+ <tofile>conf/jboss-log4j.xml</tofile>
+ </configfile>
+ </configfiles>
<deployables>
<deployable>
Modified: modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java
===================================================================
--- modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -52,8 +52,10 @@
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
import org.jboss.security.authz.policy.server.Server;
+import org.jboss.security.authz.policy.server.spi.PolicyConfig;
import org.jboss.security.authz.policy.server.PolicyServer;
-import org.jboss.security.authz.policy.server.spi.PolicyConfig;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.components.resource.HttpResource;
import org.jboss.security.authz.components.subject.Roles;
@@ -73,7 +75,8 @@
{
private static Logger log = Logger.getLogger(SecurityFilter.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
private boolean isPolicyMatchMandatory = false; //set to "false" by default
public SecurityFilter()
@@ -88,13 +91,18 @@
{
//Start the Policy Server
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
- if(this.policyServer == null)
+ if(this.enforcer == null || this.provisioner == null)
{
throw new RuntimeException("Policy Server is unavailable...");
}
+ //TODO: remove this
+ PolicyServer ps = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ ps.getPolicyDecisionPoint().setDebug(true);
+
//Parse the specified Policy and update the Policy Server
PolicyConfig policyConfig = new HttpPolicyConfig();
@@ -107,7 +115,7 @@
for(Policy policy: policies)
{
log.debug(policy.generateSystemPolicy());
- this.policyServer.newPolicy(policy.getMetaData());
+ this.provisioner.newPolicy(policy.getMetaData());
}
log.debug("----------------------------------------------------------");
@@ -149,12 +157,12 @@
//Perform a Security check
Request authzRequest = this.createAuthorizationRequest(httpRequest);
- Response authzResponse = this.policyServer.evaluate(authzRequest);
+ Response authzResponse = this.enforcer.checkAccess(authzRequest);
//Process the authorization response and allow or deny further processing
if(!authzResponse.isAccessGranted())
{
- if(authzResponse.isNotApplicable() && this.isPolicyMatchMandatory)
+ if((authzResponse.isNotApplicable() && this.isPolicyMatchMandatory) || (authzResponse.isDenied()))
{
//Send back an access denied status
httpResponse.sendError(HttpServletResponse.SC_FORBIDDEN);
@@ -164,7 +172,7 @@
{
httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
- }
+ }
}
chain.doFilter(request, response);
@@ -234,7 +242,7 @@
//Setup Role context
//TODO: replace mock code with actual loading of Roles information of the authenticated user via the new Identity API
Roles roles = new Roles();
- roles.addName("Admin");
+ roles.addName(Roles.ANONYMOUS);
authzRequest.addSubject(roles.getSubject());
return authzRequest;
Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -31,7 +31,8 @@
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.server.Server;
import junit.framework.TestCase;
@@ -43,12 +44,15 @@
{
private static Logger log = Logger.getLogger(TestParameterMatching.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
+
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void testMatchContextSuperset() throws Exception
@@ -61,10 +65,10 @@
policyResource.addParameter("p2", "p2Val");
//Store the policy into the Policy Server
- this.policyServer.newPolicy(policyResource.getPolicyMetaData());
+ this.provisioner.newPolicy(policyResource.getPolicyMetaData());
//Assert Policy State of the Server
- Policy[] policies = this.policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -113,10 +117,10 @@
}
//Store the policy into the Policy Server
- this.policyServer.newPolicy(policyResource.getPolicyMetaData());
+ this.provisioner.newPolicy(policyResource.getPolicyMetaData());
//Assert Policy State of the Server
- Policy[] policies = this.policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -141,7 +145,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestRoles.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestRoles.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestRoles.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -29,9 +29,10 @@
import org.jboss.security.authz.components.subject.Roles;
import org.jboss.security.authz.model.Policy;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.policy.server.Server;
import junit.framework.TestCase;
@@ -43,12 +44,14 @@
{
private static Logger log = Logger.getLogger(TestRoles.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void test() throws Exception
@@ -59,10 +62,10 @@
policyResource.addAllowed("pm");
policyResource.addAllowed("lead");
- this.policyServer.newPolicy(policyResource.getPolicyMetaData());
+ this.provisioner.newPolicy(policyResource.getPolicyMetaData());
//Assert Policy State of the Server
- Policy[] policies = this.policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -87,10 +90,10 @@
policyResource.addAllowed("Pm");
policyResource.addAllowed("LeaD");
- this.policyServer.newPolicy(policyResource.getPolicyMetaData());
+ this.provisioner.newPolicy(policyResource.getPolicyMetaData());
//Assert Policy State of the Server
- Policy[] policies = this.policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -110,7 +113,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -32,9 +32,10 @@
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyMetaData;
import org.jboss.security.authz.model.Resource;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.policy.server.Server;
import junit.framework.TestCase;
@@ -46,12 +47,14 @@
{
private static Logger log = Logger.getLogger(TestURLPattern.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void testRegex() throws Exception
@@ -82,10 +85,10 @@
httpResource.addAllowed("Admin");
PolicyMetaData policyMetaData = httpResource.getPolicyMetaData();
- this.policyServer.newPolicy(policyMetaData);
+ this.provisioner.newPolicy(policyMetaData);
//Assert Policy State of the Server
- Policy[] policies = this.policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -111,7 +114,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -38,7 +38,8 @@
import org.jboss.security.authz.tools.GeneralTool;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.policy.server.Server;
import org.jboss.security.authz.policy.server.spi.PolicyConfig;
@@ -53,7 +54,8 @@
*/
private static Logger log = Logger.getLogger(TestHttpPolicyConfig.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
/**
*
@@ -61,7 +63,8 @@
protected void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
//------------------------------------------------------------------------------------------------------------------------------------------------------
public void testExecutiveFiles() throws Exception
@@ -76,7 +79,7 @@
for(int i=0; i<policies.length; i++)
{
String xacmlPolicy = policies[i].generateSystemPolicy();
- this.policyServer.newPolicy(policies[i].getMetaData());
+ this.provisioner.newPolicy(policies[i].getMetaData());
log.info("------------------------------------------------------");
log.info(xacmlPolicy);
@@ -188,7 +191,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/client/enforcement/Response.java
===================================================================
--- modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/client/enforcement/Response.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/client/enforcement/Response.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -81,4 +81,16 @@
return isNotApplicable;
}
+
+ public boolean isDenied()
+ {
+ boolean isDenied = false;
+
+ if(this.message.toLowerCase().contains("deny"))
+ {
+ isDenied = true;
+ }
+
+ return isDenied;
+ }
}
Modified: modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml 2009-05-18 20:46:08 UTC (rev 13389)
@@ -28,7 +28,7 @@
</bean>
<!-- Local Policy Enforcement client -->
- <bean name="/enforcement/localEnforcementPoint" class="org.jboss.security.authz.policy.client.LocalEnforcementPoint">
+ <bean name="/enforcement/localEnforcementPoint" class="org.jboss.security.authz.policy.client.enforcement.LocalEnforcementPoint">
<property name="policyServer">
<inject bean="/policy-server/PolicyServer"/>
</property>
Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestHierarchialPropagation.java
===================================================================
--- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestHierarchialPropagation.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestHierarchialPropagation.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -32,14 +32,12 @@
import org.jboss.security.authz.components.resource.URIResource;
import org.jboss.security.authz.components.subject.Roles;
-import org.jboss.security.authz.components.action.Operation;
import org.jboss.security.authz.components.action.Read;
-import org.jboss.security.authz.components.action.Write;
-import org.jboss.security.authz.components.action.Manage;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
@@ -48,12 +46,14 @@
{
private static Logger log = Logger.getLogger(TestHierarchialPropagation.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void tearDown() throws Exception
@@ -70,7 +70,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -91,7 +91,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
this.assertServerState();
//Go ahead and produce a RequestContext for a "Permit" Enforcement
@@ -113,7 +113,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -134,7 +134,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -155,7 +155,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Setup denied policy
resource = new URIResource();
@@ -165,7 +165,7 @@
//Provision the new policy
metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -186,7 +186,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -223,7 +223,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
@@ -242,7 +242,7 @@
private void assertServerState() throws Exception
{
//Assert Policy State of the Server
- Policy[] policies = policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java
===================================================================
--- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -37,9 +37,10 @@
import org.jboss.security.authz.components.action.Write;
import org.jboss.security.authz.components.action.Manage;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
@@ -48,12 +49,14 @@
{
private static Logger log = Logger.getLogger(TestImpliedActions.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void tearDown() throws Exception
@@ -71,7 +74,7 @@
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
this.assertServerState();
//Go ahead and produce a RequestContext for a "Permit" Enforcement
@@ -89,7 +92,7 @@
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
this.assertServerState();
//Go ahead and produce a RequestContext for a "Permit" Enforcement
@@ -107,7 +110,7 @@
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
this.assertServerState();
//Go ahead and produce a RequestContext for a "Deny" Enforcement
@@ -137,7 +140,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
@@ -156,7 +159,7 @@
private void assertServerState() throws Exception
{
//Assert Policy State of the Server
- Policy[] policies = policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliesHierarchialPropagation.java
===================================================================
--- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliesHierarchialPropagation.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliesHierarchialPropagation.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -36,9 +36,10 @@
import org.jboss.security.authz.components.action.Write;
import org.jboss.security.authz.components.action.Manage;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
@@ -47,12 +48,14 @@
{
private static Logger log = Logger.getLogger(TestImpliesHierarchialPropagation.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void tearDown() throws Exception
@@ -69,7 +72,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -90,7 +93,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -111,7 +114,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -132,7 +135,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
URIResource contextResource = new URIResource();
@@ -153,7 +156,7 @@
//Provision the new policy
PolicyMetaData metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Setup denied policy....User can only read level2
resource = new URIResource();
@@ -163,7 +166,7 @@
//Provision the new policy
metadata = resource.getPolicyMetaData();
- policyServer.newPolicy(metadata);
+ this.provisioner.newPolicy(metadata);
//Go ahead and produce a RequestContext for a "Permit" Enforcement
//Trying to "Write" to level2 should be Denied
@@ -201,7 +204,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
log.info("-----------------------------------");
@@ -220,7 +223,7 @@
private void assertServerState() throws Exception
{
//Assert Policy State of the Server
- Policy[] policies = policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestPolicyServer.java
===================================================================
--- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestPolicyServer.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestPolicyServer.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -26,8 +26,8 @@
import org.apache.log4j.Logger;
import org.jboss.security.authz.model.Policy;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.components.resource.HttpResource;
-import org.jboss.security.authz.policy.server.PolicyServer;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
@@ -36,12 +36,13 @@
{
private static Logger log = Logger.getLogger(TestPolicyServer.class);
- private PolicyServer policyServer;
+ private PolicyProvisioner provisioner;
+
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void tearDown() throws Exception
@@ -54,10 +55,10 @@
httpResource.setUri(new URI("/blah/index.html"));
httpResource.addParameter("param1", "param1Value");
- policyServer.newPolicy(httpResource.getPolicyMetaData());
+ this.provisioner.newPolicy(httpResource.getPolicyMetaData());
//Assert Policy State of the Server
- Policy[] policies = policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java
===================================================================
--- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java 2009-05-18 15:38:03 UTC (rev 13388)
+++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java 2009-05-18 20:46:08 UTC (rev 13389)
@@ -34,9 +34,10 @@
import org.jboss.security.authz.components.subject.Roles;
import org.jboss.security.authz.components.action.Read;
+import org.jboss.security.authz.policy.client.enforcement.PolicyEnforcementPoint;
import org.jboss.security.authz.policy.client.enforcement.Request;
import org.jboss.security.authz.policy.client.enforcement.Response;
-import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.client.provisioning.PolicyProvisioner;
import org.jboss.security.authz.policy.server.Server;
@@ -47,12 +48,14 @@
{
private static Logger log = Logger.getLogger(TestEnterprisePolicyFinderModule.class);
- private PolicyServer policyServer;
+ private PolicyEnforcementPoint enforcer;
+ private PolicyProvisioner provisioner;
public void setUp() throws Exception
{
Server.bootstrap();
- this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+ this.enforcer = (PolicyEnforcementPoint)Server.lookup("/enforcement/localEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)Server.lookup("/provisioning/localProvisioner");
}
public void tearDown() throws Exception
@@ -69,11 +72,11 @@
httpResource.setOperation(new Read());
PolicyMetaData policyMetaData = httpResource.getPolicyMetaData();
- policyServer.newPolicy(policyMetaData);
+ this.provisioner.newPolicy(policyMetaData);
//Assert Policy State of the Server
- Policy[] policies = policyServer.readAllPolicies();
+ Policy[] policies = this.provisioner.readAllPolicies();
assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
log.info("------------------------------------------------------------------------------");
@@ -89,7 +92,7 @@
private void enforce(Request request, boolean mustBePermitted) throws Exception
{
- Response response = this.policyServer.evaluate(request);
+ Response response = this.enforcer.checkAccess(request);
assertNotNull(response);
if(mustBePermitted)
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13388 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-18 11:38:03 -0400 (Mon, 18 May 2009)
New Revision: 13388
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
Log:
- JBEPP-84: Use proper messageTarget for addPageAction so that error message is properly displayed.
- JBEPP-83: PropertyBeans now extend ManagedBean so that they can validate their values before saving them.
- Now inject bean context in PortalObjectManagerBean so that it can be made available to children beans.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2009-05-18 15:38:03 UTC (rev 13388)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
package org.jboss.portal.core.admin.ui;
@@ -32,7 +33,6 @@
import javax.faces.model.SelectItem;
import javax.portlet.PortletConfig;
import javax.portlet.PortletRequest;
-
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -65,7 +65,7 @@
public ControlPropertiesBean(PortalObjectManagerBean pomgr)
{
this.pomgr = pomgr;
-
+
ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader()));
// Load all supported locales
@@ -74,11 +74,11 @@
while (locales.hasMoreElements())
{
Locale locale = locales.nextElement();
- rbm.getResourceBundle(locale);
+ rbm.getResourceBundle(locale);
}
DISPLAY_THE_DEFAULT_ERROR_MESSAGE = rbm.getLocalizedValue("DISPLAY_THE_DEFAULT_ERROR_MESSAGE", "Display the default error message");
- REDIRECT_TO_THE_SPECIFIED_RESOURCE = rbm.getLocalizedValue("REDIRECT_TO_THE_SPECIFIED_RESOURCE", "Redirect to the specified resource");
- REMOVE_THE_RESOURCE_FROM_PAGE = rbm.getLocalizedValue("REMOVE_THE_RESOURCE_FROM_PAGE", "Remove the resource from page");
+ REDIRECT_TO_THE_SPECIFIED_RESOURCE = rbm.getLocalizedValue("REDIRECT_TO_THE_SPECIFIED_RESOURCE", "Redirect to the specified resource");
+ REMOVE_THE_RESOURCE_FROM_PAGE = rbm.getLocalizedValue("REMOVE_THE_RESOURCE_FROM_PAGE", "Remove the resource from page");
portalSelectItems = new HashMap<Locale, List<SelectItem>>();
pageSelectItems = new HashMap<Locale, List<SelectItem>>();
}
@@ -132,7 +132,9 @@
boolean inheritable = object.getType() != PortalObject.TYPE_CONTEXT;
boolean inherited = !object.getDeclaredProperties().containsKey(name);
String value = object.getProperty(name);
- return new ControlPropertyBean(this, info.getPropertyInfo(name), inherited, inheritable, value);
+ ControlPropertyBean bean = new ControlPropertyBean(this, info.getPropertyInfo(name), inherited, inheritable, value);
+ bean.setBeanContext(getBeanContext()); // propagate bean context to chilren beans
+ return bean;
}
public ControlPropertyBean getPageControlAccessDenied()
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2009-05-18 15:38:03 UTC (rev 13388)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
package org.jboss.portal.core.admin.ui;
@@ -69,7 +70,9 @@
public void setValue(Object value)
{
- if (!inherited)
+ // it's currently quite difficult to retrieve the correct target for error messages, send them to "status"
+ String propertyValue = checkNameValidity(value.toString(), null);
+ if (propertyValue != null && !inherited)
{
this.value = value.toString();
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-05-18 15:38:03 UTC (rev 13388)
@@ -45,7 +45,7 @@
import org.jboss.portal.core.model.portal.PortalObjectPermission;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.faces.component.portlet.PortletEventEvent;
-import org.jboss.portal.faces.gui.JSFBeanContext;
+import org.jboss.portal.faces.gui.BeanContext;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvoker;
@@ -168,6 +168,8 @@
/** . */
private transient Boolean maximizedStateExists;
+ private transient BeanContext beanContext;
+
// Wired services
public String getNamespace()
@@ -180,6 +182,16 @@
this.namespace = namespace;
}
+ public BeanContext getBeanContext()
+ {
+ return beanContext;
+ }
+
+ public void setBeanContext(BeanContext beanContext)
+ {
+ this.beanContext = beanContext;
+ }
+
public List getAvailableContentTypes()
{
LinkedList<SelectItem> types = new LinkedList<SelectItem>();
@@ -655,20 +667,20 @@
{
if (pageManager == null)
{
- // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext
pageManager = new PageManagerBean(layoutService, portletDefinitionInvoker);
- pageManager.setBeanContext(new JSFBeanContext());
+ pageManager.setBeanContext(beanContext);
}
pageManager.page = (Page)selectedObject;
}
//
selectedProperties = new PropertiesBean(this);
+ selectedProperties.setBeanContext(beanContext);
controlProperties = new ControlPropertiesBean(this);
+ controlProperties.setBeanContext(beanContext);
- // it'd be better if propertyAction was injected in faces-config.xml so that we can also inject the shared beanContext
propertyAction = new PropertyAction(this);
- propertyAction.setBeanContext(new JSFBeanContext());
+ propertyAction.setBeanContext(beanContext);
//
theme = new ThemeBean(selectedObject);
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2009-05-18 15:38:03 UTC (rev 13388)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -22,17 +22,18 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.faces.gui.ManagedBean;
+
import javax.faces.context.FacesContext;
-import org.jboss.portal.core.model.portal.PortalObject;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class PropertyBean implements Comparable
+public class PropertyBean extends ManagedBean implements Comparable
{
/** . */
@@ -103,23 +104,28 @@
public void setValue(Object value)
{
- this.value = value.toString();
+ // it's currently quite difficult to retrieve the correct target for error messages, send them to "status"
+ String propertyValue = checkNameValidity(value.toString(), null);
+ if (propertyValue != null)
+ {
+ this.value = propertyValue;
- // Need to use the container as it will contain the refreshed object
- PortalObject portalObject = container.getRelatedObject();
+ // Need to use the container as it will contain the refreshed object
+ PortalObject portalObject = container.getRelatedObject();
- //if value is inherited check if updated value is the same - if yes, don't update to keep inheritance
- if (isInherited())
- {
- String parentValue = portalObject.getProperty(getName());
- if (value.equals(parentValue))
+ //if value is inherited check if updated value is the same - if yes, don't update to keep inheritance
+ if (isInherited())
{
- return;
+ String parentValue = portalObject.getProperty(getName());
+ if (value.equals(parentValue))
+ {
+ return;
+ }
}
+
+ //
+ portalObject.setDeclaredProperty(getName(), propertyValue);
}
-
- //
- portalObject.setDeclaredProperty(getName(), value.toString());
}
public int compareTo(Object o)
@@ -142,4 +148,14 @@
{
return "PropertyBean[name=" + info.getName() + ",value=" + value + "]";
}
+
+ protected String getObjectTypeName()
+ {
+ return "PROPERTY_TYPE";
+ }
+
+ public boolean isAlreadyExisting(String objectName)
+ {
+ return false; // no need to check for duplicates here
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2009-05-18 15:38:03 UTC (rev 13388)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -23,6 +23,7 @@
package org.jboss.portal.core.admin.ui;
import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.faces.gui.BeanContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -30,7 +31,18 @@
*/
public abstract class PropertyBeanContainer
{
+ private BeanContext beanContext;
+ public BeanContext getBeanContext()
+ {
+ return beanContext;
+ }
+
+ public void setBeanContext(BeanContext beanContext)
+ {
+ this.beanContext = beanContext;
+ }
+
public abstract PortalObject getRelatedObject();
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-05-18 00:12:44 UTC (rev 13387)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2009-05-18 15:38:03 UTC (rev 13388)
@@ -103,6 +103,11 @@
<property-name>coordinationService</property-name>
<value>#{applicationScope.CoordinationService}</value>
</managed-property>
+ <managed-property>
+ <property-name>beanContext</property-name>
+ <property-class>org.jboss.portal.faces.gui.BeanContext</property-class>
+ <value>#{beanContext}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
<managed-bean-name>portalAction</managed-bean-name>
@@ -128,7 +133,7 @@
</managed-property>
<managed-property>
<property-name>messageTarget</property-name>
- <value>addPageForm:pageName</value>
+ <value>create-page-form:pageName</value>
</managed-property>
<managed-property>
<property-name>listener</property-name>
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13387 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-17 20:12:44 -0400 (Sun, 17 May 2009)
New Revision: 13387
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
- Forgot to update thirdparty (dependence on identity trunk). Should build now.
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-05-16 21:26:07 UTC (rev 13386)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-05-18 00:12:44 UTC (rev 13387)
@@ -68,7 +68,7 @@
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.8"/>
+ <componentref name="jboss-portal/modules/identity" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/cms" version="1.2.5"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
14 years, 11 months
- 1
- 0
JBoss Portal SVN: r13386 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: resources/portal-identity-sar/conf/bundles and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-05-16 17:26:07 -0400 (Sat, 16 May 2009)
New Revision: 13386
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
Log:
- JBPORTAL-2391: completed validation of role names and display names.
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-16 21:16:01 UTC (rev 13385)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-16 21:26:07 UTC (rev 13386)
@@ -23,10 +23,10 @@
package org.jboss.portal.core.identity.ui.actions;
+import org.jboss.portal.core.identity.ui.UIRole;
+import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.core.identity.ui.UIRole;
-import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -34,21 +34,37 @@
*/
public class BaseRoleAction extends ManagedBean
{
- /** .*/
+ /** . */
protected UIRole uiRole;
- /** .*/
+ /** . */
protected IdentityRoleBean identityRoleBean;
+ protected final PropertyValidator displayNameValidator = new DisplayNameValidator();
+ private static final String ROLE_DISPLAY_TYPE = "ROLE_DISPLAY_TYPE";
+ private static final String ROLE_TYPE = "ROLE_TYPE";
+
protected String getObjectTypeName()
{
- return "ROLE_TYPE";
+ return ROLE_TYPE;
}
public boolean isAlreadyExisting(String objectName)
{
+ return isAlreadyExisting(objectName, false);
+ }
+
+ protected boolean isAlreadyExisting(String objectName, boolean isDisplay)
+ {
try
{
- return identityRoleBean.getRoleModule().findRoleByName(objectName) != null;
+ if (isDisplay)
+ {
+ return identityRoleBean.getRoleModule().findRoleByDisplayName(objectName) != null;
+ }
+ else
+ {
+ return identityRoleBean.getRoleModule().findRoleByName(objectName) != null;
+ }
}
catch (IdentityException e)
{
@@ -68,6 +84,24 @@
}
}
+ private class DisplayNameValidator implements PropertyValidator
+ {
+ public boolean checkForDuplicates()
+ {
+ return true;
+ }
+
+ public String getObjectTypeName()
+ {
+ return ROLE_DISPLAY_TYPE;
+ }
+
+ public boolean isAlreadyExisting(String propertyName)
+ {
+ return BaseRoleAction.this.isAlreadyExisting(propertyName, true);
+ }
+ }
+
public UIRole getUiRole()
{
return uiRole;
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-05-16 21:16:01 UTC (rev 13385)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateRoleAction.java 2009-05-16 21:26:07 UTC (rev 13386)
@@ -40,8 +40,10 @@
String name = this.uiRole.getName();
String displayName = this.uiRole.getDisplayName();
name = checkNameValidity(name, "create-role-form:rolename");
- displayName = checkNameValidity(displayName, "create-role-form:roledisplayname", false);
+ // check display name validity for XSS injection but check duplicate separately due to limitation to how ManagedBean works
+ displayName = checkNameValidity(displayName, "create-role-form:roledisplayname", displayNameValidator);
+
if (name != null && displayName != null)
{
try
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-05-16 21:16:01 UTC (rev 13385)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2009-05-16 21:26:07 UTC (rev 13386)
@@ -23,6 +23,8 @@
package org.jboss.portal.core.identity.ui.actions;
import org.jboss.portal.common.text.FastURLDecoder;
+import org.jboss.portal.core.identity.ui.UIRole;
+import org.jboss.portal.identity.IdentityException;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
@@ -54,7 +56,24 @@
public String updateRole()
{
String roleDisplayName = this.uiRole.getDisplayName();
- roleDisplayName = checkNameValidity(roleDisplayName, "edit-role-link:display-name", false); // do not check for duplicates
+
+ // Check that the new role is different from the old one
+ try
+ {
+ String roleName = uiRole.getName();
+ UIRole current = identityRoleBean.getUIRole(roleName);
+ if (!isOldAndNewDifferent(current.getDisplayName(), roleDisplayName))
+ {
+ // if the new and old display names are the same, just return
+ return "roleAdmin";
+ }
+ }
+ catch (IdentityException e)
+ {
+ log.error("Couldn't get current role " + roleDisplayName);
+ }
+
+ roleDisplayName = checkNameValidity(roleDisplayName, "edit-role-link:display-name", displayNameValidator); // display names are unique as well
if (roleDisplayName != null)
{
try
@@ -69,5 +88,4 @@
}
return null;
}
-
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-16 21:16:01 UTC (rev 13385)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-16 21:26:07 UTC (rev 13386)
@@ -177,6 +177,7 @@
IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
ROLE_TYPE=role
+ROLE_DISPLAY_TYPE=role display
INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty or contain '\\', '<', '>', '(', ')', '=' or '%5c'
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-16 21:16:01 UTC (rev 13385)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-16 21:26:07 UTC (rev 13386)
@@ -297,5 +297,6 @@
javax.faces.component.UIInput.REQUIRED=Valeur requise
ROLE_TYPE=r\u00f4le
+ROLE_DISPLAY_TYPE=affichage r\u00f4le
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '\\', '<', '>', '(', ')', '=' ou '%5c'
14 years, 11 months
- 1
- 0