honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skipping hidden files compilation for script service

This commit is contained in:
Felipe Forbeck 2016-01-27 23:39:36 -02:00
parent 3fe9c7736c
commit cc743049cf
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/elasticsearch/script/ScriptService.java
View File

@ -42,6 +42,7 @@ import org.elasticsearch.common.cache.RemovalNotification;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.FileSystemUtils;
import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
@ -533,6 +534,10 @@ public class ScriptService extends AbstractComponent implements Closeable {
if (logger.isTraceEnabled()) {
logger.trace("Loading script file : [{}]", file);
}
if (FileSystemUtils.isHidden(file)) {
logger.warn("--- Hidden file skipped : [{}]", file);
return;
}
Tuple<String, String> scriptNameExt = scriptNameExt(file);
if (scriptNameExt != null) {
ScriptEngineService engineService = getScriptEngineServiceForFileExt(scriptNameExt.v2());

33
core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
View File

@ -151,6 +151,39 @@ public class ScriptServiceTests extends ESTestCase {
}
}
public void testHiddenFileSkipped() throws IOException {
ContextAndHeaderHolder contextAndHeaders = new ContextAndHeaderHolder();
buildScriptService(Settings.EMPTY);
logger.info("--> setup one hidden test file");
Path testFileHidden = scriptsFilePath.resolve(".hidden_file");
Path testRegularFile = scriptsFilePath.resolve("test_file.tst");
Streams.copy("test_hidden_file".getBytes("UTF-8"), Files.newOutputStream(testFileHidden));
Streams.copy("test_file".getBytes("UTF-8"), Files.newOutputStream(testRegularFile));
resourceWatcherService.notifyNow();
try {
logger.info("--> verify if hidden_file was skipped");
scriptService.compile(new Script("hidden_file", ScriptType.FILE, "test", null),
ScriptContext.Standard.SEARCH, contextAndHeaders, Collections.emptyMap());
fail("the script hidden_file should not be processed");
} catch (IllegalArgumentException ex) {
assertThat(ex.getMessage(), containsString("Unable to find on disk file script [hidden_file] using lang [test]"));
}
logger.info("--> verify if test_file was correctly processed");
CompiledScript compiledScript = scriptService.compile(new Script("test_file", ScriptType.FILE, "test", null),
ScriptContext.Standard.SEARCH, contextAndHeaders, Collections.emptyMap());
assertThat(compiledScript.compiled(), equalTo((Object) "compiled_test_file"));
logger.info("--> delete hidden file");
Files.delete(testFileHidden);
logger.info("--> delete test file");
Files.delete(testRegularFile);
resourceWatcherService.notifyNow();
}
public void testInlineScriptCompiledOnceCache() throws IOException {
buildScriptService(Settings.EMPTY);
CompiledScript compiledScript1 = scriptService.compile(new Script("1+1", ScriptType.INLINE, "test", null),