-
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
Changes from 7 commits
67b9026
411492c
22f81b6
2b8db25
1d40b36
93f89fe
7c259f1
d1f51c7
6be51cd
bd5e9a6
a2386af
3c0b5c8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
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.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 getProject().files(sourceSets.stream() | ||
.map(sourceSet -> sourceSet.getAllSource().matching(filesFilter)) | ||
.toArray()); | ||
} | ||
|
||
@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)); | ||
} | ||
|
||
Files.write(outputMarker.toPath(), "done".getBytes("UTF-8")); | ||
} | ||
|
||
@OutputFile | ||
public File getOutputMarker() { | ||
return outputMarker; | ||
} | ||
|
||
public void setOutputMarker(File outputMarker) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't need this to be configurable, it can be considered an implementation detail. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I dropped it, and found out that I needed to create the missing parent folders (my previous test used an output file at the root of the TemporaryFolder). I added a .mkdirs() in the Task. |
||
this.outputMarker = outputMarker; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/* | ||
* 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 outputMarker = temporaryFolder.newFile(); | ||
filePermissionsTask.setOutputMarker(outputMarker); | ||
|
||
File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
file.getParentFile().mkdirs(); | ||
file.createNewFile(); | ||
file.setExecutable(true); | ||
|
||
try { | ||
filePermissionsTask.checkInvalidPermissions(); | ||
vboulaye marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Assert.fail("the check should have failed because of the executable file permission"); | ||
} catch (GradleException e) { | ||
assertTrue(e.getMessage().startsWith("Found invalid file permissions")); | ||
} | ||
} | ||
|
||
|
||
public void testCheckPermissionsWhenNoExecutableFileExists() throws Exception { | ||
Project project = createProject(); | ||
|
||
FilePermissionsTask filePermissionsTask = createTask(project); | ||
File outputMarker = temporaryFolder.newFile(); | ||
filePermissionsTask.setOutputMarker(outputMarker); | ||
|
||
File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
file.getParentFile().mkdirs(); | ||
file.createNewFile(); | ||
|
||
filePermissionsTask.checkInvalidPermissions(); | ||
|
||
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8")); | ||
assertEquals("done", result.get(0)); | ||
} | ||
|
||
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); | ||
} | ||
} |
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.
FileTree
extendsFileCollection
, so neithergetProject().files(
nor.toArray()
are necessary.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.
sorry, I do not know the API that well...
I tried to fix this but I am not sure how to handle the case when no source matches? (I do not like the .orElse(null))
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.
The
.orElse(null)
worked in the unit tests but wouldn't have worked in an integration test as the method is annotated as input and thus can't return null. I took the liberty to push a fix for this.