Skip to content

Commit

Permalink
Randomize default passwords on setup
Browse files Browse the repository at this point in the history
  • Loading branch information
desyncr committed Apr 30, 2021
1 parent 799a48f commit f0f2083
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ dependencies {
implementation 'com.github.Bombe:jFCPlib:v0.1.6'
// End Freenet dependencies

// Random strings for ssl.sslKeyStorePass
implementation 'org.apache.commons:commons-lang3:3.9'

// Android compatible logging
implementation 'co.trikita:log:1.1.5'

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/freenetproject/mobile/Config.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.freenetproject.mobile;

import org.apache.commons.lang3.*;

import java.io.*;
import java.nio.file.*;
import java.util.*;
Expand Down Expand Up @@ -112,6 +114,9 @@ private Properties getDefaultConfig(Path path) throws IOException {
config.setProperty("node.masterKeyFile", dir + "/master.keys");
config.setProperty("node.downloadsDir", dir + "/downloads");

config.setProperty("ssl.sslKeyStorePass", RandomStringUtils.randomAscii(64));
config.setProperty("ssl.sslKeyPass", RandomStringUtils.randomAscii(64));

config.setProperty("logger.dirname", dir + "/logs");

return config;
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/defaults/freenet.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ fproxy.ssl=false
fproxy.enabled=true
fproxy.bindTo=127.0.0.1,0:0:0:0:0:0:0:1
fproxy.allowedHostsFullAccess=127.0.0.1,0:0:0:0:0:0:0:1
logger.maxZippedLogsSize=10485760
logger.priority=WARNING
logger.maxZippedLogsSize=1000000
logger.priority=NONE
pluginmanager.enabled=false
ssl.sslKeyStorePass=freenet
ssl.sslKeyPass=freenet
ssl.sslKeyStorePass=
ssl.sslKeyPass=
ssl.sslKeyStore=datastore/certs
ssl.sslEnable=false
toadletsymlinker.symlinks=/sl/search/%23/plugins/plugins.Librarian/;/sl/gallery/%23/plugins/plugins.TestGallery/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ public void resourceDefault(@TempDir Path path) throws IOException {
assertEquals(path.toString(), nc.getConfig("node.install.cfgDir", ""));
}

@Test
public void defaultValues(@TempDir Path path) throws IOException {
NodeControllerImpl nc = new NodeControllerImpl(path);
assertNotEquals("", nc.getConfig("ssl.sslKeyStorePass"));
assertEquals(64, nc.getConfig("ssl.sslKeyStorePass").length());
assertNotEquals("", nc.getConfig("ssl.sslKeyPass"));
assertEquals(64, nc.getConfig("ssl.sslKeyPass").length());
}

@Test
public void setConfig(@TempDir Path path) throws IOException {
Connector mockConnector = Mockito.mock(Connector.class);
Expand Down

0 comments on commit f0f2083

Please sign in to comment.