-
Notifications
You must be signed in to change notification settings - Fork 25.2k
convert FilePermissionsTask.groovy to .java #34674
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
Merged
alpar-t
merged 12 commits into
elastic:master
from
vboulaye:convert-filepermissiontask-java
Oct 29, 2018
Merged
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
67b9026
convert FilePermissionsTask.groovy to .java
vboulaye 411492c
append missing end newline
vboulaye 22f81b6
expand imports
vboulaye 2b8db25
rename test
vboulaye 1d40b36
fix checkstyle
vboulaye 93f89fe
various fixes
vboulaye 7c259f1
task annotation on getter
vboulaye d1f51c7
remove setter on outputMarker + simplify source file retrieval
vboulaye 6be51cd
formatting
vboulaye bd5e9a6
add test case when no files are found
vboulaye a2386af
Merge remote-tracking branch 'origin/master' into convert-filepermiss…
alpar-t 3c0b5c8
Avoid returning null
alpar-t File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
87 changes: 0 additions & 87 deletions
87
buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/FilePermissionsTask.groovy
This file was deleted.
Oops, something went wrong.
112 changes: 112 additions & 0 deletions
112
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/FilePermissionsTask.java
This file contains hidden or 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,112 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch 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.elasticsearch.gradle.precommit; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.nio.file.Files; | ||
import java.nio.file.attribute.PosixFileAttributeView; | ||
import java.nio.file.attribute.PosixFilePermission; | ||
import java.util.List; | ||
import java.util.Set; | ||
import java.util.stream.Collectors; | ||
|
||
import org.apache.tools.ant.taskdefs.condition.Os; | ||
import org.gradle.api.DefaultTask; | ||
import org.gradle.api.GradleException; | ||
import org.gradle.api.file.FileCollection; | ||
import org.gradle.api.file.FileTree; | ||
import org.gradle.api.plugins.JavaPluginConvention; | ||
import org.gradle.api.tasks.InputFiles; | ||
import org.gradle.api.tasks.OutputFile; | ||
import org.gradle.api.tasks.SourceSetContainer; | ||
import org.gradle.api.tasks.StopExecutionException; | ||
import org.gradle.api.tasks.TaskAction; | ||
import org.gradle.api.tasks.util.PatternFilterable; | ||
import org.gradle.api.tasks.util.PatternSet; | ||
|
||
/** | ||
* Checks source files for correct file permissions. | ||
*/ | ||
public class FilePermissionsTask extends DefaultTask { | ||
|
||
/** | ||
* A pattern set of which files should be checked. | ||
*/ | ||
private final PatternFilterable filesFilter = new PatternSet() | ||
// we always include all source files, and exclude what should not be checked | ||
.include("**") | ||
// exclude sh files that might have the executable bit set | ||
.exclude("**/*.sh"); | ||
|
||
private File outputMarker = new File(getProject().getBuildDir(), "markers/filePermissions"); | ||
|
||
public FilePermissionsTask() { | ||
setDescription("Checks java source files for correct file permissions"); | ||
} | ||
|
||
private static boolean isExecutableFile(File file) { | ||
try { | ||
Set<PosixFilePermission> permissions = Files.getFileAttributeView(file.toPath(), PosixFileAttributeView.class) | ||
.readAttributes() | ||
.permissions(); | ||
return permissions.contains(PosixFilePermission.OTHERS_EXECUTE) | ||
|| permissions.contains(PosixFilePermission.OWNER_EXECUTE) | ||
|| permissions.contains(PosixFilePermission.GROUP_EXECUTE); | ||
} catch (IOException e) { | ||
throw new IllegalStateException("unable to read the file " + file + " attributes", e); | ||
} | ||
} | ||
|
||
/** | ||
* Returns the files this task will check | ||
*/ | ||
@InputFiles | ||
public FileCollection getFiles() { | ||
SourceSetContainer sourceSets = getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets(); | ||
return sourceSets.stream() | ||
.map(sourceSet -> sourceSet.getAllSource().matching(filesFilter)) | ||
.reduce(FileTree::plus) | ||
.orElse(null); | ||
} | ||
|
||
@TaskAction | ||
public void checkInvalidPermissions() throws IOException { | ||
if (Os.isFamily(Os.FAMILY_WINDOWS)) { | ||
throw new StopExecutionException(); | ||
} | ||
List<String> failures = getFiles().getFiles().stream() | ||
.filter(FilePermissionsTask::isExecutableFile) | ||
.map(file -> "Source file is executable: " + file) | ||
.collect(Collectors.toList()); | ||
|
||
if (!failures.isEmpty()) { | ||
throw new GradleException("Found invalid file permissions:\n" + String.join("\n", failures)); | ||
} | ||
|
||
outputMarker.getParentFile().mkdirs(); | ||
Files.write(outputMarker.toPath(), "done".getBytes("UTF-8")); | ||
} | ||
|
||
@OutputFile | ||
public File getOutputMarker() { | ||
return outputMarker; | ||
} | ||
|
||
} |
100 changes: 100 additions & 0 deletions
100
buildSrc/src/test/java/org/elasticsearch/gradle/precommit/FilePermissionsTaskTests.java
This file contains hidden or 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,100 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch 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.elasticsearch.gradle.precommit; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.nio.charset.Charset; | ||
import java.nio.file.Files; | ||
import java.util.List; | ||
|
||
import org.elasticsearch.gradle.test.GradleUnitTestCase; | ||
import org.gradle.api.GradleException; | ||
import org.gradle.api.Project; | ||
import org.gradle.api.plugins.JavaPlugin; | ||
import org.gradle.testfixtures.ProjectBuilder; | ||
import org.junit.Assert; | ||
import org.junit.Rule; | ||
import org.junit.rules.TemporaryFolder; | ||
|
||
public class FilePermissionsTaskTests extends GradleUnitTestCase { | ||
@Rule | ||
public TemporaryFolder temporaryFolder = new TemporaryFolder(); | ||
|
||
public void testCheckPermissionsWhenAnExecutableFileExists() throws Exception { | ||
Project project = createProject(); | ||
|
||
FilePermissionsTask filePermissionsTask = createTask(project); | ||
|
||
File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
file.getParentFile().mkdirs(); | ||
file.createNewFile(); | ||
file.setExecutable(true); | ||
|
||
try { | ||
filePermissionsTask.checkInvalidPermissions(); | ||
Assert.fail("the check should have failed because of the executable file permission"); | ||
} catch (GradleException e) { | ||
assertTrue(e.getMessage().startsWith("Found invalid file permissions")); | ||
} | ||
file.delete(); | ||
} | ||
|
||
|
||
public void testCheckPermissionsWhenNoFileExists() throws Exception { | ||
Project project = createProject(); | ||
|
||
FilePermissionsTask filePermissionsTask = createTask(project); | ||
|
||
filePermissionsTask.checkInvalidPermissions(); | ||
|
||
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions"); | ||
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8")); | ||
assertEquals("done", result.get(0)); | ||
} | ||
|
||
public void testCheckPermissionsWhenNoExecutableFileExists() throws Exception { | ||
Project project = createProject(); | ||
|
||
FilePermissionsTask filePermissionsTask = createTask(project); | ||
|
||
File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
file.getParentFile().mkdirs(); | ||
file.createNewFile(); | ||
|
||
filePermissionsTask.checkInvalidPermissions(); | ||
|
||
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions"); | ||
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8")); | ||
assertEquals("done", result.get(0)); | ||
|
||
file.delete(); | ||
|
||
} | ||
|
||
private Project createProject() throws IOException { | ||
Project project = ProjectBuilder.builder().withProjectDir(temporaryFolder.newFolder()).build(); | ||
project.getPlugins().apply(JavaPlugin.class); | ||
return project; | ||
} | ||
|
||
private FilePermissionsTask createTask(Project project) { | ||
return project.getTasks().create("filePermissionsTask", FilePermissionsTask.class); | ||
} | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.