github-code-scanning[bot] commented on code in PR #13476: URL: https://github.com/apache/druid/pull/13476#discussion_r1089769440
########## indexing-service/src/main/java/org/apache/druid/indexing/common/TaskStorageDirTracker.java: ########## @@ -0,0 +1,104 @@ +/* + * 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.apache.druid.indexing.common; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.java.util.common.ISE; + +import javax.inject.Inject; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class TaskStorageDirTracker +{ + private int taskDirIndex = 0; + + private final List<File> baseTaskDirs = new ArrayList<>(); + + private final Map<String, File> taskToTempDirMap = new HashMap<>(); + + @Inject + public TaskStorageDirTracker(final TaskConfig taskConfig) + { + this(taskConfig.getBaseTaskDirPaths()); + } + + @VisibleForTesting + public TaskStorageDirTracker(final List<String> baseTaskDirPaths) + { + for (String baseTaskDirPath : baseTaskDirPaths) { + baseTaskDirs.add(new File(baseTaskDirPath)); + } + } + + public File getBaseTaskDir(String taskId) + { + return getOrSelectTaskDir(taskId); + } + + public File getTaskDir(String taskId) + { + return new File(getBaseTaskDir(taskId), taskId); Review Comment: ## Uncontrolled data used in path expression This path depends on a [user-provided value](1). [Show more details](https://github.com/apache/druid/security/code-scanning/4207) ########## indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java: ########## @@ -430,9 +457,17 @@ } } - public File getCompletedTaskDir() + public List<File> getCompletedTaskDirs() + { + return dirTracker.getBaseTaskDirs() + .stream() + .map(location -> new File(location.getPath(), COMPLETED)) + .collect(Collectors.toList()); + } + + public File getCompletedTaskFile(String taskId) { - return new File(taskConfig.getBaseTaskDir(), "completedTasks"); + return new File(new File(dirTracker.getBaseTaskDir(taskId), COMPLETED), taskId); Review Comment: ## Uncontrolled data used in path expression This path depends on a [user-provided value](1). [Show more details](https://github.com/apache/druid/security/code-scanning/4209) ########## indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java: ########## @@ -329,14 +341,29 @@ } } - public File getAssignedTaskDir() + public File getAssignedTaskFile(String taskId) + { + return new File(new File(dirTracker.getBaseTaskDir(taskId), ASSIGNED), taskId); Review Comment: ## Uncontrolled data used in path expression This path depends on a [user-provided value](1). [Show more details](https://github.com/apache/druid/security/code-scanning/4208) ########## indexing-service/src/main/java/org/apache/druid/indexing/common/TaskStorageDirTracker.java: ########## @@ -0,0 +1,104 @@ +/* + * 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.apache.druid.indexing.common; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.druid.indexing.common.config.TaskConfig; +import org.apache.druid.java.util.common.ISE; + +import javax.inject.Inject; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class TaskStorageDirTracker +{ + private int taskDirIndex = 0; + + private final List<File> baseTaskDirs = new ArrayList<>(); + + private final Map<String, File> taskToTempDirMap = new HashMap<>(); + + @Inject + public TaskStorageDirTracker(final TaskConfig taskConfig) + { + this(taskConfig.getBaseTaskDirPaths()); + } + + @VisibleForTesting + public TaskStorageDirTracker(final List<String> baseTaskDirPaths) + { + for (String baseTaskDirPath : baseTaskDirPaths) { + baseTaskDirs.add(new File(baseTaskDirPath)); + } + } + + public File getBaseTaskDir(String taskId) + { + return getOrSelectTaskDir(taskId); + } + + public File getTaskDir(String taskId) + { + return new File(getBaseTaskDir(taskId), taskId); + } + + public File getTaskWorkDir(String taskId) + { + return new File(getTaskDir(taskId), "work"); + } + + public File getTaskTempDir(String taskId) + { + return new File(getTaskDir(taskId), "temp"); + } + + public List<File> getBaseTaskDirs() + { + return baseTaskDirs; + } + + public synchronized File getOrSelectTaskDir(final String taskId) + { + if (!taskToTempDirMap.containsKey(taskId)) { + addTask(taskId, baseTaskDirs.get(taskDirIndex)); + taskDirIndex = (taskDirIndex + 1) % baseTaskDirs.size(); Review Comment: ## User-controlled data in arithmetic expression This arithmetic expression depends on a [user-provided value](1), potentially causing an overflow. [Show more details](https://github.com/apache/druid/security/code-scanning/4210) -- 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]
