Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-08 15:55:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

files2 - fix permission denied issues

Browse Source
This commit is contained in:
Benjamin Pasero
2019-04-11 12:47:06 +02:00
parent 722fb0a932
commit 8fc9e3eb2a
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/files2/node/diskFileSystemProvider.ts
+1 -1
View File
@@ -487,7 +487,7 @@ export class DiskFileSystemProvider extends Disposable implements IFileSystemPro
code = FileSystemProviderErrorCode.FileExists;
break;
case 'EPERM':
case 'EACCESS':
case 'EACCES':
code = FileSystemProviderErrorCode.NoPermissions;
break;
default:
src/vs/workbench/services/textfile/node/textFileService.ts
+35 -10
View File
@@ -4,11 +4,12 @@
*--------------------------------------------------------------------------------------------*/
import { tmpdir } from 'os';
import { localize } from 'vs/nls';
import { TextFileService } from 'vs/workbench/services/textfile/common/textFileService';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { URI } from 'vs/base/common/uri';
import { ITextSnapshot, IWriteTextFileOptions, IFileStatWithMetadata, IResourceEncoding, IResolveContentOptions, IFileService, stringToSnapshot, ICreateFileOptions } from 'vs/platform/files/common/files';
import { ITextSnapshot, IWriteTextFileOptions, IFileStatWithMetadata, IResourceEncoding, IResolveContentOptions, IFileService, stringToSnapshot, ICreateFileOptions, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
import { Schemas } from 'vs/base/common/network';
import { exists, stat, chmod, rimraf } from 'vs/base/node/pfs';
import { join, dirname } from 'vs/base/common/path';
@@ -69,16 +70,41 @@ export class NodeTextFileService extends TextFileService {
return this.writeElevated(resource, value, options);
}
// check for encoding
const { encoding, addBOM } = await this.encoding.getWriteEncoding(resource, options);
try {
// return to parent when encoding is standard
if (encoding === UTF8 && !addBOM) {
return super.write(resource, value, options);
// check for encoding
const { encoding, addBOM } = await this.encoding.getWriteEncoding(resource, options);
// return to parent when encoding is standard
if (encoding === UTF8 && !addBOM) {
return await super.write(resource, value, options);
}
// otherwise save with encoding
else {
return await this.fileService.writeFile(resource, this.getEncodedReadable(value, encoding, addBOM), options);
}
} catch (error) {
// In case of permission denied, we need to check for readonly
if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_PERMISSION_DENIED) {
let isReadonly = false;
try {
const fileStat = await stat(resource.fsPath);
if (!(fileStat.mode & 128)) {
isReadonly = true;
}
} catch (error) {
// ignore - rethrow original error
}
if (isReadonly) {
throw new FileOperationError(localize('fileReadOnlyError', "File is Read Only"), FileOperationResult.FILE_READ_ONLY, options);
}
}
throw error;
}
// otherwise save with encoding
return this.fileService.writeFile(resource, this.getEncodedReadable(value, encoding, addBOM), options);
}
private getEncodedReadable(value: string | ITextSnapshot, encoding: string, addBOM: boolean): VSBufferReadable {
@@ -165,7 +191,6 @@ export class NodeTextFileService extends TextFileService {
bytesRead += res.byteLength;
return VSBuffer.wrap(res);
}
}
};
}