MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[updater] skips write-ability check for delete actions

Browse Source
This commit is contained in:
Roman Shevchenko
2017-04-04 10:12:45 +02:00
parent dd61c54511
commit 1f49bb7e1d
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
updater/src/com/intellij/updater/BaseUpdateAction.java
View File

@@ -103,10 +103,10 @@ public abstract class BaseUpdateAction extends PatchAction {
@Override
public ValidationResult validate(File toDir) throws IOException {
File fromFile = getSource(toDir);
ValidationResult result = doValidateAccess(fromFile, ValidationResult.Action.UPDATE);
ValidationResult result = doValidateAccess(fromFile, ValidationResult.Action.UPDATE, true);
if (result != null) return result;
if (!mySource.isEmpty()) {
result = doValidateAccess(getFile(toDir), ValidationResult.Action.UPDATE);
result = doValidateAccess(getFile(toDir), ValidationResult.Action.UPDATE, true);
if (result != null) return result;
}
return doValidateNotChanged(fromFile, ValidationResult.Kind.ERROR, ValidationResult.Action.UPDATE);

2
updater/src/com/intellij/updater/CreateAction.java
View File

@@ -58,7 +58,7 @@ public class CreateAction extends PatchAction {
@Override
public ValidationResult validate(File toDir) {
File toFile = getFile(toDir);
ValidationResult result = doValidateAccess(toFile, ValidationResult.Action.CREATE);
ValidationResult result = doValidateAccess(toFile, ValidationResult.Action.CREATE, true);
if (result != null) return result;
if (toFile.exists()) {

2
updater/src/com/intellij/updater/DeleteAction.java
View File

@@ -38,7 +38,7 @@ public class DeleteAction extends PatchAction {
@Override
public ValidationResult validate(File toDir) throws IOException {
File toFile = getFile(toDir);
ValidationResult result = doValidateAccess(toFile, ValidationResult.Action.DELETE);
ValidationResult result = doValidateAccess(toFile, ValidationResult.Action.DELETE, false);
if (result != null) return result;
if (myPatch.validateDeletion(getPath()) && toFile.exists() && isModified(toFile)) {

3
updater/src/com/intellij/updater/PatchAction.java
View File

@@ -135,10 +135,11 @@ public abstract class PatchAction {
protected abstract ValidationResult validate(File toDir) throws IOException;
protected ValidationResult doValidateAccess(File toFile, ValidationResult.Action action) {
protected ValidationResult doValidateAccess(File toFile, ValidationResult.Action action, boolean checkWriteable) {
if (!toFile.exists() || toFile.isDirectory()) return null;
ValidationResult result = validateProcessLock(toFile, action);
if (result != null) return result;
if (!checkWriteable) return null;
if (toFile.canRead() && toFile.canWrite() && isWritable(toFile)) return null;
ValidationResult.Option[] options = {myPatch.isStrict() ? ValidationResult.Option.NONE : ValidationResult.Option.IGNORE};
return new ValidationResult(ValidationResult.Kind.ERROR, myPath, action, ValidationResult.ACCESS_DENIED_MESSAGE, options);

12
updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java
View File

@@ -510,6 +510,18 @@ public abstract class PatchApplyingRevertingTest extends PatchTestCase {
});
}
@Test
public void testReadOnlyFilesAreDeletable() throws Exception {
File file = new File(myOlderDir, "bin/read_only_to_delete");
FileUtil.writeToFile(file, "bye");
assertTrue(file.setWritable(false, false));
Patch patch = createPatch();
PatchFileCreator.PreparationResult preparationResult = PatchFileCreator.prepareAndValidate(myFile, myOlderDir, TEST_UI);
assertThat(preparationResult.validationResults).isEmpty();
assertAppliedAndRevertedCorrectly(patch, preparationResult);
}
protected PatchAction getAction(Patch patch, String path) {
return ContainerUtil.find(patch.getActions(), a -> a.getPath().equals(path));