Note: All values here must be a minimum of 10 characters long!
+ *
+ * |
+ * | property |
+ * description |
+ * default |
+ *
+ *
+ * | crypto.key |
+ * The password that will do the encryption and decryption of content. Required |
+ * |
+ *
+ *
+ * | crypto.prefix |
+ * A value used to determine if the page content is correctly decrypted. Should be a random string of minimum 10 length |
+ * A random string |
+ *
+ *
+ * | crypto.suffix |
+ * A value appended to the end of the encrypted string. Should be a random string of minimum 10 length |
+ * A random string |
+ *
+ *
+ * | pagename.prefix |
+ * Only pages that start with this value are encrypted. If this is enabled you
+ * will not be able to rename these pages outside this prefix. |
+ * empty string |
+ *
+ *
+ * | pagename.suffix |
+ * Only pages that end with this value are encrypted. If this is enabled you
+ * will not be able to rename these pages outside this suffix. |
+ * empty string |
+ *
+ *
+ *
+ * @since 2.10.2
+ */
+public class EncryptedPageFilter extends BasicPageFilter {
+
+ private static final Logger log = Logger.getLogger(EncryptedPageFilter.class);
+
+ private static final int MIN_LENGTH = 10;
+ private static final int MIN_LENGTH_PAGENAME = 2;
+ public static final String PROP_CRYPTO_KEY = "crypto.key";
+ public static final String PROP_CRYPTO_PREFIX = "crypto.prefix";
+ public static final String PROP_CRYPTO_SUFFIX = "crypto.suffix";
+ public static final String PROP_PAGENAME_PREFIX = "pagename.prefix";
+ public static final String PROP_PAGENAME_SUFFIX = "pagename.suffix";
+
+ private static final String DEFAULT_CRYPTO_PREFIX = "A@I@#!)KDAS)$:";
+ private static final String DEFAULT_CRYPTO_SUFFIX = ")FEJ*$Y@LSDFKJ@V";
+ private static final String DEFAULT_PAGENAME_PREFIX = "";
+ private static final String DEFAULT_PAGENAME_SUFFIX = "";
+
+ private CryptoProvider cryptoProvider;
+ private char[] key;
+ private String prefix = DEFAULT_CRYPTO_PREFIX;
+ private String suffix = DEFAULT_CRYPTO_SUFFIX;
+ private String pagenamePrefix = DEFAULT_PAGENAME_PREFIX;
+ private String pagenameSuffix = DEFAULT_PAGENAME_SUFFIX;
+
+ @Override
+ public void initialize(WikiEngine engine, Properties properties) throws FilterException {
+
+ try {
+ cryptoProvider = engine.getCryptoManager().getCryptoProvider();
+ } catch (Exception e) {
+ throw new FilterException(e.getMessage());
+ }
+
+ String keyValue = cryptoProvider.getExtraCryptoProperty(PROP_CRYPTO_KEY);
+ if (keyValue != null) {
+ key = keyValue.toCharArray();
+ } else {
+ throw new FilterException("The encryption key "+PROP_CRYPTO_KEY+" has not been set!");
+ }
+ if (key.length < MIN_LENGTH) {
+ throw new FilterException("The encryption key "+PROP_CRYPTO_KEY+" provided is to short. Min Length required is " + MIN_LENGTH);
+ }
+ if (key.length < MIN_LENGTH) {
+ throw new FilterException("The encryption key "+PROP_CRYPTO_KEY+" provided is to short. Min Length required is " + MIN_LENGTH);
+ }
+ prefix = cryptoProvider.getExtraCryptoProperty(PROP_CRYPTO_PREFIX, DEFAULT_CRYPTO_PREFIX);
+ if (prefix.length() < MIN_LENGTH) {
+ throw new FilterException("The property value "+PROP_CRYPTO_PREFIX+"="+ prefix + " is to short. Min Length required is " + MIN_LENGTH);
+ }
+ suffix = cryptoProvider.getExtraCryptoProperty(PROP_CRYPTO_SUFFIX, DEFAULT_CRYPTO_SUFFIX);
+ if (suffix.length() < MIN_LENGTH) {
+ throw new FilterException("The property value "+PROP_CRYPTO_SUFFIX+"="+ suffix + " is to short. Min Length required is " + MIN_LENGTH);
+ }
+ pagenamePrefix = cryptoProvider.getExtraCryptoProperty(PROP_PAGENAME_PREFIX, DEFAULT_PAGENAME_PREFIX);
+ if (pagenamePrefix.length() > 0 && pagenamePrefix.length() < MIN_LENGTH_PAGENAME) {
+ throw new FilterException("The property value "+PROP_PAGENAME_PREFIX+"="+ pagenamePrefix + " is to short. Min Length required is " + MIN_LENGTH_PAGENAME);
+ }
+ pagenameSuffix = cryptoProvider.getExtraCryptoProperty(PROP_PAGENAME_SUFFIX, DEFAULT_PAGENAME_SUFFIX);
+ if (pagenameSuffix.length() > 0 && pagenameSuffix.length() < MIN_LENGTH_PAGENAME) {
+ throw new FilterException("The property value "+PROP_PAGENAME_SUFFIX+"="+ pagenameSuffix + " is to short. Min Length required is " + MIN_LENGTH_PAGENAME);
+ }
+ }
+
+ /**
+ * Given the initialised cryptoProvider and a key, encrypt the content provided on preSave.
+ * The actual implementation adds a prefix to the raw content, and a suffix to the encrypted
+ * content.
+ * This calls {@link this.enableEncrpytion} to determine if encryption should occur
+ * If the cryptoProvier is of class {@link org.apache.wiki.crypto.BaseCryptoProvider}, we
+ * do nothing here, just return the content.
+ */
+ @Override
+ public String preSave(WikiContext wikiContext, String content) throws FilterException {
+ try {
+ if (enableEncrpytion(wikiContext)) {
+ if (cryptoProvider.getClass().getName().equals(new BaseCryptoProvider().getClass().getName())) {
+ return super.preSave(wikiContext, content);
+ }
+ content = prefix + content;
+ content = new String(cryptoProvider.encrypt(key, content.getBytes()));
+ content += suffix;
+ }
+ } catch (Exception e) {
+ throw new FilterException("Error encrypting content. ERROR="+e+" "+e.getMessage());
+ }
+ return super.preSave(wikiContext, content);
+ }
+
+ /**
+ * Given the initialised cryptoProvider and a key, decrypt the content provided on preTranslate.
+ * If the suffix does not match the provided suffix, we assume the page was not encrypted and
+ * return the content.
+ * Otherwise we trim the suffix, decrypt, remove the prefix and return the plain content.
+ */
+ @Override
+ public String preTranslate(WikiContext wikiContext, String content) throws FilterException {
+ String result = super.preTranslate(wikiContext, content);
+ try {
+ if (result.endsWith(suffix)) {
+ result = result.substring(0,result.length()-suffix.length());
+ String plain = new String(cryptoProvider.decrypt(key, result.getBytes()));
+ if (plain.startsWith(prefix)) {
+ result = plain.substring(prefix.length());
+ } else {
+ throw new Exception("The decrypted content did not start with the expected prefix!!!");
+ }
+ }
+
+ } catch (Exception e) {
+ throw new FilterException("Error decrypting content. ERROR="+e+" "+e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * Validate the
+ * @param wikiContext
+ * @return
+ */
+ private boolean enableEncrpytion(WikiContext wikiContext) {
+ boolean result = false;
+ String pageName = wikiContext.getPage().getName();
+ if (StringUtils.isNotEmpty(pageName)) {
+ if (pageName.startsWith(pagenamePrefix) && pageName.endsWith(pagenameSuffix)) {
+ result = true;
+ }
+ }
+ return result;
+ }
+
+}
Index: jspwiki-war/src/main/java/org/apache/wiki/plugin/EncryptPlugin.java
===================================================================
--- jspwiki-war/src/main/java/org/apache/wiki/plugin/EncryptPlugin.java (revision 0)
+++ jspwiki-war/src/main/java/org/apache/wiki/plugin/EncryptPlugin.java (working copy)
@@ -0,0 +1,63 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.wiki.plugin;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.exceptions.EncryptionException;
+import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.crypto.CryptoProvider;
+
+import java.util.Map;
+
+/**
+ *
+ * @since 2.10.2
+ */
+public class EncryptPlugin implements WikiPlugin {
+
+ private static Logger log = Logger.getLogger( EncryptPlugin.class );
+
+ /**
+ * {@inheritDoc}
+ */
+ public String execute(WikiContext context, Map
params) throws PluginException
+ {
+ CryptoProvider cryptoProvider;
+ try {
+ cryptoProvider = context.getEngine().getCryptoManager().getCryptoProvider();
+ } catch (WikiException e) {
+ throw new PluginException("Encryption not configured correctly. "+e.getMessage());
+ }
+ String body = params.get(DefaultPluginManager.PARAM_BODY);
+ if (StringUtils.isNotEmpty(body)) {
+ String hiddenData = "";
+ try {
+ hiddenData = new String(cryptoProvider.encrypt("password".toCharArray(), body.getBytes()));
+ } catch (EncryptionException e) {
+ throw new PluginException("Encryption failed: " + e.getMessage());
+ }
+ return "" + hiddenData + "
";
+ }
+ return "";
+ }
+}
Index: jspwiki-war/src/main/resources/ini/classmappings.xml
===================================================================
--- jspwiki-war/src/main/resources/ini/classmappings.xml (revision 1622810)
+++ jspwiki-war/src/main/resources/ini/classmappings.xml (working copy)
@@ -123,4 +123,12 @@
org.apache.wiki.workflow.WorkflowManager
org.apache.wiki.workflow.WorkflowManager
+
+ org.apache.wiki.crypto.CryptoProvider
+ org.apache.wiki.crypto.BaseCryptoProvider
+
+
+ org.apache.wiki.crypto.PBECryptoProvider
+ org.apache.wiki.crypto.PBECryptoProvider
+
Index: jspwiki-war/src/main/resources/ini/jspwiki.properties
===================================================================
--- jspwiki-war/src/main/resources/ini/jspwiki.properties (revision 1622810)
+++ jspwiki-war/src/main/resources/ini/jspwiki.properties (working copy)
@@ -338,6 +338,19 @@
#
#jspwiki.lucene.analyzer = org.apache.lucene.analysis.standard.StandardAnalyzer
+#
+# The implementing class of the Cryptographic Provider (CryptoProvider) for jspwiki.
+# Default is BaseCryptoProvider, but you can enhance this to use PBECryptoProvider.
+#
+jspwiki.cryptoProvider = org.apache.wiki.crypto.BaseCryptoProvider
+#
+# The location of the jspwiki cryptographic settings file. This file should be protected at all
+# costs, as it contains the passwords and settings for your encryption and decryption ciphers.
+# WARNING: If this file is lost, or altered, you will no longer be able to read any wiki content.
+#
+#jspwiki.cryptoFile = /usr/local/etc/jspwiki-crypto.properties
+
+
############################################################################
#
# Special page references.
Index: jspwiki-war/src/main/resources/ini/jspwiki_module.xml
===================================================================
--- jspwiki-war/src/main/resources/ini/jspwiki_module.xml (revision 1622810)
+++ jspwiki-war/src/main/resources/ini/jspwiki_module.xml (working copy)
@@ -55,9 +55,19 @@
2.4
+
+ David Vittor
+ 2.10.2
+ Encrypt
+
+
Janne Jalkanen
2.6
-
+
+ David Vittor
+ 2.10.2
+
+
\ No newline at end of file
Index: jspwiki-war/src/test/java/org/apache/wiki/crypto/PBECryptoProviderTest.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/crypto/PBECryptoProviderTest.java (revision 0)
+++ jspwiki-war/src/test/java/org/apache/wiki/crypto/PBECryptoProviderTest.java (working copy)
@@ -0,0 +1,75 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.wiki.crypto;
+
+import junit.framework.TestCase;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.exceptions.EncryptionException;
+
+import java.util.Properties;
+
+/**
+ * Test the class {@link org.apache.wiki.crypto.PBECryptoProvider}
+ *
+ * @since 2.10.2
+ */
+public class PBECryptoProviderTest extends TestCase {
+
+ TestEngine m_engine;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ Properties props = TestEngine.getTestProperties();
+ m_engine = new TestEngine(props);
+ }
+
+ /**
+ * Test the {@link org.apache.wiki.crypto.PBECryptoProvider} with some sample content,
+ * both the encrypt and decrypt methods.
+ * @throws Exception
+ */
+ public void testEncryptAndDecrypt() throws Exception {
+ PBECryptoProvider provider = new PBECryptoProvider();
+ provider.initialize(m_engine,m_engine.getWikiProperties());
+ char[] password1 = "P@ssword1".toCharArray();
+ char[] password2 = "Pa$$w0rd2".toCharArray();
+ String content1 = "This is simple";
+ String content2 = "This may work";
+
+ // Test content1&2 with password1
+ byte[] secret1 = provider.encrypt(password1,content1.getBytes());
+ byte[] secret2 = provider.encrypt(password1,content2.getBytes());
+ String result1 = new String(provider.decrypt(password1,secret1));
+ String result2 = new String(provider.decrypt(password1,secret2));
+ assertNotNull(result1);
+ assertNotNull(result2);
+ assertEquals(content1,result1);
+ assertEquals(content2,result2);
+
+ try {
+ result1 = new String(provider.decrypt(password2, secret1));
+ } catch (EncryptionException e) {
+ assertTrue(e.getMessage().contains("BadPaddingException"));
+ }
+ assertEquals(content1, result1);
+ }
+
+}
Index: jspwiki-war/src/test/java/org/apache/wiki/filters/AllTests.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/filters/AllTests.java (revision 1622810)
+++ jspwiki-war/src/test/java/org/apache/wiki/filters/AllTests.java (working copy)
@@ -33,6 +33,7 @@
TestSuite suite = new TestSuite("PageFilter tests");
suite.addTest( DefaultFilterManagerTest.suite() );
+ suite.addTest( EncryptedPageFilterTest.suite() );
return suite;
}
Index: jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java (revision 1622810)
+++ jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java (working copy)
@@ -51,7 +51,7 @@
List l = m.getFilterList();
- assertEquals("Wrong number of filters", 2, l.size());
+ assertEquals("Wrong number of filters", 3, l.size());
Iterator i = l.iterator();
PageFilter f1 = (PageFilter)i.next();
@@ -61,6 +61,10 @@
PageFilter f2 = (PageFilter)i.next();
assertTrue("Not a Testfilter", f2 instanceof TestFilter);
+
+ PageFilter f3 = (PageFilter)i.next();
+
+ assertTrue("Not a EncryptedPageFilter", f3 instanceof EncryptedPageFilter);
}
public void testInitParams() throws Exception {
Index: jspwiki-war/src/test/java/org/apache/wiki/filters/EncryptedPageFilterTest.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/filters/EncryptedPageFilterTest.java (revision 0)
+++ jspwiki-war/src/test/java/org/apache/wiki/filters/EncryptedPageFilterTest.java (working copy)
@@ -0,0 +1,155 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.wiki.filters;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import net.sf.ehcache.CacheManager;
+import net.sourceforge.stripes.mock.MockHttpServletRequest;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.auth.Users;
+import org.apache.wiki.providers.WikiPageProvider;
+
+import java.util.Properties;
+
+/**
+ * Test the filter {@link org.apache.wiki.filters.EncryptedPageFilter}.
+ *
+ * @since 2.10.2
+ */
+public class EncryptedPageFilterTest extends TestCase {
+ TestEngine pbeTestEngine;
+ TestEngine testEngine;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ Properties props = TestEngine.getTestProperties();
+ CacheManager.getInstance().removeAllCaches();
+ TestEngine.emptyWorkDir();
+ pbeTestEngine = new TestEngine(props);
+
+ props.setProperty("jspwiki.cryptoProvider", "org.apache.wiki.crypto.BaseCryptoProvider");
+ testEngine = new TestEngine(props);
+ }
+
+ /**
+ * Returns a {@link WikiContext} for the given page and testEngine,
+ * with user {@link org.apache.wiki.auth.Users#ADMIN} logged in.
+ *
+ * @param testEngine give {@link org.apache.wiki.TestEngine}
+ * @param page given {@link WikiPage}.
+ * @return {@link WikiContext} associated to given {@link WikiPage}.
+ * @throws org.apache.wiki.api.exceptions.WikiException problems while logging in.
+ */
+ WikiContext getAdminBasedWikiContextFor( TestEngine testEngine, WikiPage page ) throws WikiException
+ {
+ MockHttpServletRequest request = testEngine.newHttpRequest();
+ WikiSession session = WikiSession.getWikiSession( testEngine, request );
+ testEngine.getAuthenticationManager().login( session,
+ request,
+ Users.ADMIN,
+ Users.ADMIN_PASS );
+
+ return new WikiContext( testEngine, request, page );
+ }
+
+ /**
+ * Run a simple test storing content to a page, using the {@link org.apache.wiki.TestEngine}
+ * with {@link org.apache.wiki.crypto.BaseCryptoProvider} configured.
+ * @throws Exception
+ */
+ public void testBaseEncryptAndDecrypt() throws Exception {
+ String ENDLINE = "\n";
+ String src = "test content"+ENDLINE;
+ String expected = "test content"+ENDLINE;
+
+ testEngine.saveText( "Test", src );
+ WikiPage page = testEngine.getPage( "Test", WikiPageProvider.LATEST_VERSION );
+ WikiContext context = getAdminBasedWikiContextFor(testEngine,page);
+ String res = testEngine.getHTML( context, page );
+ assertEquals( expected, res );
+
+ String text = testEngine.getPageManager().getPageText( page.getName(), WikiPageProvider.LATEST_VERSION );
+ assertEquals( "test content\r"+ENDLINE, text );
+ text = testEngine.getHTML(page.getName());
+ assertEquals( expected, text );
+
+ String change = "Text changed"+ENDLINE;
+ String expectedChange = "Text changed"+ENDLINE;
+ testEngine.saveText( context, change);
+ String textChanged = testEngine.getHTML( page.getName() );
+ assertEquals(expectedChange, textChanged);
+ }
+
+ /**
+ * Run a simple test storing content to two pages, "Test" and "secureTest",
+ * using the {@link org.apache.wiki.TestEngine}
+ * with {@link org.apache.wiki.crypto.PBECryptoProvider} configured.
+ * The "Test" page content should remain the same, while the "secureTest" content gets encrypted.
+ * @throws Exception
+ */
+ public void testPBEEncryptAndDecrypt() throws Exception {
+
+ String ENDLINE = "\n";
+ String src = "test content"+ENDLINE;
+ String expected = "test content"+ENDLINE;
+
+ pbeTestEngine.saveText( "Test", src );
+ pbeTestEngine.saveText( "secureTest", src );
+ WikiPage pageTest = pbeTestEngine.getPage( "Test", WikiPageProvider.LATEST_VERSION );
+ WikiPage pageSecure = pbeTestEngine.getPage( "secureTest", WikiPageProvider.LATEST_VERSION );
+ WikiContext contextTest = getAdminBasedWikiContextFor(pbeTestEngine,pageTest);
+ WikiContext contextSecure = getAdminBasedWikiContextFor(pbeTestEngine,pageSecure);
+ String resTest = pbeTestEngine.getHTML( contextTest, pageTest );
+ String resSecure = pbeTestEngine.getHTML( contextSecure, pageSecure );
+ assertEquals( expected, resTest );
+ assertEquals( expected, resSecure );
+
+ String text = pbeTestEngine.getPageManager().getPageText( pageTest.getName(), WikiPageProvider.LATEST_VERSION );
+ assertEquals( "test content\r"+ENDLINE, text );
+ text = testEngine.getHTML(pageTest.getName());
+ assertEquals( expected, text );
+ text = pbeTestEngine.getPageManager().getPageText( pageSecure.getName(), WikiPageProvider.LATEST_VERSION );
+ assertNotSame( expected, text );
+ assertEquals( "jO9mPV4LSAsOBL9cV9mQlxcrZ9lip7lKTqNduAeViww=)FEJ*$Y@LSDFKJ@V", text );
+ text = pbeTestEngine.getHTML(pageSecure.getName());
+ assertEquals( expected, text );
+
+ String change = "Text changed"+ENDLINE;
+ String expectedChange = "Text changed"+ENDLINE;
+ pbeTestEngine.saveText( contextTest, change);
+ pbeTestEngine.saveText( contextSecure, change);
+ String textChanged = pbeTestEngine.getHTML( pageTest.getName() );
+ assertEquals(expectedChange, textChanged);
+ textChanged = pbeTestEngine.getHTML( pageSecure.getName() );
+ assertEquals(expectedChange, textChanged);
+ }
+
+ public static Test suite() {
+ return new TestSuite( EncryptedPageFilterTest.class );
+ }
+}
Index: jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java (revision 1622810)
+++ jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java (working copy)
@@ -44,6 +44,7 @@
"Plugins
" +
"" +
"| Name | Alias | Author | Notes |
|---|
" +
+ "| EncryptPlugin | Encrypt | David Vittor | |
" +
"| IfPlugin | If | Janne Jalkanen | |
" +
"| Note | | Janne Jalkanen | |
" +
"| SamplePlugin | samplealias | Janne Jalkanen | |
" +
Index: jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java
===================================================================
--- jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java (revision 1622810)
+++ jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java (working copy)
@@ -40,10 +40,10 @@
public void testParseFromClasspath() {
List< Element > elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/plugin" );
- assertEquals( 4, elements.size() ); // 2 on src/main/resources, another 2 on src/test/resources
+ assertEquals( 5, elements.size() ); // 2 on src/main/resources, another 2 on src/test/resources
elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/filter" );
- assertEquals( 1, elements.size() );
+ assertEquals( 2, elements.size() );
elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/editor" );
assertEquals( 1, elements.size() );
@@ -61,7 +61,7 @@
assertEquals( 0, elements.size() );
elements = XmlUtil.parse( ClassUtil.MAPPINGS, "/classmappings/mapping" );
- assertEquals( 19, elements.size() );
+ assertEquals( 21, elements.size() );
}
public void testParseFromStream() throws FileNotFoundException {
Index: jspwiki-war/src/test/resources/filters.xml
===================================================================
--- jspwiki-war/src/test/resources/filters.xml (revision 1622810)
+++ jspwiki-war/src/test/resources/filters.xml (working copy)
@@ -23,7 +23,7 @@
org.apache.wiki.filters.ProfanityFilter
-
+
org.apache.wiki.filters.TestFilter
@@ -38,4 +38,8 @@
+
+ org.apache.wiki.filters.EncryptedPageFilter
+
+
Index: jspwiki-war/src/test/resources/jspwiki-crypto.properties
===================================================================
--- jspwiki-war/src/test/resources/jspwiki-crypto.properties (revision 0)
+++ jspwiki-war/src/test/resources/jspwiki-crypto.properties (working copy)
@@ -0,0 +1,2 @@
+crypto.key=xyzpwd123456
+pagename.prefix=secure
\ No newline at end of file
Index: jspwiki-war/src/test/resources/jspwiki-custom.properties
===================================================================
--- jspwiki-war/src/test/resources/jspwiki-custom.properties (revision 1622810)
+++ jspwiki-war/src/test/resources/jspwiki-custom.properties (working copy)
@@ -72,6 +72,9 @@
#mail.smtp.account =
#mail.smtp.password =
+# for EncryptedPageFilterTest
+jspwiki.cryptoProvider = org.apache.wiki.crypto.PBECryptoProvider
+
# for JDBC tests
server.port=9321
server.database.0=file:target/jspwiki.hsqldb