sdedic commented on code in PR #7698: URL: https://github.com/apache/netbeans/pull/7698#discussion_r1734565147
########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileGenerator.java: ########## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.AclEntry; +import java.nio.file.attribute.AclEntryPermission; +import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA; +import static java.nio.file.attribute.AclEntryPermission.DELETE; +import static java.nio.file.attribute.AclEntryPermission.READ_ACL; +import static java.nio.file.attribute.AclEntryPermission.READ_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.READ_DATA; +import static java.nio.file.attribute.AclEntryPermission.READ_NAMED_ATTRS; +import static java.nio.file.attribute.AclEntryPermission.SYNCHRONIZE; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ACL; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.WRITE_DATA; +import static java.nio.file.attribute.AclEntryPermission.WRITE_NAMED_ATTRS; +import java.nio.file.attribute.AclFileAttributeView; +import java.nio.file.attribute.DosFileAttributeView; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import static java.nio.file.attribute.PosixFilePermission.OWNER_READ; +import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dusan Petrovic + */ +public class ConfigFileGenerator { + + private static final Logger LOG = Logger.getLogger(ConfigFileGenerator.class.getName()); + + private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N + private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); + private static final EnumSet<PosixFilePermission> readPosix = EnumSet.of(OWNER_READ); + + private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of( + READ_ACL, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_DATA, + READ_NAMED_ATTRS, + DELETE, Review Comment: `DELETE` and `WRITE_ATTRIBUTES` among read-only attrs ? ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileGenerator.java: ########## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.AclEntry; +import java.nio.file.attribute.AclEntryPermission; +import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA; +import static java.nio.file.attribute.AclEntryPermission.DELETE; +import static java.nio.file.attribute.AclEntryPermission.READ_ACL; +import static java.nio.file.attribute.AclEntryPermission.READ_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.READ_DATA; +import static java.nio.file.attribute.AclEntryPermission.READ_NAMED_ATTRS; +import static java.nio.file.attribute.AclEntryPermission.SYNCHRONIZE; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ACL; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.WRITE_DATA; +import static java.nio.file.attribute.AclEntryPermission.WRITE_NAMED_ATTRS; +import java.nio.file.attribute.AclFileAttributeView; +import java.nio.file.attribute.DosFileAttributeView; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import static java.nio.file.attribute.PosixFilePermission.OWNER_READ; +import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dusan Petrovic + */ +public class ConfigFileGenerator { + + private static final Logger LOG = Logger.getLogger(ConfigFileGenerator.class.getName()); + + private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N + private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); + private static final EnumSet<PosixFilePermission> readPosix = EnumSet.of(OWNER_READ); + + private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of( + READ_ACL, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_DATA, + READ_NAMED_ATTRS, + DELETE, + SYNCHRONIZE + ); + + private static final EnumSet<AclEntryPermission> readWriteAcl = EnumSet.of( + READ_DATA, + WRITE_DATA, + APPEND_DATA, + READ_NAMED_ATTRS, + WRITE_NAMED_ATTRS, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_ACL, + WRITE_ACL + ); + + private static final Path tmpdir = Path.of(System.getProperty("java.io.tmpdir")); // NOI18N + + private final Boolean readOnly; + private final String filePrefix; + private final String fileSufix; + private final String configPath; + + public ConfigFileGenerator(String filePrefix, String fileSufix, String configPath, boolean readOnly) { + this.readOnly = readOnly; + this.configPath = configPath; + this.filePrefix = filePrefix; + this.fileSufix = fileSufix; + } + + public Path generateConfigFile() throws IOException { + Path dir = generateDirPath(); + + if (!Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS)) { Review Comment: Q: what will be the result if there's a symbolic link named `${dir}` ? ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileGenerator.java: ########## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.AclEntry; +import java.nio.file.attribute.AclEntryPermission; +import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA; +import static java.nio.file.attribute.AclEntryPermission.DELETE; +import static java.nio.file.attribute.AclEntryPermission.READ_ACL; +import static java.nio.file.attribute.AclEntryPermission.READ_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.READ_DATA; +import static java.nio.file.attribute.AclEntryPermission.READ_NAMED_ATTRS; +import static java.nio.file.attribute.AclEntryPermission.SYNCHRONIZE; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ACL; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.WRITE_DATA; +import static java.nio.file.attribute.AclEntryPermission.WRITE_NAMED_ATTRS; +import java.nio.file.attribute.AclFileAttributeView; +import java.nio.file.attribute.DosFileAttributeView; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import static java.nio.file.attribute.PosixFilePermission.OWNER_READ; +import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dusan Petrovic + */ +public class ConfigFileGenerator { + + private static final Logger LOG = Logger.getLogger(ConfigFileGenerator.class.getName()); + + private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N + private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); + private static final EnumSet<PosixFilePermission> readPosix = EnumSet.of(OWNER_READ); + + private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of( + READ_ACL, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_DATA, + READ_NAMED_ATTRS, + DELETE, + SYNCHRONIZE + ); + + private static final EnumSet<AclEntryPermission> readWriteAcl = EnumSet.of( + READ_DATA, + WRITE_DATA, + APPEND_DATA, + READ_NAMED_ATTRS, + WRITE_NAMED_ATTRS, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_ACL, + WRITE_ACL + ); + + private static final Path tmpdir = Path.of(System.getProperty("java.io.tmpdir")); // NOI18N + + private final Boolean readOnly; + private final String filePrefix; + private final String fileSufix; + private final String configPath; + + public ConfigFileGenerator(String filePrefix, String fileSufix, String configPath, boolean readOnly) { + this.readOnly = readOnly; + this.configPath = configPath; + this.filePrefix = filePrefix; + this.fileSufix = fileSufix; + } + + public Path generateConfigFile() throws IOException { + Path dir = generateDirPath(); + + if (!Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS)) { + Files.createDirectory(dir); + } + if (POSIX) { + return createFilePosix(dir); + } + + Path temp = Files.createTempFile(dir, this.filePrefix, this.fileSufix); + try { + setFileOwnerAcl(temp, readWriteAcl); + } catch (IOException ex) { + deleteTempFile(temp); + throw ex; + } + return temp; + } + + public void writePropertiesToFile(Properties props, Path filePath) throws IOException { + try (Writer writer = new FileWriter(filePath.toFile(), Charset.defaultCharset());) { + props.store(writer, ""); + if (POSIX) { + setFilePermissionPosix(filePath); + } else { + if (readOnly) { + DosFileAttributeView attribs = Files.getFileAttributeView(filePath, DosFileAttributeView.class); + attribs.setReadOnly(true); + setFileOwnerAcl(filePath, readOnlyAcl); + } else { + setFileOwnerAcl(filePath, readWriteAcl); + } + } + filePath.toFile().deleteOnExit(); + } + } + + private void setFileOwnerAcl(Path filePath, Set<AclEntryPermission> permissions) throws IOException { + AclFileAttributeView acl = Files.getFileAttributeView(filePath, AclFileAttributeView.class); + AclEntry ownerEntry = findFileOwner(acl); + + if (ownerEntry == null) { + throw new IOException("Owner missing, file:" + filePath.toString()); // NOI18N + } + + AclEntry ownerAcl = AclEntry.newBuilder(ownerEntry).setPermissions(permissions).build(); + acl.setAcl(Collections.singletonList(ownerAcl)); + } + + private AclEntry findFileOwner(AclFileAttributeView acl) throws IOException { + for(AclEntry e : acl.getAcl()) { + if (e.principal().equals(acl.getOwner())) { + return e; + } + } + return null; + } + + private void setFilePermissionPosix(Path temp) throws IOException { + PosixFileAttributeView attributes = Files.getFileAttributeView(temp, PosixFileAttributeView.class); + if (this.readOnly) { + attributes.setPermissions(readPosix); + } else { + attributes.setPermissions(readWritePosix); + } + } + + + private Path createFilePosix(Path dir) throws IOException { + FileAttribute<?> readWriteAttribs = PosixFilePermissions.asFileAttribute(readWritePosix); + return Files.createTempFile(dir,this.filePrefix, this.fileSufix, readWriteAttribs); + } + + Path generateDirPath() { + String s = this.configPath + "_" + System.getProperty("user.name"); // NOI18N + Path name = tmpdir.getFileSystem().getPath(s); + return tmpdir.resolve(name); Review Comment: Nitpick: can use `tmpDir.resolve(String)`, does the same through tmpdir's filesystem. ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/OCIPropertiesProvider.java: ########## @@ -62,16 +44,12 @@ public class OCIPropertiesProvider implements CommandProvider { private static final Logger LOG = Logger.getLogger(OCIPropertiesProvider.class.getName()); private static final String GET_DB_CONNECTION = "nbls.db.connection"; //NOI18N - private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N - private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); - private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of(READ_ACL, READ_ATTRIBUTES, WRITE_ATTRIBUTES, READ_DATA, READ_NAMED_ATTRS, DELETE, SYNCHRONIZE); - - // temporary directory location - private static final Path tmpdir = Path.of(System.getProperty("java.io.tmpdir")); // NOI18N + private final ConfigFileGenerator configFileGenerator; public OCIPropertiesProvider() { + this.configFileGenerator = new ConfigFileGenerator("db-", ".properties", GET_DB_CONNECTION, true); // NOI18N try { - deleteOldFiles(generateDirPath()); + configFileGenerator.deleteOldFiles(); Review Comment: Suppose 2 NBLS servers run at the same time, e.g. two vscode windows, per-workspace NBLS (= 2 instances). `deleteOldFiles` removes files underneath `generateDirPath` which does not use random seed ... so it seems that `deleteOldFiles` in `NBLS #1` constructs the same path as `NBLS #2` is using and deletes the contents ? ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileGenerator.java: ########## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.AclEntry; +import java.nio.file.attribute.AclEntryPermission; +import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA; +import static java.nio.file.attribute.AclEntryPermission.DELETE; +import static java.nio.file.attribute.AclEntryPermission.READ_ACL; +import static java.nio.file.attribute.AclEntryPermission.READ_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.READ_DATA; +import static java.nio.file.attribute.AclEntryPermission.READ_NAMED_ATTRS; +import static java.nio.file.attribute.AclEntryPermission.SYNCHRONIZE; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ACL; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.WRITE_DATA; +import static java.nio.file.attribute.AclEntryPermission.WRITE_NAMED_ATTRS; +import java.nio.file.attribute.AclFileAttributeView; +import java.nio.file.attribute.DosFileAttributeView; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import static java.nio.file.attribute.PosixFilePermission.OWNER_READ; +import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dusan Petrovic + */ +public class ConfigFileGenerator { + + private static final Logger LOG = Logger.getLogger(ConfigFileGenerator.class.getName()); + + private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N + private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); + private static final EnumSet<PosixFilePermission> readPosix = EnumSet.of(OWNER_READ); + + private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of( + READ_ACL, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_DATA, + READ_NAMED_ATTRS, + DELETE, + SYNCHRONIZE + ); + + private static final EnumSet<AclEntryPermission> readWriteAcl = EnumSet.of( + READ_DATA, + WRITE_DATA, + APPEND_DATA, + READ_NAMED_ATTRS, + WRITE_NAMED_ATTRS, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_ACL, + WRITE_ACL + ); + + private static final Path tmpdir = Path.of(System.getProperty("java.io.tmpdir")); // NOI18N + + private final Boolean readOnly; + private final String filePrefix; + private final String fileSufix; + private final String configPath; + + public ConfigFileGenerator(String filePrefix, String fileSufix, String configPath, boolean readOnly) { + this.readOnly = readOnly; + this.configPath = configPath; + this.filePrefix = filePrefix; + this.fileSufix = fileSufix; + } + + public Path generateConfigFile() throws IOException { + Path dir = generateDirPath(); + + if (!Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS)) { + Files.createDirectory(dir); + } + if (POSIX) { + return createFilePosix(dir); + } + + Path temp = Files.createTempFile(dir, this.filePrefix, this.fileSufix); + try { + setFileOwnerAcl(temp, readWriteAcl); + } catch (IOException ex) { + deleteTempFile(temp); + throw ex; + } + return temp; + } + + public void writePropertiesToFile(Properties props, Path filePath) throws IOException { + try (Writer writer = new FileWriter(filePath.toFile(), Charset.defaultCharset());) { + props.store(writer, ""); + if (POSIX) { + setFilePermissionPosix(filePath); + } else { + if (readOnly) { + DosFileAttributeView attribs = Files.getFileAttributeView(filePath, DosFileAttributeView.class); + attribs.setReadOnly(true); + setFileOwnerAcl(filePath, readOnlyAcl); + } else { + setFileOwnerAcl(filePath, readWriteAcl); + } + } + filePath.toFile().deleteOnExit(); + } + } + + private void setFileOwnerAcl(Path filePath, Set<AclEntryPermission> permissions) throws IOException { + AclFileAttributeView acl = Files.getFileAttributeView(filePath, AclFileAttributeView.class); + AclEntry ownerEntry = findFileOwner(acl); + + if (ownerEntry == null) { + throw new IOException("Owner missing, file:" + filePath.toString()); // NOI18N + } + + AclEntry ownerAcl = AclEntry.newBuilder(ownerEntry).setPermissions(permissions).build(); + acl.setAcl(Collections.singletonList(ownerAcl)); + } + + private AclEntry findFileOwner(AclFileAttributeView acl) throws IOException { + for(AclEntry e : acl.getAcl()) { + if (e.principal().equals(acl.getOwner())) { + return e; + } + } + return null; + } + + private void setFilePermissionPosix(Path temp) throws IOException { + PosixFileAttributeView attributes = Files.getFileAttributeView(temp, PosixFileAttributeView.class); + if (this.readOnly) { + attributes.setPermissions(readPosix); + } else { + attributes.setPermissions(readWritePosix); + } + } + + + private Path createFilePosix(Path dir) throws IOException { + FileAttribute<?> readWriteAttribs = PosixFilePermissions.asFileAttribute(readWritePosix); + return Files.createTempFile(dir,this.filePrefix, this.fileSufix, readWriteAttribs); + } + + Path generateDirPath() { + String s = this.configPath + "_" + System.getProperty("user.name"); // NOI18N + Path name = tmpdir.getFileSystem().getPath(s); + return tmpdir.resolve(name); + } + + void deleteTempFile(Path temp) { + if (temp != null && Files.isRegularFile(temp, LinkOption.NOFOLLOW_LINKS)) { + try { + if (POSIX) { + PosixFileAttributeView attribs = Files.getFileAttributeView(temp, PosixFileAttributeView.class); + attribs.setPermissions(readWritePosix); + } else { + DosFileAttributeView attribs = Files.getFileAttributeView(temp, DosFileAttributeView.class); + attribs.setReadOnly(false); + } + Files.delete(temp); + } catch (IOException ex) { + LOG.log(Level.WARNING, "deleteTempFile", ex); + } + } + } + + void deleteOldFiles() throws IOException { + Path dir = generateDirPath(); + if (Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS)) { + try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) { + for (Path f : stream) { Review Comment: Q: just leaf folders are expected, no subfolders ? ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileProvider.java: ########## @@ -0,0 +1,83 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import org.netbeans.spi.lsp.CommandProvider; +import org.openide.util.lookup.ServiceProvider; + +/** + * + * @author Dusan Petrovic + */ +@ServiceProvider(service = CommandProvider.class) +public class ConfigFileProvider implements CommandProvider { + + private static final String GET_CONFIG_FILE_PATH = "nbls.config.file.path"; //NOI18N + + private final ConfigFileGenerator configFileGenerator; + + public ConfigFileProvider() { + this.configFileGenerator = new ConfigFileGenerator("app-config-", ".properties", GET_CONFIG_FILE_PATH, false); // NOI18N + } + + @Override + public Set<String> getCommands() { + return Collections.singleton(GET_CONFIG_FILE_PATH); + } + + @Override + public CompletableFuture<Object> runCommand(String command, List<Object> arguments) { + CompletableFuture ret = new CompletableFuture(); + + Properties props = new Properties(); + PropertiesGenerator propGen = new PropertiesGenerator(false); + props.putAll(propGen.getApplication()); + props.putAll(propGen.getBootstrap()); + + if (!props.isEmpty()) { + Path temp; + + try { + temp = configFileGenerator.generateConfigFile(); Review Comment: Instead of two calls (`generateConfigFile`, `writePropertiesToFile`) that happen in the sequence with double error handling, could there be just a `writePropertiesFile` that makes the directory, creates temp file and populates it in one call - centralizing IOException handling (delete the file being created) inside ConfigFileGenerator ? ########## enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ConfigFileGenerator.java: ########## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.netbeans.modules.cloud.oracle.assets; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.AclEntry; +import java.nio.file.attribute.AclEntryPermission; +import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA; +import static java.nio.file.attribute.AclEntryPermission.DELETE; +import static java.nio.file.attribute.AclEntryPermission.READ_ACL; +import static java.nio.file.attribute.AclEntryPermission.READ_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.READ_DATA; +import static java.nio.file.attribute.AclEntryPermission.READ_NAMED_ATTRS; +import static java.nio.file.attribute.AclEntryPermission.SYNCHRONIZE; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ACL; +import static java.nio.file.attribute.AclEntryPermission.WRITE_ATTRIBUTES; +import static java.nio.file.attribute.AclEntryPermission.WRITE_DATA; +import static java.nio.file.attribute.AclEntryPermission.WRITE_NAMED_ATTRS; +import java.nio.file.attribute.AclFileAttributeView; +import java.nio.file.attribute.DosFileAttributeView; +import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import static java.nio.file.attribute.PosixFilePermission.OWNER_READ; +import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dusan Petrovic + */ +public class ConfigFileGenerator { + + private static final Logger LOG = Logger.getLogger(ConfigFileGenerator.class.getName()); + + private static final boolean POSIX = FileSystems.getDefault().supportedFileAttributeViews().contains("posix"); // NOI18N + private static final EnumSet<PosixFilePermission> readWritePosix = EnumSet.of(OWNER_READ, OWNER_WRITE); + private static final EnumSet<PosixFilePermission> readPosix = EnumSet.of(OWNER_READ); + + private static final EnumSet<AclEntryPermission> readOnlyAcl = EnumSet.of( + READ_ACL, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_DATA, + READ_NAMED_ATTRS, + DELETE, + SYNCHRONIZE + ); + + private static final EnumSet<AclEntryPermission> readWriteAcl = EnumSet.of( + READ_DATA, + WRITE_DATA, + APPEND_DATA, + READ_NAMED_ATTRS, + WRITE_NAMED_ATTRS, + READ_ATTRIBUTES, + WRITE_ATTRIBUTES, + READ_ACL, + WRITE_ACL + ); + + private static final Path tmpdir = Path.of(System.getProperty("java.io.tmpdir")); // NOI18N + + private final Boolean readOnly; Review Comment: should be primitive `boolean`, no use for `null` value in the code. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
