diff --git a/docs/README.md b/docs/README.md index ccbb1b4c..4678e307 100644 --- a/docs/README.md +++ b/docs/README.md @@ -18,5 +18,4 @@ The Onionr [whitepaper](whitepaper.md) is the best place to start both for users * [Technical overview](dev/overview.md) * [Project layout](dev/layout.md) * [Plugin development guide](dev/plugins.md) -* [Testing](dev/testing.md) * [Auto generated API docs (HTML)](html/onionr/index.html) \ No newline at end of file diff --git a/docs/TODO.txt b/docs/TODO.txt index 2fa43e14..9e64f36f 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -1,8 +1,9 @@ * add GUI config editor * add multi-device forward secrecy + * document anonymity & security theory * document usage -* add offline mode + * encrypt local data and keys * ensure accessibility for Onionr web UI * make forward secrecy compatible with multiple devices diff --git a/scripts/disable-dev-config.py b/scripts/disable-dev-config.py index ff337f09..2168e9b2 100755 --- a/scripts/disable-dev-config.py +++ b/scripts/disable-dev-config.py @@ -14,6 +14,9 @@ conf['tor']['existing_socks_port'] = 0 conf['general']['dev_mode'] = False conf['general']['insert_deniable_blocks'] = True conf['general']['random_bind_ip'] = True +conf['onboarding']['done'] = False +conf['general']['minimum_block_pow'] = 6 +conf['general']['minimum_send_pow'] = 6 json.dump(conf, open('static-data/default_config.json', 'w'), sort_keys=True, indent=4) diff --git a/scripts/enable-dev-config.py b/scripts/enable-dev-config.py index a25e61a4..3f89d25f 100755 --- a/scripts/enable-dev-config.py +++ b/scripts/enable-dev-config.py @@ -14,7 +14,10 @@ if input("Reuse Tor? y/n:").lower() == 'y': conf['general']['dev_mode'] = True conf['general']['insert_deniable_blocks'] = False -conf['general']['general.random_bind_ip'] = False +conf['general']['random_bind_ip'] = False +conf['onboarding']['done'] = True +conf['general']['minimum_block_pow'] = 4 +conf['general']['minimum_send_pow'] = 4 json.dump(conf, open('static-data/default_config.json', 'w'), sort_keys=True, indent=4) diff --git a/src/config/onboarding.py b/src/config/onboarding.py index 5997984f..6b7c6f9a 100644 --- a/src/config/onboarding.py +++ b/src/config/onboarding.py @@ -44,6 +44,9 @@ def set_config_from_onboarding(config_settings: OnboardingConfig): 'networkContrib'): config.set('general.security_level', 1) + if get(config_settings, 'localThreat'): + config.set('general.security_level', 3) + config.set('ui.theme', 'light') if get(config_settings, 'useDark'): config.set('ui.theme', 'dark') diff --git a/src/etc/onionrvalues.py b/src/etc/onionrvalues.py index 6db86b4b..e481fc59 100755 --- a/src/etc/onionrvalues.py +++ b/src/etc/onionrvalues.py @@ -50,8 +50,7 @@ WSGI_SERVER_REQUEST_TIMEOUT_SECS = 120 MAX_NEW_PEER_QUEUE = 1000 # Begin OnionrValues migrated values -"""Make announce take a few seconds (on average) to compute to discourage excessive node announcements""" -ANNOUNCE_POW = 6 + """30 days is plenty of time for someone to decide to renew a block""" DEFAULT_EXPIRE = 2592000 # Metadata header section length limits, in bytes diff --git a/static-data/bootstrap-nodes.txt b/static-data/bootstrap-nodes.txt index 26d17d37..5d393265 100755 --- a/static-data/bootstrap-nodes.txt +++ b/static-data/bootstrap-nodes.txt @@ -1 +1 @@ -3msj7fgyxgpfsjvvtcji7a4tkjbna6jmpealv6mun7435jjyptctfxyd.onion,chz7aarrmhxnefa6jx7ai3h3f5oy4sz5x4o5bbhfcq4xr3zbvsynaoad.onion,llqcrrf5cdk7p277eynepnvoo4ggrnybmp2daqtsr2hshitlmvbipdqd.onion +b5pllmmlfzrw67bw3qll53qw66uryw4evmj6iirkhzj5taosvrigs5qd.onion \ No newline at end of file diff --git a/static-data/default_config.json b/static-data/default_config.json index a2d42e3b..4317f952 100755 --- a/static-data/default_config.json +++ b/static-data/default_config.json @@ -7,16 +7,16 @@ }, "general": { "announce_node": true, - "dev_mode": false, + "dev_mode": true, "display_header": false, "general.random_bind_ip": false, "hide_created_blocks": true, - "insert_deniable_blocks": true, + "insert_deniable_blocks": false, "max_block_age": 2678400, "minimum_block_pow": 4, "minimum_send_pow": 4, "public_key": "", - "random_bind_ip": true, + "random_bind_ip": false, "security_level": 0, "show_notifications": true, "socket_servers": false, @@ -35,7 +35,7 @@ "verbosity": "default" }, "onboarding": { - "done": false + "done": true }, "peers": { "max_connect": 1000, @@ -53,11 +53,11 @@ "tor": { "bridge_fingerprint": "", "bridge_ip": "", - "existing_control_password": "", - "existing_control_port": 0, - "existing_socks_port": 0, + "existing_control_password": "testt", + "existing_control_port": 1338, + "existing_socks_port": 1337, "use_bridge": false, - "use_existing_tor": false, + "use_existing_tor": true, "v3onions": true }, "transports": { diff --git a/tests/runtime-result.txt b/tests/runtime-result.txt index 4b1ecd35..412e149b 100644 --- a/tests/runtime-result.txt +++ b/tests/runtime-result.txt @@ -1 +1 @@ -1580770843 \ No newline at end of file +1580781328 \ No newline at end of file