[exo-jcr-commits] exo-jcr SVN: r3420 - in core/trunk: exo.core.component.database and 12 other directories.

Author: tolusha Date: 2010-11-10 05:57:53 -0500 (Wed, 10 Nov 2010) New Revision: 3420 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/diff/DiffService.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/pom.xml Log: EXOJCR-986: Enable SecurityManager by default Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.database/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -63,7 +63,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>javax.resource</groupId> Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/diff/DiffService.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/diff/DiffService.java 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/diff/DiffService.java 2010-11-10 10:57:53 UTC (rev 3420) @@ -18,6 +18,8 @@ */ package org.exoplatform.services.document.diff; +import org.exoplatform.commons.utils.PrivilegedSystemHelper; + /** * Implements a differencing engine that works on arrays of {@link Object * Object}. @@ -41,7 +43,7 @@ { /** The standard line separator. */ - public static final String NL = System.getProperty("line.separator"); + public static final String NL = PrivilegedSystemHelper.getProperty("line.separator"); /** The line separator to use in RCS format output. */ public static final String RCS_EOL = "\n"; Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2010-11-10 10:57:53 UTC (rev 3420) @@ -19,8 +19,8 @@ package org.exoplatform.services.document.impl; import org.apache.poi.POIXMLDocument; +import org.apache.poi.POIXMLProperties.CoreProperties; import org.apache.poi.POIXMLPropertiesTextExtractor; -import org.apache.poi.POIXMLProperties.CoreProperties; import org.apache.poi.hpsf.MarkUnsupportedException; import org.apache.poi.hpsf.NoPropertySetStreamException; import org.apache.poi.hpsf.PropertySet; @@ -30,12 +30,14 @@ import org.apache.poi.poifs.eventfilesystem.POIFSReader; import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent; import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener; +import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DCMetaData; import org.exoplatform.services.document.DocumentReadException; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.security.PrivilegedExceptionAction; import java.util.Properties; /** @@ -63,7 +65,7 @@ * @throws IOException * @throws DocumentReadException */ - public Properties readDCProperties(InputStream is) throws IOException, DocumentReadException + public Properties readDCProperties(final InputStream is) throws IOException, DocumentReadException { if (is == null) { @@ -158,9 +160,16 @@ try { - POIFSReader poiFSReader = new POIFSReader(); + final POIFSReader poiFSReader = new POIFSReader(); poiFSReader.registerListener(readerListener, SummaryInformation.DEFAULT_STREAM_NAME); - poiFSReader.read(is); + SecurityHelper.doPriviledgedIOExceptionAction(new PrivilegedExceptionAction<Void>() + { + public Void run() throws Exception + { + poiFSReader.read(is); + return null; + } + }); } catch (POIRuntimeException e) { Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2010-11-10 10:57:53 UTC (rev 3420) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.document.impl.diff; +import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.services.document.diff.ToString; import java.io.BufferedReader; @@ -41,6 +42,7 @@ * (non-Javadoc) * @see org.exoplatform.services.diff.ToString#toString() */ + @Override public String toString() { StringBuffer s = new StringBuffer(); @@ -90,7 +92,7 @@ */ public String arrayToString(Object[] o) { - return arrayToString(o, System.getProperty("line.separator")); + return arrayToString(o, PrivilegedSystemHelper.getProperty("line.separator")); } /** Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java 2010-11-10 10:57:53 UTC (rev 3420) @@ -18,6 +18,7 @@ import org.apache.tika.config.TikaConfig; import org.apache.tika.parser.Parser; +import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.container.xml.InitParams; import org.exoplatform.services.document.DocumentReader; @@ -25,6 +26,7 @@ import org.exoplatform.services.document.impl.DocumentReaderServiceImpl; import java.io.InputStream; +import java.security.PrivilegedExceptionAction; import java.util.HashMap; import java.util.Map; @@ -52,8 +54,14 @@ // get tika configuration if (params != null && params.getValueParam(TIKA_CONFIG_PATH) != null) { - InputStream is = configManager.getInputStream(params.getValueParam(TIKA_CONFIG_PATH).getValue()); - conf = new TikaConfig(is); + final InputStream is = configManager.getInputStream(params.getValueParam(TIKA_CONFIG_PATH).getValue()); + conf = SecurityHelper.doPriviledgedExceptionAction(new PrivilegedExceptionAction<TikaConfig>() + { + public TikaConfig run() throws Exception + { + return new TikaConfig(is); + } + }); } else { @@ -69,6 +77,7 @@ * org.exoplatform.services.document.DocumentReaderService#getDocumentReader * (java.lang.String) */ + @Override public DocumentReader getDocumentReader(String mimeType) throws HandlerNotFoundException { // first check user defined old-style and previously registered TikaDocumentReaders Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.ldap/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -53,7 +53,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>com.novell.ldap</groupId> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.organization.api/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -40,7 +40,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -53,7 +53,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -45,7 +45,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -45,7 +45,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.security.core/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -40,7 +40,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.web.css/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -50,7 +50,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> </dependencies> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -40,7 +40,6 @@ <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>jtidy</groupId> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-11-10 10:55:16 UTC (rev 3419) +++ core/trunk/pom.xml 2010-11-10 10:57:53 UTC (rev 3420) @@ -81,6 +81,7 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons.test</artifactId> <version>${org.exoplatform.kernel.version}</version> + <scope>test</scope> </dependency> <dependency>