-
Notifications
You must be signed in to change notification settings - Fork 55
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GG-39142 Added cache names validation (8.8.x backport) #3147
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e4f7404
GG-34040 Added cache names validation
odiszapc 0f9e7e4
GG-34040 Added cache names validation
odiszapc a22b654
GG-39142 Added cache names validation
odiszapc 3525ca7
GG-34040 Added cache names validation
odiszapc 91bdcbb
GG-39142 Added cache names validation
odiszapc 36daf26
GG-39142 Added cache names validation
odiszapc b4b0a7d
GG-39142 Added cache names validation
odiszapc File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
...rg/apache/ignite/internal/processors/cache/persistence/IgnitePdsExoticCacheNamesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /* | ||
| * Copyright 2019 GridGain Systems, Inc. and Contributors. | ||
| * | ||
| * Licensed under the GridGain Community Edition License (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license | ||
| * | ||
| * 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.ignite.internal.processors.cache.persistence; | ||
|
|
||
| import org.apache.ignite.IgniteCache; | ||
| import org.apache.ignite.IgniteSystemProperties; | ||
| import org.apache.ignite.cluster.ClusterState; | ||
| import org.apache.ignite.configuration.DataStorageConfiguration; | ||
| import org.apache.ignite.configuration.IgniteConfiguration; | ||
| import org.apache.ignite.testframework.junits.WithSystemProperty; | ||
| import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; | ||
| import org.junit.After; | ||
| import org.junit.Assume; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
|
|
||
| import java.util.Arrays; | ||
|
|
||
| /** | ||
| * Tests for persistent caches with tricky names: with special characters, non-ASCII symbols, etc. | ||
| */ | ||
| @RunWith(Parameterized.class) | ||
| public class IgnitePdsExoticCacheNamesTest extends GridCommonAbstractTest { | ||
| @Parameterized.Parameters(name = "persistent={0}") | ||
| public static Iterable<Boolean> data() { | ||
| return Arrays.asList(true, false); | ||
| } | ||
|
|
||
| @Parameterized.Parameter(0) | ||
| public boolean isPersistent; | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { | ||
| IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); | ||
|
|
||
| DataStorageConfiguration storageCfg = new DataStorageConfiguration(); | ||
| storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(isPersistent); | ||
| cfg.setDataStorageConfiguration(storageCfg); | ||
|
|
||
| return cfg; | ||
| } | ||
|
|
||
| /** */ | ||
| @Before | ||
| public void setUp() throws Exception { | ||
| cleanPersistenceDir(); | ||
| } | ||
|
|
||
| /** */ | ||
| @After | ||
| public void tearDown() throws Exception { | ||
| stopAllGrids(); | ||
|
|
||
| cleanPersistenceDir(); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithSlashes() throws Exception { | ||
| checkBadName("my/cool/cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithBackslashes() throws Exception { | ||
| checkBadName("my\\cool\\cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithControlSymbols() throws Exception { | ||
| checkBadName("my\0\1\2\3\4\5\6\7cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithNewLines() throws Exception { | ||
| checkBadName("my \n cool \n cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| @WithSystemProperty(key = IgniteSystemProperties.IGNITE_VALIDATE_CACHE_NAMES, value = "false") | ||
| public void testNameWithSlashesNoValidation() throws Exception { | ||
| Assume.assumeFalse(isPersistent); // bad characters would break persistence | ||
| checkGoodName("my/cool/cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| @WithSystemProperty(key = IgniteSystemProperties.IGNITE_VALIDATE_CACHE_NAMES, value = "false") | ||
| public void testNameWithBackslashesNoValidation() throws Exception { | ||
| Assume.assumeFalse(isPersistent); // bad characters would break persistence | ||
| checkGoodName("my\\cool\\cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| @WithSystemProperty(key = IgniteSystemProperties.IGNITE_VALIDATE_CACHE_NAMES, value = "false") | ||
| public void testNameWithControlSymbolsNoValidation() throws Exception { | ||
| Assume.assumeFalse(isPersistent); // bad characters would break persistence | ||
| checkGoodName("my\0\1\2\3\4\5\6\7cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithSpecialSymbols() throws Exception { | ||
| checkGoodName("my!@#$%^&*()cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithUnicodeSymbols() throws Exception { | ||
| checkGoodName("my\u0431\u0430\u0431\u0443\u0448\u043a\u0430cache"); | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testNameWithWhiteSpaces() throws Exception { | ||
| checkGoodName("my \t cool \t cache"); | ||
| } | ||
|
|
||
| /** | ||
| * @param cacheName cache name to test | ||
| * @throws Exception If failed. | ||
| */ | ||
| private void checkBadName(String cacheName) throws Exception { | ||
| startGrid(); | ||
|
|
||
| if (isPersistent) | ||
| grid().cluster().state(ClusterState.ACTIVE); | ||
|
|
||
| try { | ||
| grid().createCache(cacheName); | ||
|
|
||
| fail("Expected IllegalArgumentException was not thrown"); | ||
| } catch (IllegalArgumentException e) { | ||
| if (e.getMessage().contains( | ||
| "Cache name cannot contain slashes (/), backslashes (\\), line separators (\\n), " + | ||
| "or null characters (\\0)")) | ||
| return; //expected | ||
|
|
||
| throw e; | ||
| } finally { | ||
| stopGrid(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param cacheName cache name to test | ||
| * @throws Exception If failed. | ||
| */ | ||
| private void checkGoodName(String cacheName) throws Exception { | ||
| startGrid(); | ||
|
|
||
| if (isPersistent) | ||
| grid().cluster().state(ClusterState.ACTIVE); | ||
|
|
||
| IgniteCache<String, String> cache = grid().createCache(cacheName); | ||
| cache.put(cacheName + "::foo", cacheName + "::bar"); | ||
| assertEquals(cacheName + "::bar", cache.get(cacheName + "::foo")); | ||
|
|
||
| stopGrid(); | ||
|
|
||
| if (isPersistent) { | ||
| // check that restart works | ||
| startGrid(); | ||
|
|
||
| cache = grid().cache(cacheName); | ||
| assertEquals(cacheName + "::bar", cache.get(cacheName + "::foo")); | ||
|
|
||
| stopGrid(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use SystemProperty#defaults