Skip to content

Commit

Permalink
Merge pull request #1913 from alvasw/extract_tor_preload_path_computa…
Browse files Browse the repository at this point in the history
…tion

Extract LdPreload computation out of TorProcess
  • Loading branch information
alvasw authored Mar 23, 2024
2 parents 53daf4b + 2fd0839 commit ef8111e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
36 changes: 36 additions & 0 deletions network/tor/tor/src/main/java/bisq/tor/process/LdPreload.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/

package bisq.tor.process;

import java.io.File;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Objects;
import java.util.stream.Collectors;

public class LdPreload {
public static String computeLdPreloadVariable(Path dirPath) {
File[] sharedLibraries = dirPath.toFile()
.listFiles((file, fileName) -> fileName.contains(".so."));
Objects.requireNonNull(sharedLibraries);

return Arrays.stream(sharedLibraries)
.map(File::getAbsolutePath)
.collect(Collectors.joining(":"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void start() {
);

Map<String, String> environment = processBuilder.environment();
environment.put("LD_PRELOAD", computeLdPreloadVariable());
environment.put("LD_PRELOAD", LdPreload.computeLdPreloadVariable(torDataDirPath));

processBuilder.redirectError(ProcessBuilder.Redirect.DISCARD);
processBuilder.redirectOutput(ProcessBuilder.Redirect.DISCARD);
Expand Down

0 comments on commit ef8111e

Please sign in to comment.