Skip to content

fix: incorrect check for Windows OS in FileDataStoreFactory #927

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Mar 25, 2020
Merged

fix: incorrect check for Windows OS in FileDataStoreFactory #927

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a3613a
fix: incorrect check for Windows OS in FileDataStoreFactory
diesieben07 Dec 28, 2019
c97c34e
fix: properly get file owner on windows in FileDataStoreFactory
diesieben07 Dec 28, 2019
6bc4da2
refactor: use toLowerCase instead of regionMatches in FileDataStoreFa…
diesieben07 Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
import java.nio.file.attribute.AclEntryPermission;
import java.nio.file.attribute.AclEntryType;
import java.nio.file.attribute.AclFileAttributeView;
import java.nio.file.attribute.FileOwnerAttributeView;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.UserPrincipal;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import java.util.logging.Logger;

Expand All @@ -53,7 +55,7 @@ public class FileDataStoreFactory extends AbstractDataStoreFactory {
private static final Logger LOGGER = Logger.getLogger(FileDataStoreFactory.class.getName());

private static final boolean IS_WINDOWS = StandardSystemProperty.OS_NAME.value()
.startsWith("WINDOWS");
.toLowerCase(Locale.ENGLISH).startsWith("windows");

/** Directory to store data. */
private final File dataDirectory;
Expand Down Expand Up @@ -155,8 +157,8 @@ static void setPermissionsToOwnerOnly(File file) throws IOException {

static void setPermissionsToOwnerOnlyWindows(File file) throws IOException {
Path path = Paths.get(file.getAbsolutePath());
UserPrincipal owner = path.getFileSystem().getUserPrincipalLookupService()
.lookupPrincipalByName("OWNER@");
FileOwnerAttributeView fileAttributeView = Files.getFileAttributeView(path, FileOwnerAttributeView.class);
UserPrincipal owner = fileAttributeView.getOwner();

// get view
AclFileAttributeView view = Files.getFileAttributeView(path, AclFileAttributeView.class);
Expand Down