exo-jcr SVN: r5507 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 07:41:30 -0500 (Tue, 24 Jan 2012)
New Revision: 5507
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanerTool.java
Log:
EXOJCR-1707: Changed validation method's parameters, since no need to pass more than one Permission to be validated
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2012-01-24 12:40:19 UTC (rev 5506)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2012-01-24 12:41:30 UTC (rev 5507)
@@ -62,8 +62,7 @@
*/
public static void cleanWorkspaceData(WorkspaceEntry wsEntry) throws DBCleanException
{
- SecurityHelper
- .validateSecurityPermissions(new RuntimePermission[]{JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION});
+ SecurityHelper.validateSecurityPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
Connection jdbcConn = getConnection(wsEntry);
boolean autoCommit = DialectConstants.DB_DIALECT_SYBASE.equalsIgnoreCase(resolveDialect(wsEntry));
@@ -101,8 +100,7 @@
*/
public static void cleanRepositoryData(RepositoryEntry rEntry) throws DBCleanException
{
- SecurityHelper
- .validateSecurityPermissions(new RuntimePermission[]{JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION});
+ SecurityHelper.validateSecurityPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
WorkspaceEntry wsEntry = rEntry.getWorkspaceEntries().get(0);
@@ -157,8 +155,7 @@
public static DBCleanerTool getRepositoryDBCleaner(Connection jdbcConn, RepositoryEntry rEntry)
throws DBCleanException
{
- SecurityHelper
- .validateSecurityPermissions(new RuntimePermission[]{JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION});
+ SecurityHelper.validateSecurityPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
WorkspaceEntry wsEntry = rEntry.getWorkspaceEntries().get(0);
@@ -190,8 +187,7 @@
*/
public static DBCleanerTool getWorkspaceDBCleaner(Connection jdbcConn, WorkspaceEntry wsEntry) throws DBCleanException
{
- SecurityHelper
- .validateSecurityPermissions(new RuntimePermission[]{JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION});
+ SecurityHelper.validateSecurityPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
boolean multiDb = getMultiDbParameter(wsEntry);
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanerTool.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanerTool.java 2012-01-24 12:40:19 UTC (rev 5506)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanerTool.java 2012-01-24 12:41:30 UTC (rev 5507)
@@ -158,8 +158,7 @@
*/
protected void execute(List<String> scripts) throws SQLException
{
- SecurityHelper
- .validateSecurityPermissions(new RuntimePermission[]{JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION});
+ SecurityHelper.validateSecurityPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
// set needed auto commit mode
boolean autoCommit = connection.getAutoCommit();
14 years, 3 months
exo-jcr SVN: r5506 - in core/branches/2.5.x: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 07:40:19 -0500 (Tue, 24 Jan 2012)
New Revision: 5506
Modified:
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
Log:
EXOJCR-1707: Changed validation method's parameters, since no need to pass more than one Permission to be validated
Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -84,7 +84,7 @@
*/
public void addGroupEventListener(GroupEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.add(listener);
}
@@ -93,7 +93,7 @@
*/
public void removeGroupEventListener(GroupEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -90,7 +90,7 @@
*/
public void addMembershipEventListener(MembershipEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.add(listener);
}
@@ -99,7 +99,7 @@
*/
public void removeMembershipEventListener(MembershipEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -157,7 +157,7 @@
*/
public void addMembershipTypeEventListener(MembershipTypeEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -166,7 +166,7 @@
*/
public void removeMembershipTypeEventListener(MembershipTypeEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -77,7 +77,7 @@
*/
public void addUserEventListener(UserEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.add(listener);
}
@@ -86,7 +86,7 @@
*/
public void removeUserEventListener(UserEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -69,7 +69,7 @@
*/
public void addUserProfileEventListener(UserProfileEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.add(listener);
}
@@ -78,7 +78,7 @@
*/
public void removeUserProfileEventListener(UserProfileEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners_.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -91,7 +91,7 @@
*/
public void addGroupEventListener(GroupEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -100,7 +100,7 @@
*/
public void removeGroupEventListener(GroupEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -101,7 +101,7 @@
*/
public void addMembershipEventListener(MembershipEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -110,7 +110,7 @@
*/
public void removeMembershipEventListener(MembershipEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -375,7 +375,7 @@
*/
public void addMembershipTypeEventListener(MembershipTypeEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -384,7 +384,7 @@
*/
public void removeMembershipTypeEventListener(MembershipTypeEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -98,7 +98,7 @@
*/
public void addUserEventListener(UserEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -107,7 +107,7 @@
*/
public void removeUserEventListener(UserEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
===================================================================
--- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2012-01-24 12:38:40 UTC (rev 5505)
+++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2012-01-24 12:40:19 UTC (rev 5506)
@@ -256,7 +256,7 @@
*/
public void addUserProfileEventListener(UserProfileEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.add(listener);
}
@@ -265,7 +265,7 @@
*/
public void removeUserProfileEventListener(UserProfileEventListener listener)
{
- SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
+ SecurityHelper.validateSecurityPermission(PermissionConstants.MANAGE_LISTENERS);
listeners.remove(listener);
}
14 years, 3 months
exo-jcr SVN: r5505 - kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 07:38:40 -0500 (Tue, 24 Jan 2012)
New Revision: 5505
Modified:
kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
Log:
EXOJCR-1707: Changed validation method's parameters, since no need to pass more than one Permission to be validated
Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
===================================================================
--- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-01-24 12:17:40 UTC (rev 5504)
+++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-01-24 12:38:40 UTC (rev 5505)
@@ -325,15 +325,12 @@
*
* @throws AccessControlException
*/
- public static void validateSecurityPermissions(RuntimePermission... perms)
+ public static void validateSecurityPermission(Permission permission)
{
SecurityManager security = System.getSecurityManager();
if (security != null)
{
- for (Permission permission : perms)
- {
security.checkPermission(permission);
- }
}
}
}
14 years, 3 months
exo-jcr SVN: r5504 - core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-01-24 07:17:40 -0500 (Tue, 24 Jan 2012)
New Revision: 5504
Modified:
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
Log:
EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-24 12:14:04 UTC (rev 5503)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-24 12:17:40 UTC (rev 5504)
@@ -82,15 +82,17 @@
{
try
{
- ValueParam concurrencyLevel = ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
- if (concurrencyLevel != null)
+ if (ip != null)
{
- return Integer.valueOf(concurrencyLevel.getValue());
+ ValueParam concurrencyLevel = ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
+
+ if (concurrencyLevel != null)
+ {
+ return Integer.valueOf(concurrencyLevel.getValue());
+ }
}
- else
- {
- return DEFAULT_CONCURRENCY_LEVEL;
- }
+
+ return DEFAULT_CONCURRENCY_LEVEL;
}
catch (Exception e)
{
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-24 12:14:04 UTC (rev 5503)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-24 12:17:40 UTC (rev 5504)
@@ -70,15 +70,17 @@
{
try
{
- ValueParam concurrencyLevel = params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
- if (concurrencyLevel != null)
+ if (params != null)
{
- return Integer.valueOf(concurrencyLevel.getValue());
+ ValueParam concurrencyLevel = params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
+
+ if (concurrencyLevel != null)
+ {
+ return Integer.valueOf(concurrencyLevel.getValue());
+ }
}
- else
- {
- return DEFAULT_CONCURRENCY_LEVEL;
- }
+
+ return DEFAULT_CONCURRENCY_LEVEL;
}
catch (Exception e)
{
14 years, 3 months
exo-jcr SVN: r5503 - core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2012-01-24 07:14:04 -0500 (Tue, 24 Jan 2012)
New Revision: 5503
Modified:
core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
Log:
EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2
Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
===================================================================
--- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-24 11:03:48 UTC (rev 5502)
+++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-24 12:14:04 UTC (rev 5503)
@@ -82,15 +82,17 @@
{
try
{
- ValueParam concurrencyLevel = ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
- if (concurrencyLevel != null)
+ if (ip != null)
{
- return Integer.valueOf(concurrencyLevel.getValue());
+ ValueParam concurrencyLevel = ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
+
+ if (concurrencyLevel != null)
+ {
+ return Integer.valueOf(concurrencyLevel.getValue());
+ }
}
- else
- {
- return DEFAULT_CONCURRENCY_LEVEL;
- }
+
+ return DEFAULT_CONCURRENCY_LEVEL;
}
catch (Exception e)
{
Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
===================================================================
--- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-24 11:03:48 UTC (rev 5502)
+++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-24 12:14:04 UTC (rev 5503)
@@ -70,15 +70,17 @@
{
try
{
- ValueParam concurrencyLevel = params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
- if (concurrencyLevel != null)
+ if (params != null)
{
- return Integer.valueOf(concurrencyLevel.getValue());
+ ValueParam concurrencyLevel = params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL);
+
+ if (concurrencyLevel != null)
+ {
+ return Integer.valueOf(concurrencyLevel.getValue());
+ }
}
- else
- {
- return DEFAULT_CONCURRENCY_LEVEL;
- }
+
+ return DEFAULT_CONCURRENCY_LEVEL;
}
catch (Exception e)
{
14 years, 3 months
exo-jcr SVN: r5502 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 06:03:48 -0500 (Tue, 24 Jan 2012)
New Revision: 5502
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-listener.xml
Log:
EXOJCR-1716: added doc note
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-listener.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-listener.xml 2012-01-24 10:54:11 UTC (rev 5501)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-listener.xml 2012-01-24 11:03:48 UTC (rev 5502)
@@ -178,5 +178,13 @@
<para>Now, simply deploy the jar under $TOMCAT_HOME/lib and your listeners
are ready!</para>
+
+ <para><note>
+ <para>Be aware that you need to set proper RuntimePermission to be
+ able to add or remove Listeners. To do that you need to grant the
+ following permission for your code</para>
+
+ <programlisting>permission java.lang.RuntimePermission "manageListeners"</programlisting>
+ </note></para>
</section>
</chapter>
14 years, 3 months
exo-jcr SVN: r5501 - in core/trunk: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap and 1 other directories.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 05:54:11 -0500 (Tue, 24 Jan 2012)
New Revision: 5501
Modified:
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/PermissionConstants.java
Log:
EXOJCR-1716: protected all the methods that register or unregister the organization service listeners
* added new RuntimePermission - manageListeners
* added permissions checks for Ldap and Hibernate organization services
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -19,12 +19,14 @@
package org.exoplatform.services.organization.hibernate;
import org.exoplatform.commons.exception.UniqueObjectException;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.database.HibernateService;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.GroupEventListener;
import org.exoplatform.services.organization.GroupEventListenerHandler;
import org.exoplatform.services.organization.GroupHandler;
import org.exoplatform.services.organization.impl.GroupImpl;
+import org.exoplatform.services.security.PermissionConstants;
import org.hibernate.Query;
import org.hibernate.Session;
@@ -82,6 +84,7 @@
*/
public void addGroupEventListener(GroupEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.add(listener);
}
@@ -90,6 +93,7 @@
*/
public void removeGroupEventListener(GroupEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -21,6 +21,7 @@
import org.exoplatform.commons.utils.IdentifierUtil;
import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.commons.utils.ListenerStack;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.database.HibernateService;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.Membership;
@@ -31,6 +32,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.impl.MembershipImpl;
+import org.exoplatform.services.security.PermissionConstants;
import org.hibernate.Session;
import java.util.Collection;
@@ -88,6 +90,7 @@
*/
public void addMembershipEventListener(MembershipEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.add(listener);
}
@@ -96,6 +99,7 @@
*/
public void removeMembershipEventListener(MembershipEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipTypeDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -18,12 +18,14 @@
*/
package org.exoplatform.services.organization.hibernate;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.database.HibernateService;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.MembershipTypeEventListener;
import org.exoplatform.services.organization.MembershipTypeEventListenerHandler;
import org.exoplatform.services.organization.MembershipTypeHandler;
import org.exoplatform.services.organization.impl.MembershipTypeImpl;
+import org.exoplatform.services.security.PermissionConstants;
import org.hibernate.Session;
import java.util.ArrayList;
@@ -155,6 +157,7 @@
*/
public void addMembershipTypeEventListener(MembershipTypeEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -163,6 +166,7 @@
*/
public void removeMembershipTypeEventListener(MembershipTypeEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -20,6 +20,7 @@
import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
import org.exoplatform.services.database.HibernateService;
@@ -33,6 +34,7 @@
import org.exoplatform.services.organization.UserHandler;
import org.exoplatform.services.organization.impl.UserImpl;
import org.exoplatform.services.security.PasswordEncrypter;
+import org.exoplatform.services.security.PermissionConstants;
import org.hibernate.Session;
import java.util.ArrayList;
@@ -75,6 +77,7 @@
*/
public void addUserEventListener(UserEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.add(listener);
}
@@ -83,6 +86,7 @@
*/
public void removeUserEventListener(UserEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.organization.hibernate;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
import org.exoplatform.services.database.HibernateService;
@@ -27,6 +28,7 @@
import org.exoplatform.services.organization.UserProfileHandler;
import org.exoplatform.services.organization.impl.UserProfileData;
import org.exoplatform.services.organization.impl.UserProfileImpl;
+import org.exoplatform.services.security.PermissionConstants;
import org.hibernate.Session;
import java.util.ArrayList;
@@ -67,6 +69,7 @@
*/
public void addUserProfileEventListener(UserProfileEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.add(listener);
}
@@ -75,6 +78,7 @@
*/
public void removeUserProfileEventListener(UserProfileEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners_.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.organization.ldap;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -28,6 +29,7 @@
import org.exoplatform.services.organization.GroupEventListenerHandler;
import org.exoplatform.services.organization.GroupHandler;
import org.exoplatform.services.organization.impl.GroupImpl;
+import org.exoplatform.services.security.PermissionConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -89,6 +91,7 @@
*/
public void addGroupEventListener(GroupEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -97,6 +100,7 @@
*/
public void removeGroupEventListener(GroupEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -19,6 +19,7 @@
package org.exoplatform.services.organization.ldap;
import org.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -33,6 +34,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.impl.MembershipImpl;
+import org.exoplatform.services.security.PermissionConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -99,6 +101,7 @@
*/
public void addMembershipEventListener(MembershipEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -107,6 +110,7 @@
*/
public void removeMembershipEventListener(MembershipEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.organization.ldap;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -28,6 +29,7 @@
import org.exoplatform.services.organization.MembershipTypeEventListenerHandler;
import org.exoplatform.services.organization.MembershipTypeHandler;
import org.exoplatform.services.organization.impl.MembershipTypeImpl;
+import org.exoplatform.services.security.PermissionConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -373,6 +375,7 @@
*/
public void addMembershipTypeEventListener(MembershipTypeEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -381,6 +384,7 @@
*/
public void removeMembershipTypeEventListener(MembershipTypeEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -20,6 +20,7 @@
import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.CacheHandler.CacheType;
@@ -30,6 +31,7 @@
import org.exoplatform.services.organization.UserEventListenerHandler;
import org.exoplatform.services.organization.UserHandler;
import org.exoplatform.services.organization.impl.UserImpl;
+import org.exoplatform.services.security.PermissionConstants;
import java.util.ArrayList;
import java.util.Collections;
@@ -96,6 +98,7 @@
*/
public void addUserEventListener(UserEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -104,6 +107,7 @@
*/
public void removeUserEventListener(UserEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.organization.ldap;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -28,6 +29,7 @@
import org.exoplatform.services.organization.UserProfileHandler;
import org.exoplatform.services.organization.impl.UserProfileData;
import org.exoplatform.services.organization.impl.UserProfileImpl;
+import org.exoplatform.services.security.PermissionConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -254,6 +256,7 @@
*/
public void addUserProfileEventListener(UserProfileEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.add(listener);
}
@@ -262,6 +265,7 @@
*/
public void removeUserProfileEventListener(UserProfileEventListener listener)
{
+ SecurityHelper.validateSecurityPermissions(new RuntimePermission[]{PermissionConstants.MANAGE_LISTENERS});
listeners.remove(listener);
}
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/PermissionConstants.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/PermissionConstants.java 2012-01-24 10:52:48 UTC (rev 5500)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/PermissionConstants.java 2012-01-24 10:54:11 UTC (rev 5501)
@@ -37,4 +37,9 @@
public static final RuntimePermission MODIFY_CONVERSATION_STATE_PERMISSION =
new RuntimePermission("modifyConversationState");
+ /**
+ * Permission to manage (i.e. register/unregister) {@link Listener}
+ */
+ public static final RuntimePermission MANAGE_LISTENERS = new RuntimePermission("manageListeners");
+
}
14 years, 3 months
exo-jcr SVN: r5500 - in jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services: jcr/infinispan and 1 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-01-24 05:52:48 -0500 (Tue, 24 Jan 2012)
New Revision: 5500
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheServer.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java
Log:
EXOJCR-1682: Last sonar violations fixed for these projects
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2012-01-24 10:52:36 UTC (rev 5499)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2012-01-24 10:52:48 UTC (rev 5500)
@@ -120,7 +120,7 @@
@SuppressWarnings("unchecked")
public class ISPNCacheWorkspaceStorageCache implements WorkspaceStorageCache, Backupable
{
- private static final Log LOG = ExoLogger
+ private static final Log LOG = ExoLogger//NOSONAR
.getLogger("exo.jcr.component.core.impl.infinispan.v5.ISPNCacheWorkspaceStorageCache");//NOSONAR
/**
@@ -1769,8 +1769,8 @@
}
/**
- * This class defines all the methods that could change between the replicated and the distributed mode. By default it implements
- * the methods for the local and replicated mode.
+ * This class defines all the methods that could change between the replicated and the distributed mode.
+ * By default it implements the methods for the local and replicated mode.
*
*/
private class GlobalOperationCaller
@@ -1926,18 +1926,18 @@
// The listeners will need to be executed outside the current tx so we suspend
// the current tx we can face enlistment issues on product like ISPN
tm.suspend();
- _updateTreePath(prevRootPath, newRootPath, acl);
+ _updateTreePath(prevRootPath, newRootPath, acl);
}
catch (SystemException e)
{
LOG.warn("Cannot suspend the transaction", e);
- }
+ }
}
}
});
return;
}
- catch (Exception e)
+ catch (Exception e) //NOSONAR
{
if (LOG.isDebugEnabled())
{
@@ -1957,14 +1957,14 @@
{
MapReduceTask<CacheKey, Object, Void, Void> task =
new MapReduceTask<CacheKey, Object, Void, Void>(cache);
- task.mappedWith(new UpdateTreePathMapper(getOwnerId(), prevRootPath, newRootPath, acl))
- .reducedWith(new IdentityReducer());
+ task.mappedWith(new UpdateTreePathMapper(getOwnerId(), prevRootPath, newRootPath, acl)).reducedWith(
+ new IdentityReducer());
task.execute();
return null;
}
- });
+ });
}
-
+
/**
* {@inheritDoc}
*/
@@ -2189,7 +2189,8 @@
return;
}
Cache<CacheKey, Object> cache = dcm.getCache(CACHE_NAME);
- ISPNCacheWorkspaceStorageCache.updateTreePath(cache.getAdvancedCache().withFlags(Flag.SKIP_REMOTE_LOOKUP), ownerId, (ItemData)value, prevRootPath, newRootPath, acl);
+ ISPNCacheWorkspaceStorageCache.updateTreePath(cache.getAdvancedCache().withFlags(Flag.SKIP_REMOTE_LOOKUP),
+ ownerId, (ItemData)value, prevRootPath, newRootPath, acl);
}
}
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheServer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheServer.java 2012-01-24 10:52:36 UTC (rev 5499)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheServer.java 2012-01-24 10:52:48 UTC (rev 5500)
@@ -42,7 +42,7 @@
{
private static final String DEFAULT_CONFIG_FILE_PATH = "/conf/cache-server-configuration.xml";
-
+
/**
* @param args
*/
@@ -52,19 +52,16 @@
if (args == null || args.length == 0)
{
configPath = DEFAULT_CONFIG_FILE_PATH;
- //NOSONAR
- System.out.println("The configuration file will be loaded from '" + DEFAULT_CONFIG_FILE_PATH + "'");
+ System.out.println("The configuration file will be loaded from '" + DEFAULT_CONFIG_FILE_PATH + "'");//NOSONAR
}
else if (args.length == 1)
{
configPath = args[0];
- //NOSONAR
- System.out.println("The configuration file will be loaded from '" + args[0] + "'");
+ System.out.println("The configuration file will be loaded from '" + args[0] + "'");//NOSONAR
}
else
{
- //NOSONAR
- System.err.println("Too many arguments, the expected syntax is: java CacheServer <configuration-file-path>");
+ System.err.println("Too many arguments, the expected syntax is: java CacheServer <configuration-file-path>");//NOSONAR
return;
}
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2012-01-24 10:52:36 UTC (rev 5499)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/ISPNCacheFactory.java 2012-01-24 10:52:48 UTC (rev 5500)
@@ -76,7 +76,7 @@
private final TemplateConfigurationHelper configurationHelper;
- private static final Log LOG = ExoLogger
+ private static final Log LOG = ExoLogger//NOSONAR
.getLogger("exo.jcr.component.core.impl.infinispan.v5.InfinispanCacheFactory");//NOSONAR
/**
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2012-01-24 10:52:36 UTC (rev 5499)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/transaction/infinispan/JBossStandaloneJTAManagerLookup.java 2012-01-24 10:52:48 UTC (rev 5500)
@@ -48,7 +48,7 @@
/**
* The logger
*/
- private static final Log LOG =
+ private static final Log LOG = //NOSONAR
ExoLogger.getLogger("exo.jcr.component.core.impl.infinispan.v5.JBossStandaloneJTAManagerLookup");//NOSONAR
private Method manager, user;
14 years, 3 months
exo-jcr SVN: r5499 - in kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services: cache/impl/infinispan/distributed and 1 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-01-24 05:52:36 -0500 (Tue, 24 Jan 2012)
New Revision: 5499
Modified:
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/ispn/DistributedCacheManager.java
Log:
EXOJCR-1682: Last sonar violations fixed for these projects
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2012-01-24 10:52:05 UTC (rev 5498)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/ExoCacheFactoryImpl.java 2012-01-24 10:52:36 UTC (rev 5499)
@@ -74,7 +74,7 @@
/**
* The logger
*/
- private static final Log LOG = ExoLogger
+ private static final Log LOG = ExoLogger //NOSONAR
.getLogger("exo.kernel.component.ext.cache.impl.infinispan.v5.ExoCacheFactoryImpl");//NOSONAR
/**
@@ -450,7 +450,7 @@
}
});
}
- catch (Exception e)
+ catch (Exception e) //NOSONAR
{
throw new ExoCacheInitException("The cache '" + region + "' could not be initialized", e);
}
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java 2012-01-24 10:52:05 UTC (rev 5498)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/cache/impl/infinispan/distributed/DistributedExoCache.java 2012-01-24 10:52:36 UTC (rev 5499)
@@ -76,7 +76,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger
+ private static final Log LOG = ExoLogger//NOSONAR
.getLogger("exo.kernel.component.ext.cache.impl.infinispan.v5.DistributedExoCache");//NOSONAR
public static final String CACHE_NAME = "eXoCache";
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/ispn/DistributedCacheManager.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/ispn/DistributedCacheManager.java 2012-01-24 10:52:05 UTC (rev 5498)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/main/java/org/exoplatform/services/ispn/DistributedCacheManager.java 2012-01-24 10:52:36 UTC (rev 5499)
@@ -64,7 +64,7 @@
/**
* The logger
*/
- private static final Log LOG = ExoLogger
+ private static final Log LOG = ExoLogger //NOSONAR
.getLogger("exo.kernel.component.ext.cache.impl.infinispan.v5.DistributedCacheManager");//NOSONAR
/**
14 years, 3 months
exo-jcr SVN: r5498 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2012-01-24 05:52:05 -0500 (Tue, 24 Jan 2012)
New Revision: 5498
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
Log:
EXOJCR-1707: Refactoring DBCleanService. added method for validation of runtime permissions
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-01-24 10:23:50 UTC (rev 5497)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2012-01-24 10:52:05 UTC (rev 5498)
@@ -22,7 +22,9 @@
import java.io.IOException;
import java.net.MalformedURLException;
+import java.security.AccessControlException;
import java.security.AccessController;
+import java.security.Permission;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -317,4 +319,21 @@
throw new PrivilegedActionException(e);
}
}
+
+ /**
+ * Validate permissions.
+ *
+ * @throws AccessControlException
+ */
+ public static void validateSecurityPermissions(RuntimePermission... perms)
+ {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ for (Permission permission : perms)
+ {
+ security.checkPermission(permission);
+ }
+ }
+ }
}
14 years, 3 months