Skip to content

Commit f0f2083

Browse files
committed
Randomize default passwords on setup
1 parent 799a48f commit f0f2083

4 files changed

Lines changed: 21 additions & 4 deletions

File tree

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ dependencies {
6464
implementation 'com.github.Bombe:jFCPlib:v0.1.6'
6565
// End Freenet dependencies
6666

67+
// Random strings for ssl.sslKeyStorePass
68+
implementation 'org.apache.commons:commons-lang3:3.9'
69+
6770
// Android compatible logging
6871
implementation 'co.trikita:log:1.1.5'
6972

src/main/java/org/freenetproject/mobile/Config.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.freenetproject.mobile;
22

3+
import org.apache.commons.lang3.*;
4+
35
import java.io.*;
46
import java.nio.file.*;
57
import java.util.*;
@@ -112,6 +114,9 @@ private Properties getDefaultConfig(Path path) throws IOException {
112114
config.setProperty("node.masterKeyFile", dir + "/master.keys");
113115
config.setProperty("node.downloadsDir", dir + "/downloads");
114116

117+
config.setProperty("ssl.sslKeyStorePass", RandomStringUtils.randomAscii(64));
118+
config.setProperty("ssl.sslKeyPass", RandomStringUtils.randomAscii(64));
119+
115120
config.setProperty("logger.dirname", dir + "/logs");
116121

117122
return config;

src/main/resources/defaults/freenet.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ fproxy.ssl=false
1313
fproxy.enabled=true
1414
fproxy.bindTo=127.0.0.1,0:0:0:0:0:0:0:1
1515
fproxy.allowedHostsFullAccess=127.0.0.1,0:0:0:0:0:0:0:1
16-
logger.maxZippedLogsSize=10485760
17-
logger.priority=WARNING
16+
logger.maxZippedLogsSize=1000000
17+
logger.priority=NONE
1818
pluginmanager.enabled=false
19-
ssl.sslKeyStorePass=freenet
20-
ssl.sslKeyPass=freenet
19+
ssl.sslKeyStorePass=
20+
ssl.sslKeyPass=
2121
ssl.sslKeyStore=datastore/certs
2222
ssl.sslEnable=false
2323
toadletsymlinker.symlinks=/sl/search/%23/plugins/plugins.Librarian/;/sl/gallery/%23/plugins/plugins.TestGallery/

src/test/java/org/freenetproject/mobile/NodeControllerImplTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ public void resourceDefault(@TempDir Path path) throws IOException {
2727
assertEquals(path.toString(), nc.getConfig("node.install.cfgDir", ""));
2828
}
2929

30+
@Test
31+
public void defaultValues(@TempDir Path path) throws IOException {
32+
NodeControllerImpl nc = new NodeControllerImpl(path);
33+
assertNotEquals("", nc.getConfig("ssl.sslKeyStorePass"));
34+
assertEquals(64, nc.getConfig("ssl.sslKeyStorePass").length());
35+
assertNotEquals("", nc.getConfig("ssl.sslKeyPass"));
36+
assertEquals(64, nc.getConfig("ssl.sslKeyPass").length());
37+
}
38+
3039
@Test
3140
public void setConfig(@TempDir Path path) throws IOException {
3241
Connector mockConnector = Mockito.mock(Connector.class);

0 commit comments

Comments
 (0)