Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Extract LdPreload computation out of TorProcess #1913

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading