mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-12 18:59:06 +01:00
Compare commits
1 Commits
ci-debuggi
...
beta-2016-
| Author | SHA1 | Date | |
|---|---|---|---|
|
62eda5cd91 |
9
.gitignore
vendored
9
.gitignore
vendored
@@ -9,20 +9,15 @@ Thumbs.db
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
# Eclipse project files
|
# Eclipse project files
|
||||||
.classpath
|
#.classpath
|
||||||
.project
|
#.project
|
||||||
.settings
|
|
||||||
|
|
||||||
# Local configuration file (sdk path, etc)
|
# Local configuration file (sdk path, etc)
|
||||||
local.properties
|
local.properties
|
||||||
|
|
||||||
# Android Studio
|
# Android Studio
|
||||||
.idea/*
|
.idea/*
|
||||||
!.idea/runConfigurations/
|
|
||||||
!.idea/codeStyleSettings.xml
|
!.idea/codeStyleSettings.xml
|
||||||
!.idea/codeStyles
|
|
||||||
.gradle
|
.gradle
|
||||||
build/
|
build/
|
||||||
captures
|
|
||||||
*.iml
|
*.iml
|
||||||
projectFilesBackup/
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
image: briar/ci-image-android:latest
|
|
||||||
|
|
||||||
test:
|
|
||||||
before_script:
|
|
||||||
- set -e
|
|
||||||
- export GRADLE_USER_HOME=$PWD/.gradle
|
|
||||||
|
|
||||||
cache:
|
|
||||||
paths:
|
|
||||||
- .gradle/wrapper
|
|
||||||
- .gradle/caches
|
|
||||||
|
|
||||||
script:
|
|
||||||
- ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
|
|
||||||
- ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom test
|
|
||||||
|
|
||||||
after_script:
|
|
||||||
# these file change every time but should not be cached
|
|
||||||
- rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
|
|
||||||
- rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
|
|
||||||
|
|
||||||
|
|
||||||
test_reproducible:
|
|
||||||
script:
|
|
||||||
- "curl -X POST -F token=${RELEASE_CHECK_TOKEN} -F ref=master -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
8
.idea/codeStyleSettings.xml
generated
8
.idea/codeStyleSettings.xml
generated
@@ -31,8 +31,6 @@
|
|||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="RIGHT_MARGIN" value="100" />
|
<option name="RIGHT_MARGIN" value="100" />
|
||||||
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
|
|
||||||
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
|
|
||||||
<AndroidXmlCodeStyleSettings>
|
<AndroidXmlCodeStyleSettings>
|
||||||
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
||||||
</AndroidXmlCodeStyleSettings>
|
</AndroidXmlCodeStyleSettings>
|
||||||
@@ -70,12 +68,6 @@
|
|||||||
<XML>
|
<XML>
|
||||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||||
</XML>
|
</XML>
|
||||||
<codeStyleSettings language="Groovy">
|
|
||||||
<indentOptions>
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
<option name="SMART_TABS" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="JAVA">
|
<codeStyleSettings language="JAVA">
|
||||||
<option name="RIGHT_MARGIN" value="80" />
|
<option name="RIGHT_MARGIN" value="80" />
|
||||||
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
||||||
|
|||||||
261
.idea/codeStyles/Project.xml
generated
261
.idea/codeStyles/Project.xml
generated
@@ -1,261 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<option name="RIGHT_MARGIN" value="100" />
|
|
||||||
<AndroidXmlCodeStyleSettings>
|
|
||||||
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
|
||||||
</AndroidXmlCodeStyleSettings>
|
|
||||||
<JavaCodeStyleSettings>
|
|
||||||
<option name="ANNOTATION_PARAMETER_WRAP" value="1" />
|
|
||||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
|
||||||
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
|
||||||
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
|
|
||||||
<value />
|
|
||||||
</option>
|
|
||||||
<option name="IMPORT_LAYOUT_TABLE">
|
|
||||||
<value>
|
|
||||||
<package name="android" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="com" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="junit" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="net" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="org" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="java" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="javax" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="" withSubpackages="true" static="false" />
|
|
||||||
<emptyLine />
|
|
||||||
<package name="" withSubpackages="true" static="true" />
|
|
||||||
<emptyLine />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
|
|
||||||
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
|
|
||||||
</JavaCodeStyleSettings>
|
|
||||||
<Objective-C-extensions>
|
|
||||||
<file>
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
|
||||||
</file>
|
|
||||||
<class>
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
|
||||||
</class>
|
|
||||||
<extensions>
|
|
||||||
<pair source="cpp" header="h" fileNamingConvention="NONE" />
|
|
||||||
<pair source="c" header="h" fileNamingConvention="NONE" />
|
|
||||||
</extensions>
|
|
||||||
</Objective-C-extensions>
|
|
||||||
<XML>
|
|
||||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
|
||||||
</XML>
|
|
||||||
<codeStyleSettings language="Groovy">
|
|
||||||
<indentOptions>
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
<option name="SMART_TABS" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="JAVA">
|
|
||||||
<option name="RIGHT_MARGIN" value="80" />
|
|
||||||
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
|
|
||||||
<option name="ALIGN_MULTILINE_RESOURCES" value="false" />
|
|
||||||
<option name="ALIGN_MULTILINE_FOR" value="false" />
|
|
||||||
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
|
|
||||||
<option name="CALL_PARAMETERS_WRAP" value="1" />
|
|
||||||
<option name="METHOD_PARAMETERS_WRAP" value="1" />
|
|
||||||
<option name="RESOURCE_LIST_WRAP" value="1" />
|
|
||||||
<option name="EXTENDS_LIST_WRAP" value="1" />
|
|
||||||
<option name="THROWS_LIST_WRAP" value="1" />
|
|
||||||
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
|
|
||||||
<option name="THROWS_KEYWORD_WRAP" value="1" />
|
|
||||||
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
|
|
||||||
<option name="BINARY_OPERATION_WRAP" value="1" />
|
|
||||||
<option name="TERNARY_OPERATION_WRAP" value="1" />
|
|
||||||
<option name="FOR_STATEMENT_WRAP" value="1" />
|
|
||||||
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
|
|
||||||
<option name="ASSIGNMENT_WRAP" value="1" />
|
|
||||||
<option name="ASSERT_STATEMENT_WRAP" value="1" />
|
|
||||||
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
|
|
||||||
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
|
|
||||||
<option name="ENUM_CONSTANTS_WRAP" value="1" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
<option name="SMART_TABS" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="XML">
|
|
||||||
<option name="FORCE_REARRANGE_MODE" value="1" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
<option name="SMART_TABS" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
<arrangement>
|
|
||||||
<rules>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>xmlns:android</NAME>
|
|
||||||
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>xmlns:.*</NAME>
|
|
||||||
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:id</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:name</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>name</NAME>
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>style</NAME>
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*</NAME>
|
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:layout_width</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:layout_height</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:layout_.*</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:width</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*:height</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*</NAME>
|
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<rule>
|
|
||||||
<match>
|
|
||||||
<AND>
|
|
||||||
<NAME>.*</NAME>
|
|
||||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
|
||||||
</AND>
|
|
||||||
</match>
|
|
||||||
<order>BY_NAME</order>
|
|
||||||
</rule>
|
|
||||||
</section>
|
|
||||||
</rules>
|
|
||||||
</arrangement>
|
|
||||||
</codeStyleSettings>
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
||||||
5
.idea/codeStyles/codeStyleConfig.xml
generated
5
.idea/codeStyles/codeStyleConfig.xml
generated
@@ -1,5 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<state>
|
|
||||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
|
||||||
</state>
|
|
||||||
</component>
|
|
||||||
29
.idea/runConfigurations/All_tests.xml
generated
29
.idea/runConfigurations/All_tests.xml
generated
@@ -1,29 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="briar-android" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method>
|
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
|
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
|
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
|
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
|
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-android" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
23
.idea/runConfigurations/All_tests_in_bramble_api.xml
generated
23
.idea/runConfigurations/All_tests_in_bramble_api.xml
generated
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-api" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-core" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-j2se" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="briar-android" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
23
.idea/runConfigurations/All_tests_in_briar_core.xml
generated
23
.idea/runConfigurations/All_tests_in_briar_core.xml
generated
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="briar-core" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="package" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
23
.idea/runConfigurations/H2_Performance_Test.xml
generated
23
.idea/runConfigurations/H2_Performance_Test.xml
generated
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-core" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.H2DatabasePerformanceTest" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="class" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="bramble-core" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
|
|
||||||
<option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.HyperSqlDatabasePerformanceTest" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="TEST_OBJECT" value="class" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="singleModule" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
17
LICENSE.txt
17
LICENSE.txt
@@ -13,6 +13,23 @@
|
|||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
All files under the directories briar-android/src, briar-api/src,
|
||||||
|
briar-core/src, briar-desktop/src and briar-test/src are licensed
|
||||||
|
under the Apache License, version 2.0 (the "License"); you may not
|
||||||
|
use these files except in compliance with the License.
|
||||||
|
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied. See the License for the specific language governing
|
||||||
|
permissions and limitations under the License.
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
apply plugin: 'com.android.library'
|
|
||||||
apply plugin: 'witness'
|
|
||||||
apply from: 'witness.gradle'
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdkVersion 27
|
|
||||||
buildToolsVersion '27.0.3'
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
minSdkVersion 14
|
|
||||||
targetSdkVersion 26
|
|
||||||
versionCode 10013
|
|
||||||
versionName "1.0.13"
|
|
||||||
consumerProguardFiles 'proguard-rules.txt'
|
|
||||||
|
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
|
||||||
}
|
|
||||||
|
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
tor
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation project(path: ':bramble-core', configuration: 'default')
|
|
||||||
tor 'org.briarproject:tor-android:0.2.9.16@zip'
|
|
||||||
|
|
||||||
annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
|
|
||||||
|
|
||||||
compileOnly 'javax.annotation:jsr250-api:1.0'
|
|
||||||
|
|
||||||
testImplementation project(path: ':bramble-api', configuration: 'testOutput')
|
|
||||||
testImplementation 'junit:junit:4.12'
|
|
||||||
testImplementation "org.jmock:jmock:2.8.2"
|
|
||||||
testImplementation "org.jmock:jmock-junit4:2.8.2"
|
|
||||||
testImplementation "org.jmock:jmock-legacy:2.8.2"
|
|
||||||
testImplementation "org.hamcrest:hamcrest-library:1.3"
|
|
||||||
testImplementation "org.hamcrest:hamcrest-core:1.3"
|
|
||||||
|
|
||||||
androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
|
|
||||||
androidTestImplementation project(path: ':bramble-core', configuration: 'testOutput')
|
|
||||||
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
|
||||||
androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
|
|
||||||
androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
|
|
||||||
}
|
|
||||||
|
|
||||||
project.afterEvaluate {
|
|
||||||
copy {
|
|
||||||
from configurations.tor.collect { zipTree(it) }
|
|
||||||
into 'src/main/res/raw'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(Test) {
|
|
||||||
// Use entropy-gathering device specified on command line, if any
|
|
||||||
systemProperty 'java.security.egd', System.getProperty('java.security.egd')
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
-keep,includedescriptorclasses class org.briarproject.** { *; }
|
|
||||||
|
|
||||||
-keep class org.h2.** { *; }
|
|
||||||
-dontwarn org.h2.**
|
|
||||||
-dontnote org.h2.**
|
|
||||||
|
|
||||||
-keep class dagger.** { *; }
|
|
||||||
-dontwarn dagger.**
|
|
||||||
-dontnote dagger.**
|
|
||||||
|
|
||||||
-keep class net.i2p.crypto.eddsa.** { *; }
|
|
||||||
|
|
||||||
-keep class org.whispersystems.curve25519.** { *; }
|
|
||||||
|
|
||||||
-dontwarn sun.misc.Unsafe
|
|
||||||
-dontnote com.google.common.**
|
|
||||||
|
|
||||||
# UPnP library isn't used
|
|
||||||
-dontwarn org.bitlet.weupnp.**
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.tor;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.support.test.runner.AndroidJUnit4;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.EventBus;
|
|
||||||
import org.briarproject.bramble.api.network.NetworkManager;
|
|
||||||
import org.briarproject.bramble.api.plugin.BackoffFactory;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
|
|
||||||
import org.briarproject.bramble.api.system.Clock;
|
|
||||||
import org.briarproject.bramble.api.system.LocationUtils;
|
|
||||||
import org.briarproject.bramble.api.system.ResourceProvider;
|
|
||||||
import org.briarproject.bramble.test.BrambleAndroidIntegrationTestComponent;
|
|
||||||
import org.briarproject.bramble.test.BrambleTestCase;
|
|
||||||
import org.briarproject.bramble.test.DaggerBrambleAndroidIntegrationTestComponent;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
import javax.net.SocketFactory;
|
|
||||||
|
|
||||||
import static android.support.test.InstrumentationRegistry.getTargetContext;
|
|
||||||
import static java.util.Collections.singletonList;
|
|
||||||
import static java.util.concurrent.TimeUnit.SECONDS;
|
|
||||||
import static org.junit.Assert.assertNotNull;
|
|
||||||
import static org.junit.Assert.assertTrue;
|
|
||||||
import static org.junit.Assert.fail;
|
|
||||||
|
|
||||||
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
|
||||||
public class BridgeTest extends BrambleTestCase {
|
|
||||||
|
|
||||||
private final static long TIMEOUT = SECONDS.toMillis(23);
|
|
||||||
|
|
||||||
private final static Logger LOG =
|
|
||||||
Logger.getLogger(BridgeTest.class.getName());
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
NetworkManager networkManager;
|
|
||||||
@Inject
|
|
||||||
ResourceProvider resourceProvider;
|
|
||||||
@Inject
|
|
||||||
CircumventionProvider circumventionProvider;
|
|
||||||
@Inject
|
|
||||||
EventBus eventBus;
|
|
||||||
@Inject
|
|
||||||
BackoffFactory backoffFactory;
|
|
||||||
@Inject
|
|
||||||
Clock clock;
|
|
||||||
|
|
||||||
private final Context appContext =
|
|
||||||
getTargetContext().getApplicationContext();
|
|
||||||
|
|
||||||
private List<String> bridges;
|
|
||||||
private AndroidTorPluginFactory factory;
|
|
||||||
|
|
||||||
private volatile String currentBridge = null;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
BrambleAndroidIntegrationTestComponent component =
|
|
||||||
DaggerBrambleAndroidIntegrationTestComponent.builder().build();
|
|
||||||
component.inject(this);
|
|
||||||
|
|
||||||
Executor ioExecutor = Executors.newCachedThreadPool();
|
|
||||||
ScheduledExecutorService scheduler = new ScheduledThreadPoolExecutor(1);
|
|
||||||
LocationUtils locationUtils = () -> "US";
|
|
||||||
SocketFactory torSocketFactory = SocketFactory.getDefault();
|
|
||||||
|
|
||||||
bridges = circumventionProvider.getBridges();
|
|
||||||
CircumventionProvider bridgeProvider = new CircumventionProvider() {
|
|
||||||
@Override
|
|
||||||
public boolean isTorProbablyBlocked(String countryCode) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean doBridgesWork(String countryCode) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getBridges() {
|
|
||||||
return singletonList(currentBridge);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
factory = new AndroidTorPluginFactory(ioExecutor, scheduler, appContext,
|
|
||||||
networkManager, locationUtils, eventBus, torSocketFactory,
|
|
||||||
backoffFactory, resourceProvider, bridgeProvider, clock);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testBridges() throws Exception {
|
|
||||||
assertTrue(bridges.size() > 0);
|
|
||||||
|
|
||||||
for (String bridge : bridges) testBridge(bridge);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void testBridge(String bridge) throws Exception {
|
|
||||||
DuplexPlugin duplexPlugin =
|
|
||||||
factory.createPlugin(new TorPluginCallBack());
|
|
||||||
assertNotNull(duplexPlugin);
|
|
||||||
AndroidTorPlugin plugin = (AndroidTorPlugin) duplexPlugin;
|
|
||||||
|
|
||||||
currentBridge = bridge;
|
|
||||||
LOG.warning("Testing " + bridge);
|
|
||||||
try {
|
|
||||||
plugin.start();
|
|
||||||
long start = clock.currentTimeMillis();
|
|
||||||
while (clock.currentTimeMillis() - start < TIMEOUT) {
|
|
||||||
if (plugin.isRunning()) return;
|
|
||||||
clock.sleep(500);
|
|
||||||
}
|
|
||||||
if (!plugin.isRunning()) {
|
|
||||||
fail("Could not connect to Tor within timeout.");
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
plugin.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.tor;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.ContactId;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
|
|
||||||
import org.briarproject.bramble.api.properties.TransportProperties;
|
|
||||||
import org.briarproject.bramble.api.settings.Settings;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public class TorPluginCallBack implements DuplexPluginCallback {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void incomingConnectionCreated(DuplexTransportConnection d) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void outgoingConnectionCreated(ContactId c,
|
|
||||||
DuplexTransportConnection d) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Settings getSettings() {
|
|
||||||
return new Settings();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TransportProperties getLocalProperties() {
|
|
||||||
return new TransportProperties();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeSettings(Settings s) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeLocalProperties(TransportProperties p) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void transportEnabled() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void transportDisabled() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package org.briarproject.bramble.test;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import dagger.Module;
|
|
||||||
import dagger.Provides;
|
|
||||||
|
|
||||||
import static android.support.test.InstrumentationRegistry.getTargetContext;
|
|
||||||
|
|
||||||
@Module
|
|
||||||
class ApplicationModule {
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
Application provideApplication() {
|
|
||||||
return (Application) getTargetContext().getApplicationContext();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package org.briarproject.bramble.test;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.BrambleAndroidModule;
|
|
||||||
import org.briarproject.bramble.event.EventModule;
|
|
||||||
import org.briarproject.bramble.plugin.PluginModule;
|
|
||||||
import org.briarproject.bramble.plugin.tor.BridgeTest;
|
|
||||||
import org.briarproject.bramble.system.SystemModule;
|
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import dagger.Component;
|
|
||||||
|
|
||||||
@Singleton
|
|
||||||
@Component(modules = {
|
|
||||||
BrambleAndroidModule.class,
|
|
||||||
TestLifecycleModule.class,
|
|
||||||
ApplicationModule.class,
|
|
||||||
PluginModule.class, // needed for BackoffFactory
|
|
||||||
EventModule.class,
|
|
||||||
SystemModule.class,
|
|
||||||
})
|
|
||||||
public interface BrambleAndroidIntegrationTestComponent {
|
|
||||||
|
|
||||||
void inject(BridgeTest init);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<manifest
|
|
||||||
package="org.briarproject.bramble"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH"/>
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
|
||||||
|
|
||||||
<application
|
|
||||||
android:allowBackup="false"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:supportsRtl="true">
|
|
||||||
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package org.briarproject.bramble;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.network.AndroidNetworkModule;
|
|
||||||
import org.briarproject.bramble.plugin.tor.CircumventionModule;
|
|
||||||
import org.briarproject.bramble.system.AndroidSystemModule;
|
|
||||||
|
|
||||||
import dagger.Module;
|
|
||||||
|
|
||||||
@Module(includes = {
|
|
||||||
AndroidNetworkModule.class,
|
|
||||||
AndroidSystemModule.class,
|
|
||||||
CircumventionModule.class
|
|
||||||
})
|
|
||||||
public class BrambleAndroidModule {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
package org.briarproject.bramble.account;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.account.AccountManager;
|
|
||||||
import org.briarproject.bramble.api.crypto.CryptoComponent;
|
|
||||||
import org.briarproject.bramble.api.db.DatabaseConfig;
|
|
||||||
import org.briarproject.bramble.api.identity.IdentityManager;
|
|
||||||
import org.briarproject.bramble.util.IoUtils;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
class AndroidAccountManager extends AccountManagerImpl
|
|
||||||
implements AccountManager {
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(AndroidAccountManager.class.getName());
|
|
||||||
|
|
||||||
private static final String PREF_DB_KEY = "key";
|
|
||||||
|
|
||||||
protected final Context appContext;
|
|
||||||
private final SharedPreferences prefs;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
AndroidAccountManager(DatabaseConfig databaseConfig,
|
|
||||||
CryptoComponent crypto, IdentityManager identityManager,
|
|
||||||
SharedPreferences prefs, Application app) {
|
|
||||||
super(databaseConfig, crypto, identityManager);
|
|
||||||
this.prefs = prefs;
|
|
||||||
appContext = app.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Locking: stateChangeLock
|
|
||||||
@Override
|
|
||||||
@Nullable
|
|
||||||
protected String loadEncryptedDatabaseKey() {
|
|
||||||
String key = getDatabaseKeyFromPreferences();
|
|
||||||
if (key == null) key = super.loadEncryptedDatabaseKey();
|
|
||||||
else migrateDatabaseKeyToFile(key);
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Locking: stateChangeLock
|
|
||||||
@Nullable
|
|
||||||
private String getDatabaseKeyFromPreferences() {
|
|
||||||
String key = prefs.getString(PREF_DB_KEY, null);
|
|
||||||
if (key == null) LOG.info("No database key in preferences");
|
|
||||||
else LOG.info("Found database key in preferences");
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Locking: stateChangeLock
|
|
||||||
private void migrateDatabaseKeyToFile(String key) {
|
|
||||||
if (storeEncryptedDatabaseKey(key)) {
|
|
||||||
if (prefs.edit().remove(PREF_DB_KEY).commit())
|
|
||||||
LOG.info("Database key migrated to file");
|
|
||||||
else LOG.warning("Database key not removed from preferences");
|
|
||||||
} else {
|
|
||||||
LOG.warning("Database key not migrated to file");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void deleteAccount() {
|
|
||||||
synchronized (stateChangeLock) {
|
|
||||||
super.deleteAccount();
|
|
||||||
SharedPreferences defaultPrefs = getDefaultSharedPreferences();
|
|
||||||
deleteAppData(prefs, defaultPrefs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Package access for testing
|
|
||||||
SharedPreferences getDefaultSharedPreferences() {
|
|
||||||
return PreferenceManager.getDefaultSharedPreferences(appContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Locking: stateChangeLock
|
|
||||||
private void deleteAppData(SharedPreferences... clear) {
|
|
||||||
// Clear and commit shared preferences
|
|
||||||
for (SharedPreferences prefs : clear) {
|
|
||||||
if (!prefs.edit().clear().commit())
|
|
||||||
LOG.warning("Could not clear shared preferences");
|
|
||||||
}
|
|
||||||
// Delete files, except lib and shared_prefs directories
|
|
||||||
File dataDir = new File(appContext.getApplicationInfo().dataDir);
|
|
||||||
File[] children = dataDir.listFiles();
|
|
||||||
if (children == null) {
|
|
||||||
LOG.warning("Could not list files in app data dir");
|
|
||||||
} else {
|
|
||||||
for (File child : children) {
|
|
||||||
String name = child.getName();
|
|
||||||
if (!name.equals("lib") && !name.equals("shared_prefs")) {
|
|
||||||
IoUtils.deleteFileOrDir(child);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Recreate the cache dir as some OpenGL drivers expect it to exist
|
|
||||||
if (!new File(dataDir, "cache").mkdir())
|
|
||||||
LOG.warning("Could not recreate cache dir");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
package org.briarproject.bramble.network;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.BroadcastReceiver;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.IntentFilter;
|
|
||||||
import android.net.ConnectivityManager;
|
|
||||||
import android.net.NetworkInfo;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.EventBus;
|
|
||||||
import org.briarproject.bramble.api.lifecycle.Service;
|
|
||||||
import org.briarproject.bramble.api.network.NetworkManager;
|
|
||||||
import org.briarproject.bramble.api.network.NetworkStatus;
|
|
||||||
import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.system.Scheduler;
|
|
||||||
|
|
||||||
import java.util.concurrent.Future;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import static android.content.Context.CONNECTIVITY_SERVICE;
|
|
||||||
import static android.content.Intent.ACTION_SCREEN_OFF;
|
|
||||||
import static android.content.Intent.ACTION_SCREEN_ON;
|
|
||||||
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
|
|
||||||
import static android.net.ConnectivityManager.TYPE_WIFI;
|
|
||||||
import static android.os.Build.VERSION.SDK_INT;
|
|
||||||
import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
|
|
||||||
import static java.util.concurrent.TimeUnit.MINUTES;
|
|
||||||
import static java.util.concurrent.TimeUnit.SECONDS;
|
|
||||||
import static java.util.logging.Level.INFO;
|
|
||||||
|
|
||||||
@MethodsNotNullByDefault
|
|
||||||
@ParametersNotNullByDefault
|
|
||||||
class AndroidNetworkManager implements NetworkManager, Service {
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(AndroidNetworkManager.class.getName());
|
|
||||||
|
|
||||||
// See android.net.wifi.WifiManager
|
|
||||||
private static final String WIFI_AP_STATE_CHANGED_ACTION =
|
|
||||||
"android.net.wifi.WIFI_AP_STATE_CHANGED";
|
|
||||||
|
|
||||||
private final ScheduledExecutorService scheduler;
|
|
||||||
private final EventBus eventBus;
|
|
||||||
private final Context appContext;
|
|
||||||
private final AtomicReference<Future<?>> connectivityCheck =
|
|
||||||
new AtomicReference<>();
|
|
||||||
private final AtomicBoolean used = new AtomicBoolean(false);
|
|
||||||
|
|
||||||
private volatile BroadcastReceiver networkStateReceiver = null;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
AndroidNetworkManager(@Scheduler ScheduledExecutorService scheduler,
|
|
||||||
EventBus eventBus, Application app) {
|
|
||||||
this.scheduler = scheduler;
|
|
||||||
this.eventBus = eventBus;
|
|
||||||
this.appContext = app.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startService() {
|
|
||||||
if (used.getAndSet(true)) throw new IllegalStateException();
|
|
||||||
// Register to receive network status events
|
|
||||||
networkStateReceiver = new NetworkStateReceiver();
|
|
||||||
IntentFilter filter = new IntentFilter();
|
|
||||||
filter.addAction(CONNECTIVITY_ACTION);
|
|
||||||
filter.addAction(ACTION_SCREEN_ON);
|
|
||||||
filter.addAction(ACTION_SCREEN_OFF);
|
|
||||||
filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
|
|
||||||
if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
|
|
||||||
appContext.registerReceiver(networkStateReceiver, filter);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void stopService() {
|
|
||||||
if (networkStateReceiver != null)
|
|
||||||
appContext.unregisterReceiver(networkStateReceiver);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public NetworkStatus getNetworkStatus() {
|
|
||||||
ConnectivityManager cm = (ConnectivityManager)
|
|
||||||
appContext.getSystemService(CONNECTIVITY_SERVICE);
|
|
||||||
if (cm == null) throw new AssertionError();
|
|
||||||
NetworkInfo net = cm.getActiveNetworkInfo();
|
|
||||||
boolean connected = net != null && net.isConnected();
|
|
||||||
boolean wifi = connected && net.getType() == TYPE_WIFI;
|
|
||||||
return new NetworkStatus(connected, wifi);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateConnectionStatus() {
|
|
||||||
eventBus.broadcast(new NetworkStatusEvent(getNetworkStatus()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void scheduleConnectionStatusUpdate(int delay, TimeUnit unit) {
|
|
||||||
Future<?> newConnectivityCheck =
|
|
||||||
scheduler.schedule(this::updateConnectionStatus, delay, unit);
|
|
||||||
Future<?> oldConnectivityCheck =
|
|
||||||
connectivityCheck.getAndSet(newConnectivityCheck);
|
|
||||||
if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class NetworkStateReceiver extends BroadcastReceiver {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onReceive(Context ctx, Intent i) {
|
|
||||||
String action = i.getAction();
|
|
||||||
if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
|
|
||||||
updateConnectionStatus();
|
|
||||||
if (isSleepOrDozeEvent(action)) {
|
|
||||||
// Allow time for the network to be enabled or disabled
|
|
||||||
scheduleConnectionStatusUpdate(1, MINUTES);
|
|
||||||
} else if (isApEvent(action)) {
|
|
||||||
// The state change may be broadcast before the AP address is
|
|
||||||
// visible, so delay handling the event
|
|
||||||
scheduleConnectionStatusUpdate(5, SECONDS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isSleepOrDozeEvent(@Nullable String action) {
|
|
||||||
boolean isSleep = ACTION_SCREEN_ON.equals(action) ||
|
|
||||||
ACTION_SCREEN_OFF.equals(action);
|
|
||||||
boolean isDoze = SDK_INT >= 23 &&
|
|
||||||
ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action);
|
|
||||||
return isSleep || isDoze;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isApEvent(@Nullable String action) {
|
|
||||||
return WIFI_AP_STATE_CHANGED_ACTION.equals(action);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package org.briarproject.bramble.network;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
|
|
||||||
import org.briarproject.bramble.api.network.NetworkManager;
|
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import dagger.Module;
|
|
||||||
import dagger.Provides;
|
|
||||||
|
|
||||||
@Module
|
|
||||||
public class AndroidNetworkModule {
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,
|
|
||||||
AndroidNetworkManager networkManager) {
|
|
||||||
lifecycleManager.registerService(networkManager);
|
|
||||||
return networkManager;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,210 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.bluetooth;
|
|
||||||
|
|
||||||
import android.bluetooth.BluetoothAdapter;
|
|
||||||
import android.bluetooth.BluetoothDevice;
|
|
||||||
import android.bluetooth.BluetoothServerSocket;
|
|
||||||
import android.bluetooth.BluetoothSocket;
|
|
||||||
import android.content.BroadcastReceiver;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.IntentFilter;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Backoff;
|
|
||||||
import org.briarproject.bramble.api.plugin.PluginException;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
|
|
||||||
import org.briarproject.bramble.api.system.AndroidExecutor;
|
|
||||||
import org.briarproject.bramble.util.AndroidUtils;
|
|
||||||
|
|
||||||
import java.io.Closeable;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.STATE_OFF;
|
|
||||||
import static android.bluetooth.BluetoothAdapter.STATE_ON;
|
|
||||||
import static java.util.logging.Level.WARNING;
|
|
||||||
import static org.briarproject.bramble.util.LogUtils.logException;
|
|
||||||
|
|
||||||
@MethodsNotNullByDefault
|
|
||||||
@ParametersNotNullByDefault
|
|
||||||
class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(AndroidBluetoothPlugin.class.getName());
|
|
||||||
|
|
||||||
private final AndroidExecutor androidExecutor;
|
|
||||||
private final Context appContext;
|
|
||||||
|
|
||||||
private volatile boolean wasEnabledByUs = false;
|
|
||||||
private volatile BluetoothStateReceiver receiver = null;
|
|
||||||
|
|
||||||
// Non-null if the plugin started successfully
|
|
||||||
private volatile BluetoothAdapter adapter = null;
|
|
||||||
|
|
||||||
AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
|
|
||||||
Executor ioExecutor, AndroidExecutor androidExecutor,
|
|
||||||
Context appContext, SecureRandom secureRandom, Backoff backoff,
|
|
||||||
DuplexPluginCallback callback, int maxLatency) {
|
|
||||||
super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
|
|
||||||
maxLatency);
|
|
||||||
this.androidExecutor = androidExecutor;
|
|
||||||
this.appContext = appContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void start() throws PluginException {
|
|
||||||
super.start();
|
|
||||||
// Listen for changes to the Bluetooth state
|
|
||||||
IntentFilter filter = new IntentFilter();
|
|
||||||
filter.addAction(ACTION_STATE_CHANGED);
|
|
||||||
filter.addAction(ACTION_SCAN_MODE_CHANGED);
|
|
||||||
receiver = new BluetoothStateReceiver();
|
|
||||||
appContext.registerReceiver(receiver, filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void stop() {
|
|
||||||
super.stop();
|
|
||||||
if (receiver != null) appContext.unregisterReceiver(receiver);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void initialiseAdapter() throws IOException {
|
|
||||||
// BluetoothAdapter.getDefaultAdapter() must be called on a thread
|
|
||||||
// with a message queue, so submit it to the AndroidExecutor
|
|
||||||
try {
|
|
||||||
adapter = androidExecutor.runOnBackgroundThread(
|
|
||||||
BluetoothAdapter::getDefaultAdapter).get();
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
throw new IOException(e);
|
|
||||||
}
|
|
||||||
if (adapter == null)
|
|
||||||
throw new IOException("Bluetooth is not supported");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
boolean isAdapterEnabled() {
|
|
||||||
return adapter != null && adapter.isEnabled();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void enableAdapter() {
|
|
||||||
if (adapter != null && !adapter.isEnabled()) {
|
|
||||||
if (adapter.enable()) {
|
|
||||||
LOG.info("Enabling Bluetooth");
|
|
||||||
wasEnabledByUs = true;
|
|
||||||
} else {
|
|
||||||
LOG.info("Could not enable Bluetooth");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void disableAdapterIfEnabledByUs() {
|
|
||||||
if (isAdapterEnabled() && wasEnabledByUs) {
|
|
||||||
if (adapter.disable()) LOG.info("Disabling Bluetooth");
|
|
||||||
else LOG.info("Could not disable Bluetooth");
|
|
||||||
wasEnabledByUs = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void setEnabledByUs() {
|
|
||||||
wasEnabledByUs = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@Nullable
|
|
||||||
String getBluetoothAddress() {
|
|
||||||
String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
|
|
||||||
return address.isEmpty() ? null : address;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
BluetoothServerSocket openServerSocket(String uuid) throws IOException {
|
|
||||||
return adapter.listenUsingInsecureRfcommWithServiceRecord(
|
|
||||||
"RFCOMM", UUID.fromString(uuid));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
void tryToClose(@Nullable BluetoothServerSocket ss) {
|
|
||||||
try {
|
|
||||||
if (ss != null) ss.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
logException(LOG, WARNING, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
|
|
||||||
throws IOException {
|
|
||||||
return wrapSocket(ss.accept());
|
|
||||||
}
|
|
||||||
|
|
||||||
private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
|
|
||||||
return new AndroidBluetoothTransportConnection(this,
|
|
||||||
connectionLimiter, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
boolean isValidAddress(String address) {
|
|
||||||
return BluetoothAdapter.checkBluetoothAddress(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
DuplexTransportConnection connectTo(String address, String uuid)
|
|
||||||
throws IOException {
|
|
||||||
BluetoothDevice d = adapter.getRemoteDevice(address);
|
|
||||||
UUID u = UUID.fromString(uuid);
|
|
||||||
BluetoothSocket s = null;
|
|
||||||
try {
|
|
||||||
s = d.createInsecureRfcommSocketToServiceRecord(u);
|
|
||||||
s.connect();
|
|
||||||
return wrapSocket(s);
|
|
||||||
} catch (IOException e) {
|
|
||||||
tryToClose(s);
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void tryToClose(@Nullable Closeable c) {
|
|
||||||
try {
|
|
||||||
if (c != null) c.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
logException(LOG, WARNING, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class BluetoothStateReceiver extends BroadcastReceiver {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onReceive(Context ctx, Intent intent) {
|
|
||||||
int state = intent.getIntExtra(EXTRA_STATE, 0);
|
|
||||||
if (state == STATE_ON) onAdapterEnabled();
|
|
||||||
else if (state == STATE_OFF) onAdapterDisabled();
|
|
||||||
int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
|
|
||||||
if (scanMode == SCAN_MODE_NONE) {
|
|
||||||
LOG.info("Scan mode: None");
|
|
||||||
} else if (scanMode == SCAN_MODE_CONNECTABLE) {
|
|
||||||
LOG.info("Scan mode: Connectable");
|
|
||||||
} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
|
|
||||||
LOG.info("Scan mode: Discoverable");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.bluetooth;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.EventBus;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Backoff;
|
|
||||||
import org.briarproject.bramble.api.plugin.BackoffFactory;
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
|
|
||||||
import org.briarproject.bramble.api.system.AndroidExecutor;
|
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
|
|
||||||
|
|
||||||
private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
|
|
||||||
private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
|
|
||||||
private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
|
|
||||||
private static final double BACKOFF_BASE = 1.2;
|
|
||||||
|
|
||||||
private final Executor ioExecutor;
|
|
||||||
private final AndroidExecutor androidExecutor;
|
|
||||||
private final Context appContext;
|
|
||||||
private final SecureRandom secureRandom;
|
|
||||||
private final EventBus eventBus;
|
|
||||||
private final BackoffFactory backoffFactory;
|
|
||||||
|
|
||||||
public AndroidBluetoothPluginFactory(Executor ioExecutor,
|
|
||||||
AndroidExecutor androidExecutor, Context appContext,
|
|
||||||
SecureRandom secureRandom, EventBus eventBus,
|
|
||||||
BackoffFactory backoffFactory) {
|
|
||||||
this.ioExecutor = ioExecutor;
|
|
||||||
this.androidExecutor = androidExecutor;
|
|
||||||
this.appContext = appContext;
|
|
||||||
this.secureRandom = secureRandom;
|
|
||||||
this.eventBus = eventBus;
|
|
||||||
this.backoffFactory = backoffFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TransportId getId() {
|
|
||||||
return ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxLatency() {
|
|
||||||
return MAX_LATENCY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
|
|
||||||
BluetoothConnectionLimiter connectionLimiter =
|
|
||||||
new BluetoothConnectionLimiterImpl();
|
|
||||||
Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
|
|
||||||
MAX_POLLING_INTERVAL, BACKOFF_BASE);
|
|
||||||
AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
|
|
||||||
connectionLimiter, ioExecutor, androidExecutor, appContext,
|
|
||||||
secureRandom, backoff, callback, MAX_LATENCY);
|
|
||||||
eventBus.addListener(plugin);
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.bluetooth;
|
|
||||||
|
|
||||||
import android.bluetooth.BluetoothSocket;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Plugin;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
class AndroidBluetoothTransportConnection
|
|
||||||
extends AbstractDuplexTransportConnection {
|
|
||||||
|
|
||||||
private final BluetoothConnectionLimiter connectionManager;
|
|
||||||
private final BluetoothSocket socket;
|
|
||||||
|
|
||||||
AndroidBluetoothTransportConnection(Plugin plugin,
|
|
||||||
BluetoothConnectionLimiter connectionManager,
|
|
||||||
BluetoothSocket socket) {
|
|
||||||
super(plugin);
|
|
||||||
this.connectionManager = connectionManager;
|
|
||||||
this.socket = socket;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected InputStream getInputStream() throws IOException {
|
|
||||||
return socket.getInputStream();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected OutputStream getOutputStream() throws IOException {
|
|
||||||
return socket.getOutputStream();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void closeConnection(boolean exception) throws IOException {
|
|
||||||
try {
|
|
||||||
socket.close();
|
|
||||||
} finally {
|
|
||||||
connectionManager.connectionClosed(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.tcp;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.net.ConnectivityManager;
|
|
||||||
import android.net.Network;
|
|
||||||
import android.net.NetworkInfo;
|
|
||||||
import android.net.wifi.WifiInfo;
|
|
||||||
import android.net.wifi.WifiManager;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.PoliteExecutor;
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.event.EventListener;
|
|
||||||
import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Backoff;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.Socket;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import javax.net.SocketFactory;
|
|
||||||
|
|
||||||
import static android.content.Context.CONNECTIVITY_SERVICE;
|
|
||||||
import static android.content.Context.WIFI_SERVICE;
|
|
||||||
import static android.net.ConnectivityManager.TYPE_WIFI;
|
|
||||||
import static android.os.Build.VERSION.SDK_INT;
|
|
||||||
import static java.util.Collections.emptyList;
|
|
||||||
import static java.util.Collections.singletonList;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener {
|
|
||||||
|
|
||||||
private static final byte[] WIFI_AP_ADDRESS_BYTES =
|
|
||||||
{(byte) 192, (byte) 168, 43, 1};
|
|
||||||
private static final InetAddress WIFI_AP_ADDRESS;
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(AndroidLanTcpPlugin.class.getName());
|
|
||||||
|
|
||||||
static {
|
|
||||||
try {
|
|
||||||
WIFI_AP_ADDRESS = InetAddress.getByAddress(WIFI_AP_ADDRESS_BYTES);
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
// Should only be thrown if the address has an illegal length
|
|
||||||
throw new AssertionError(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Executor connectionStatusExecutor;
|
|
||||||
private final ConnectivityManager connectivityManager;
|
|
||||||
@Nullable
|
|
||||||
private final WifiManager wifiManager;
|
|
||||||
|
|
||||||
private volatile SocketFactory socketFactory;
|
|
||||||
|
|
||||||
AndroidLanTcpPlugin(Executor ioExecutor, Context appContext,
|
|
||||||
Backoff backoff, DuplexPluginCallback callback, int maxLatency,
|
|
||||||
int maxIdleTime) {
|
|
||||||
super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
|
|
||||||
// Don't execute more than one connection status check at a time
|
|
||||||
connectionStatusExecutor =
|
|
||||||
new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1);
|
|
||||||
ConnectivityManager connectivityManager = (ConnectivityManager)
|
|
||||||
appContext.getSystemService(CONNECTIVITY_SERVICE);
|
|
||||||
if (connectivityManager == null) throw new AssertionError();
|
|
||||||
this.connectivityManager = connectivityManager;
|
|
||||||
wifiManager = (WifiManager) appContext.getApplicationContext()
|
|
||||||
.getSystemService(WIFI_SERVICE);
|
|
||||||
socketFactory = SocketFactory.getDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void start() {
|
|
||||||
if (used.getAndSet(true)) throw new IllegalStateException();
|
|
||||||
running = true;
|
|
||||||
updateConnectionStatus();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void stop() {
|
|
||||||
running = false;
|
|
||||||
tryToClose(socket);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Socket createSocket() throws IOException {
|
|
||||||
return socketFactory.createSocket();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Collection<InetAddress> getLocalIpAddresses() {
|
|
||||||
// If the device doesn't have wifi, don't open any sockets
|
|
||||||
if (wifiManager == null) return emptyList();
|
|
||||||
// If we're connected to a wifi network, use that network
|
|
||||||
WifiInfo info = wifiManager.getConnectionInfo();
|
|
||||||
if (info != null && info.getIpAddress() != 0)
|
|
||||||
return singletonList(intToInetAddress(info.getIpAddress()));
|
|
||||||
// If we're running an access point, return its address
|
|
||||||
if (super.getLocalIpAddresses().contains(WIFI_AP_ADDRESS))
|
|
||||||
return singletonList(WIFI_AP_ADDRESS);
|
|
||||||
// No suitable addresses
|
|
||||||
return emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
private InetAddress intToInetAddress(int ip) {
|
|
||||||
byte[] ipBytes = new byte[4];
|
|
||||||
ipBytes[0] = (byte) (ip & 0xFF);
|
|
||||||
ipBytes[1] = (byte) ((ip >> 8) & 0xFF);
|
|
||||||
ipBytes[2] = (byte) ((ip >> 16) & 0xFF);
|
|
||||||
ipBytes[3] = (byte) ((ip >> 24) & 0xFF);
|
|
||||||
try {
|
|
||||||
return InetAddress.getByAddress(ipBytes);
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
// Should only be thrown if address has illegal length
|
|
||||||
throw new AssertionError(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// On API 21 and later, a socket that is not created with the wifi
|
|
||||||
// network's socket factory may try to connect via another network
|
|
||||||
private SocketFactory getSocketFactory() {
|
|
||||||
if (SDK_INT < 21) return SocketFactory.getDefault();
|
|
||||||
for (Network net : connectivityManager.getAllNetworks()) {
|
|
||||||
NetworkInfo info = connectivityManager.getNetworkInfo(net);
|
|
||||||
if (info != null && info.getType() == TYPE_WIFI)
|
|
||||||
return net.getSocketFactory();
|
|
||||||
}
|
|
||||||
LOG.warning("Could not find suitable socket factory");
|
|
||||||
return SocketFactory.getDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void eventOccurred(Event e) {
|
|
||||||
if (e instanceof NetworkStatusEvent) updateConnectionStatus();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateConnectionStatus() {
|
|
||||||
connectionStatusExecutor.execute(() -> {
|
|
||||||
if (!running) return;
|
|
||||||
Collection<InetAddress> addrs = getLocalIpAddresses();
|
|
||||||
if (addrs.contains(WIFI_AP_ADDRESS)) {
|
|
||||||
LOG.info("Providing wifi hotspot");
|
|
||||||
// There's no corresponding Network object and thus no way
|
|
||||||
// to get a suitable socket factory, so we won't be able to
|
|
||||||
// make outgoing connections on API 21+ if another network
|
|
||||||
// has internet access
|
|
||||||
socketFactory = SocketFactory.getDefault();
|
|
||||||
if (socket == null || socket.isClosed()) bind();
|
|
||||||
} else if (addrs.isEmpty()) {
|
|
||||||
LOG.info("Not connected to wifi");
|
|
||||||
socketFactory = SocketFactory.getDefault();
|
|
||||||
tryToClose(socket);
|
|
||||||
} else {
|
|
||||||
LOG.info("Connected to wifi");
|
|
||||||
socketFactory = getSocketFactory();
|
|
||||||
if (socket == null || socket.isClosed()) bind();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.tor;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.pm.PackageInfo;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.content.pm.PackageManager.NameNotFoundException;
|
|
||||||
import android.os.PowerManager;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.network.NetworkManager;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Backoff;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
import org.briarproject.bramble.api.system.Clock;
|
|
||||||
import org.briarproject.bramble.api.system.LocationUtils;
|
|
||||||
import org.briarproject.bramble.api.system.ResourceProvider;
|
|
||||||
import org.briarproject.bramble.util.RenewableWakeLock;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
|
|
||||||
import javax.net.SocketFactory;
|
|
||||||
|
|
||||||
import static android.content.Context.MODE_PRIVATE;
|
|
||||||
import static android.content.Context.POWER_SERVICE;
|
|
||||||
import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
|
|
||||||
import static java.util.concurrent.TimeUnit.MINUTES;
|
|
||||||
|
|
||||||
@MethodsNotNullByDefault
|
|
||||||
@ParametersNotNullByDefault
|
|
||||||
class AndroidTorPlugin extends TorPlugin {
|
|
||||||
|
|
||||||
// This tag may prevent Huawei's power manager from killing us
|
|
||||||
private static final String WAKE_LOCK_TAG = "LocationManagerService";
|
|
||||||
|
|
||||||
private final Context appContext;
|
|
||||||
private final RenewableWakeLock wakeLock;
|
|
||||||
|
|
||||||
AndroidTorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
|
|
||||||
Context appContext, NetworkManager networkManager,
|
|
||||||
LocationUtils locationUtils, SocketFactory torSocketFactory,
|
|
||||||
Clock clock, ResourceProvider resourceProvider,
|
|
||||||
CircumventionProvider circumventionProvider, Backoff backoff,
|
|
||||||
DuplexPluginCallback callback, String architecture, int maxLatency,
|
|
||||||
int maxIdleTime) {
|
|
||||||
super(ioExecutor, networkManager, locationUtils, torSocketFactory,
|
|
||||||
clock, resourceProvider, circumventionProvider, backoff,
|
|
||||||
callback, architecture, maxLatency, maxIdleTime,
|
|
||||||
appContext.getDir("tor", MODE_PRIVATE));
|
|
||||||
this.appContext = appContext;
|
|
||||||
PowerManager pm = (PowerManager)
|
|
||||||
appContext.getSystemService(POWER_SERVICE);
|
|
||||||
assert pm != null;
|
|
||||||
wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
|
|
||||||
WAKE_LOCK_TAG, 1, MINUTES);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int getProcessId() {
|
|
||||||
return android.os.Process.myPid();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected long getLastUpdateTime() {
|
|
||||||
try {
|
|
||||||
PackageManager pm = appContext.getPackageManager();
|
|
||||||
PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
|
|
||||||
return pi.lastUpdateTime;
|
|
||||||
} catch (NameNotFoundException e) {
|
|
||||||
throw new AssertionError(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void enableNetwork(boolean enable) throws IOException {
|
|
||||||
if (!running) return;
|
|
||||||
if (enable) wakeLock.acquire();
|
|
||||||
super.enableNetwork(enable);
|
|
||||||
if (!enable) wakeLock.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void stop() {
|
|
||||||
super.stop();
|
|
||||||
wakeLock.release();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
package org.briarproject.bramble.plugin.tor;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.Build;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.EventBus;
|
|
||||||
import org.briarproject.bramble.api.network.NetworkManager;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.Backoff;
|
|
||||||
import org.briarproject.bramble.api.plugin.BackoffFactory;
|
|
||||||
import org.briarproject.bramble.api.plugin.TorConstants;
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
|
|
||||||
import org.briarproject.bramble.api.system.Clock;
|
|
||||||
import org.briarproject.bramble.api.system.LocationUtils;
|
|
||||||
import org.briarproject.bramble.api.system.ResourceProvider;
|
|
||||||
import org.briarproject.bramble.util.AndroidUtils;
|
|
||||||
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
import javax.net.SocketFactory;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class AndroidTorPluginFactory implements DuplexPluginFactory {
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(AndroidTorPluginFactory.class.getName());
|
|
||||||
|
|
||||||
private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
|
|
||||||
private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
|
|
||||||
private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
|
|
||||||
private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
|
|
||||||
private static final double BACKOFF_BASE = 1.2;
|
|
||||||
|
|
||||||
private final Executor ioExecutor;
|
|
||||||
private final ScheduledExecutorService scheduler;
|
|
||||||
private final Context appContext;
|
|
||||||
private final NetworkManager networkManager;
|
|
||||||
private final LocationUtils locationUtils;
|
|
||||||
private final EventBus eventBus;
|
|
||||||
private final SocketFactory torSocketFactory;
|
|
||||||
private final BackoffFactory backoffFactory;
|
|
||||||
private final ResourceProvider resourceProvider;
|
|
||||||
private final CircumventionProvider circumventionProvider;
|
|
||||||
private final Clock clock;
|
|
||||||
|
|
||||||
public AndroidTorPluginFactory(Executor ioExecutor,
|
|
||||||
ScheduledExecutorService scheduler, Context appContext,
|
|
||||||
NetworkManager networkManager, LocationUtils locationUtils,
|
|
||||||
EventBus eventBus, SocketFactory torSocketFactory,
|
|
||||||
BackoffFactory backoffFactory, ResourceProvider resourceProvider,
|
|
||||||
CircumventionProvider circumventionProvider, Clock clock) {
|
|
||||||
this.ioExecutor = ioExecutor;
|
|
||||||
this.scheduler = scheduler;
|
|
||||||
this.appContext = appContext;
|
|
||||||
this.networkManager = networkManager;
|
|
||||||
this.locationUtils = locationUtils;
|
|
||||||
this.eventBus = eventBus;
|
|
||||||
this.torSocketFactory = torSocketFactory;
|
|
||||||
this.backoffFactory = backoffFactory;
|
|
||||||
this.resourceProvider = resourceProvider;
|
|
||||||
this.circumventionProvider = circumventionProvider;
|
|
||||||
this.clock = clock;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TransportId getId() {
|
|
||||||
return TorConstants.ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxLatency() {
|
|
||||||
return MAX_LATENCY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
|
|
||||||
|
|
||||||
// Check that we have a Tor binary for this architecture
|
|
||||||
String architecture = null;
|
|
||||||
for (String abi : AndroidUtils.getSupportedArchitectures()) {
|
|
||||||
if (abi.startsWith("x86")) {
|
|
||||||
architecture = "x86";
|
|
||||||
break;
|
|
||||||
} else if (abi.startsWith("armeabi")) {
|
|
||||||
architecture = "arm";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (architecture == null) {
|
|
||||||
LOG.info("Tor is not supported on this architecture");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
// Use position-independent executable for SDK >= 16
|
|
||||||
if (Build.VERSION.SDK_INT >= 16) architecture += "_pie";
|
|
||||||
|
|
||||||
Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
|
|
||||||
MAX_POLLING_INTERVAL, BACKOFF_BASE);
|
|
||||||
AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
|
|
||||||
appContext, networkManager, locationUtils, torSocketFactory,
|
|
||||||
clock, resourceProvider, circumventionProvider, backoff,
|
|
||||||
callback, architecture, MAX_LATENCY, MAX_IDLE_TIME);
|
|
||||||
eventBus.addListener(plugin);
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
package org.briarproject.bramble.system;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Looper;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.system.AndroidExecutor;
|
|
||||||
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.Future;
|
|
||||||
import java.util.concurrent.FutureTask;
|
|
||||||
import java.util.concurrent.RejectedExecutionException;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
class AndroidExecutorImpl implements AndroidExecutor {
|
|
||||||
|
|
||||||
private final Handler uiHandler;
|
|
||||||
private final Runnable loop;
|
|
||||||
private final AtomicBoolean started = new AtomicBoolean(false);
|
|
||||||
private final CountDownLatch startLatch = new CountDownLatch(1);
|
|
||||||
|
|
||||||
private volatile Handler backgroundHandler = null;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
AndroidExecutorImpl(Application app) {
|
|
||||||
uiHandler = new Handler(app.getApplicationContext().getMainLooper());
|
|
||||||
loop = () -> {
|
|
||||||
Looper.prepare();
|
|
||||||
backgroundHandler = new Handler();
|
|
||||||
startLatch.countDown();
|
|
||||||
Looper.loop();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private void startIfNecessary() {
|
|
||||||
if (!started.getAndSet(true)) {
|
|
||||||
Thread t = new Thread(loop, "AndroidExecutor");
|
|
||||||
t.setDaemon(true);
|
|
||||||
t.start();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
startLatch.await();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
throw new RejectedExecutionException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <V> Future<V> runOnBackgroundThread(Callable<V> c) {
|
|
||||||
FutureTask<V> f = new FutureTask<>(c);
|
|
||||||
runOnBackgroundThread(f);
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void runOnBackgroundThread(Runnable r) {
|
|
||||||
startIfNecessary();
|
|
||||||
backgroundHandler.post(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <V> Future<V> runOnUiThread(Callable<V> c) {
|
|
||||||
FutureTask<V> f = new FutureTask<>(c);
|
|
||||||
runOnUiThread(f);
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void runOnUiThread(Runnable r) {
|
|
||||||
uiHandler.post(r);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package org.briarproject.bramble.system;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.system.ResourceProvider;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
class AndroidResourceProvider implements ResourceProvider {
|
|
||||||
|
|
||||||
private final Context appContext;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
AndroidResourceProvider(Application app) {
|
|
||||||
this.appContext = app.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InputStream getResourceInputStream(String name) {
|
|
||||||
Resources res = appContext.getResources();
|
|
||||||
int resId = res.getIdentifier(name, "raw", appContext.getPackageName());
|
|
||||||
return res.openRawResource(resId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
package org.briarproject.bramble.system;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.bluetooth.BluetoothAdapter;
|
|
||||||
import android.bluetooth.BluetoothDevice;
|
|
||||||
import android.content.ContentResolver;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.net.wifi.WifiConfiguration;
|
|
||||||
import android.net.wifi.WifiManager;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Parcel;
|
|
||||||
import android.os.StrictMode;
|
|
||||||
import android.provider.Settings;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.DataOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import static android.content.Context.WIFI_SERVICE;
|
|
||||||
import static android.provider.Settings.Secure.ANDROID_ID;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
|
|
||||||
|
|
||||||
private static final int SEED_LENGTH = 32;
|
|
||||||
|
|
||||||
private final Context appContext;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
AndroidSecureRandomProvider(Application app) {
|
|
||||||
appContext = app.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void writeToEntropyPool(DataOutputStream out) throws IOException {
|
|
||||||
super.writeToEntropyPool(out);
|
|
||||||
out.writeInt(android.os.Process.myPid());
|
|
||||||
out.writeInt(android.os.Process.myTid());
|
|
||||||
out.writeInt(android.os.Process.myUid());
|
|
||||||
if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
|
|
||||||
if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
|
|
||||||
ContentResolver contentResolver = appContext.getContentResolver();
|
|
||||||
String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
|
|
||||||
if (id != null) out.writeUTF(id);
|
|
||||||
Parcel parcel = Parcel.obtain();
|
|
||||||
WifiManager wm =
|
|
||||||
(WifiManager) appContext.getSystemService(WIFI_SERVICE);
|
|
||||||
List<WifiConfiguration> configs = wm.getConfiguredNetworks();
|
|
||||||
if (configs != null) {
|
|
||||||
for (WifiConfiguration config : configs)
|
|
||||||
parcel.writeParcelable(config, 0);
|
|
||||||
}
|
|
||||||
BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
|
|
||||||
if (bt != null) {
|
|
||||||
for (BluetoothDevice device : bt.getBondedDevices())
|
|
||||||
parcel.writeParcelable(device, 0);
|
|
||||||
}
|
|
||||||
out.write(parcel.marshall());
|
|
||||||
parcel.recycle();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void writeSeed() {
|
|
||||||
// Silence strict mode
|
|
||||||
StrictMode.ThreadPolicy tp = StrictMode.allowThreadDiskWrites();
|
|
||||||
super.writeSeed();
|
|
||||||
if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
|
|
||||||
applyOpenSslFix();
|
|
||||||
StrictMode.setThreadPolicy(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
|
|
||||||
private void applyOpenSslFix() {
|
|
||||||
byte[] seed = new LinuxSecureRandomSpi().engineGenerateSeed(
|
|
||||||
SEED_LENGTH);
|
|
||||||
try {
|
|
||||||
// Seed the OpenSSL PRNG
|
|
||||||
Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
|
|
||||||
.getMethod("RAND_seed", byte[].class)
|
|
||||||
.invoke(null, seed);
|
|
||||||
// Mix the output of the Linux PRNG into the OpenSSL PRNG
|
|
||||||
int bytesRead = (Integer) Class.forName(
|
|
||||||
"org.apache.harmony.xnet.provider.jsse.NativeCrypto")
|
|
||||||
.getMethod("RAND_load_file", String.class, long.class)
|
|
||||||
.invoke(null, "/dev/urandom", 1024);
|
|
||||||
if (bytesRead != 1024) throw new IOException();
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new SecurityException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
package org.briarproject.bramble.system;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.system.AndroidExecutor;
|
|
||||||
import org.briarproject.bramble.api.system.LocationUtils;
|
|
||||||
import org.briarproject.bramble.api.system.ResourceProvider;
|
|
||||||
import org.briarproject.bramble.api.system.SecureRandomProvider;
|
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
|
||||||
|
|
||||||
import dagger.Module;
|
|
||||||
import dagger.Provides;
|
|
||||||
|
|
||||||
@Module
|
|
||||||
public class AndroidSystemModule {
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
SecureRandomProvider provideSecureRandomProvider(
|
|
||||||
AndroidSecureRandomProvider provider) {
|
|
||||||
return provider;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
|
|
||||||
return locationUtils;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
AndroidExecutor provideAndroidExecutor(
|
|
||||||
AndroidExecutorImpl androidExecutor) {
|
|
||||||
return androidExecutor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Provides
|
|
||||||
@Singleton
|
|
||||||
ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
|
|
||||||
return provider;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
package org.briarproject.bramble.util;
|
|
||||||
|
|
||||||
import android.os.PowerManager;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
|
||||||
import java.util.concurrent.ScheduledFuture;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import javax.annotation.concurrent.ThreadSafe;
|
|
||||||
|
|
||||||
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
|
||||||
import static java.util.logging.Level.INFO;
|
|
||||||
|
|
||||||
@ThreadSafe
|
|
||||||
@NotNullByDefault
|
|
||||||
public class RenewableWakeLock {
|
|
||||||
|
|
||||||
private static final Logger LOG =
|
|
||||||
Logger.getLogger(RenewableWakeLock.class.getName());
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Automatically release the lock this many milliseconds after it's due
|
|
||||||
* to have been replaced and released.
|
|
||||||
*/
|
|
||||||
private static final int SAFETY_MARGIN_MS = 10_000;
|
|
||||||
|
|
||||||
private final PowerManager powerManager;
|
|
||||||
private final ScheduledExecutorService scheduler;
|
|
||||||
private final int levelAndFlags;
|
|
||||||
private final String tag;
|
|
||||||
private final long durationMs;
|
|
||||||
private final Runnable renewTask;
|
|
||||||
|
|
||||||
private final Object lock = new Object();
|
|
||||||
@Nullable
|
|
||||||
private PowerManager.WakeLock wakeLock; // Locking: lock
|
|
||||||
@Nullable
|
|
||||||
private ScheduledFuture future; // Locking: lock
|
|
||||||
|
|
||||||
public RenewableWakeLock(PowerManager powerManager,
|
|
||||||
ScheduledExecutorService scheduler, int levelAndFlags, String tag,
|
|
||||||
long duration, TimeUnit timeUnit) {
|
|
||||||
this.powerManager = powerManager;
|
|
||||||
this.scheduler = scheduler;
|
|
||||||
this.levelAndFlags = levelAndFlags;
|
|
||||||
this.tag = tag;
|
|
||||||
durationMs = MILLISECONDS.convert(duration, timeUnit);
|
|
||||||
renewTask = this::renew;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void acquire() {
|
|
||||||
if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag);
|
|
||||||
synchronized (lock) {
|
|
||||||
if (wakeLock != null) {
|
|
||||||
LOG.info("Already acquired");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
|
|
||||||
wakeLock.setReferenceCounted(false);
|
|
||||||
wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
|
|
||||||
future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void renew() {
|
|
||||||
if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
|
|
||||||
synchronized (lock) {
|
|
||||||
if (wakeLock == null) {
|
|
||||||
LOG.info("Already released");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
PowerManager.WakeLock oldWakeLock = wakeLock;
|
|
||||||
wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
|
|
||||||
wakeLock.setReferenceCounted(false);
|
|
||||||
wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
|
|
||||||
oldWakeLock.release();
|
|
||||||
future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void release() {
|
|
||||||
if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag);
|
|
||||||
synchronized (lock) {
|
|
||||||
if (wakeLock == null) {
|
|
||||||
LOG.info("Already released");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (future == null) throw new AssertionError();
|
|
||||||
future.cancel(false);
|
|
||||||
future = null;
|
|
||||||
wakeLock.release();
|
|
||||||
wakeLock = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
Bridge 131.252.210.150:8081 0E858AC201BF0F3FA3C462F64844CBFFC7297A42
|
|
||||||
Bridge 67.205.189.122:8443 12D64D5D44E20169585E7378580C0D33A872AD98
|
|
||||||
Bridge 45.32.148.146:8443 0CE016FB2462D8BF179AE71F7D702D09DEAC3F1D
|
|
||||||
Bridge 148.251.90.59:7510 019F727CA6DCA6CA5C90B55E477B7D87981E75BC
|
|
||||||
Bridge 195.91.239.8:9001 BA83F62551545655BBEBBFF353A45438D73FD45A
|
|
||||||
Bridge 185.165.184.217:6429 64CC94BEC51254E4409AD059192833854CCB95F0
|
|
||||||
Bridge 45.55.1.74:8443 6F18FEFBB0CAECD5ABA755312FCCB34FC11A7AB8
|
|
||||||
Bridge 95.85.40.163:9001 40057BE9CF76B6C5BDBE713753468BE0A990DE9C
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<string name="app_name">Bramble</string>
|
|
||||||
</resources>
|
|
||||||
@@ -1,162 +0,0 @@
|
|||||||
package org.briarproject.bramble.account;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.content.pm.ApplicationInfo;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.crypto.CryptoComponent;
|
|
||||||
import org.briarproject.bramble.api.db.DatabaseConfig;
|
|
||||||
import org.briarproject.bramble.api.identity.IdentityManager;
|
|
||||||
import org.briarproject.bramble.test.BrambleMockTestCase;
|
|
||||||
import org.jmock.Expectations;
|
|
||||||
import org.jmock.lib.legacy.ClassImposteriser;
|
|
||||||
import org.junit.After;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
import static junit.framework.Assert.assertEquals;
|
|
||||||
import static junit.framework.Assert.assertFalse;
|
|
||||||
import static junit.framework.Assert.assertTrue;
|
|
||||||
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
|
|
||||||
import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
|
|
||||||
import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
|
|
||||||
import static org.briarproject.bramble.util.StringUtils.toHexString;
|
|
||||||
|
|
||||||
public class AndroidAccountManagerTest extends BrambleMockTestCase {
|
|
||||||
|
|
||||||
private final SharedPreferences prefs =
|
|
||||||
context.mock(SharedPreferences.class, "prefs");
|
|
||||||
private final SharedPreferences defaultPrefs =
|
|
||||||
context.mock(SharedPreferences.class, "defaultPrefs");
|
|
||||||
private final DatabaseConfig databaseConfig =
|
|
||||||
context.mock(DatabaseConfig.class);
|
|
||||||
private final CryptoComponent crypto = context.mock(CryptoComponent.class);
|
|
||||||
private final IdentityManager identityManager =
|
|
||||||
context.mock(IdentityManager.class);
|
|
||||||
private final SharedPreferences.Editor
|
|
||||||
editor = context.mock(SharedPreferences.Editor.class);
|
|
||||||
private final Application app;
|
|
||||||
private final ApplicationInfo applicationInfo;
|
|
||||||
|
|
||||||
private final String encryptedKeyHex = toHexString(getRandomBytes(123));
|
|
||||||
private final File testDir = getTestDirectory();
|
|
||||||
private final File keyDir = new File(testDir, "key");
|
|
||||||
private final File keyFile = new File(keyDir, "db.key");
|
|
||||||
private final File keyBackupFile = new File(keyDir, "db.key.bak");
|
|
||||||
private final File dbDir = new File(testDir, "db");
|
|
||||||
|
|
||||||
private AndroidAccountManager accountManager;
|
|
||||||
|
|
||||||
public AndroidAccountManagerTest() {
|
|
||||||
context.setImposteriser(ClassImposteriser.INSTANCE);
|
|
||||||
app = context.mock(Application.class);
|
|
||||||
applicationInfo = new ApplicationInfo();
|
|
||||||
applicationInfo.dataDir = testDir.getAbsolutePath();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
context.checking(new Expectations() {{
|
|
||||||
allowing(databaseConfig).getDatabaseDirectory();
|
|
||||||
will(returnValue(dbDir));
|
|
||||||
allowing(databaseConfig).getDatabaseKeyDirectory();
|
|
||||||
will(returnValue(keyDir));
|
|
||||||
allowing(app).getApplicationContext();
|
|
||||||
will(returnValue(app));
|
|
||||||
}});
|
|
||||||
accountManager = new AndroidAccountManager(databaseConfig, crypto,
|
|
||||||
identityManager, prefs, app) {
|
|
||||||
@Override
|
|
||||||
SharedPreferences getDefaultSharedPreferences() {
|
|
||||||
return defaultPrefs;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDbKeyIsMigratedFromPreferencesToFile() {
|
|
||||||
context.checking(new Expectations() {{
|
|
||||||
oneOf(prefs).getString("key", null);
|
|
||||||
will(returnValue(encryptedKeyHex));
|
|
||||||
oneOf(prefs).edit();
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).remove("key");
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).commit();
|
|
||||||
will(returnValue(true));
|
|
||||||
}});
|
|
||||||
|
|
||||||
assertFalse(keyFile.exists());
|
|
||||||
assertFalse(keyBackupFile.exists());
|
|
||||||
|
|
||||||
assertEquals(encryptedKeyHex,
|
|
||||||
accountManager.loadEncryptedDatabaseKey());
|
|
||||||
|
|
||||||
assertTrue(keyFile.exists());
|
|
||||||
assertTrue(keyBackupFile.exists());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDeleteAccountClearsSharedPrefsAndDeletesFiles()
|
|
||||||
throws Exception {
|
|
||||||
// Directories 'lib' and 'shared_prefs' should be spared
|
|
||||||
File libDir = new File(testDir, "lib");
|
|
||||||
File libFile = new File(libDir, "file");
|
|
||||||
File sharedPrefsDir = new File(testDir, "shared_prefs");
|
|
||||||
File sharedPrefsFile = new File(sharedPrefsDir, "file");
|
|
||||||
// Directory 'cache' should be emptied
|
|
||||||
File cacheDir = new File(testDir, "cache");
|
|
||||||
File cacheFile = new File(cacheDir, "file");
|
|
||||||
// Other directories should be deleted
|
|
||||||
File potatoDir = new File(testDir, ".potato");
|
|
||||||
File potatoFile = new File(potatoDir, "file");
|
|
||||||
|
|
||||||
context.checking(new Expectations() {{
|
|
||||||
oneOf(prefs).edit();
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).clear();
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).commit();
|
|
||||||
will(returnValue(true));
|
|
||||||
oneOf(defaultPrefs).edit();
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).clear();
|
|
||||||
will(returnValue(editor));
|
|
||||||
oneOf(editor).commit();
|
|
||||||
will(returnValue(true));
|
|
||||||
oneOf(app).getApplicationInfo();
|
|
||||||
will(returnValue(applicationInfo));
|
|
||||||
}});
|
|
||||||
|
|
||||||
assertTrue(dbDir.mkdirs());
|
|
||||||
assertTrue(keyDir.mkdirs());
|
|
||||||
assertTrue(libDir.mkdirs());
|
|
||||||
assertTrue(libFile.createNewFile());
|
|
||||||
assertTrue(sharedPrefsDir.mkdirs());
|
|
||||||
assertTrue(sharedPrefsFile.createNewFile());
|
|
||||||
assertTrue(cacheDir.mkdirs());
|
|
||||||
assertTrue(cacheFile.createNewFile());
|
|
||||||
assertTrue(potatoDir.mkdirs());
|
|
||||||
assertTrue(potatoFile.createNewFile());
|
|
||||||
|
|
||||||
accountManager.deleteAccount();
|
|
||||||
|
|
||||||
assertFalse(dbDir.exists());
|
|
||||||
assertFalse(keyDir.exists());
|
|
||||||
assertTrue(libDir.exists());
|
|
||||||
assertTrue(libFile.exists());
|
|
||||||
assertTrue(sharedPrefsDir.exists());
|
|
||||||
assertTrue(sharedPrefsFile.exists());
|
|
||||||
assertTrue(cacheDir.exists());
|
|
||||||
assertFalse(cacheFile.exists());
|
|
||||||
assertFalse(potatoDir.exists());
|
|
||||||
assertFalse(potatoFile.exists());
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void tearDown() {
|
|
||||||
deleteTestDirectory(testDir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
dependencyVerification {
|
|
||||||
verify = [
|
|
||||||
'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
|
|
||||||
'com.android.support.test:monitor:1.0.2:monitor-1.0.2.aar:38ef4fa98a32dc55550ff49bb36a583e178b3a9b830fcb8dcc27bfc4254bc2bc',
|
|
||||||
'com.android.support.test:runner:1.0.2:runner-1.0.2.aar:f04b9ae342975ba1cb3e4a06e13426e3e6b8a73faa45acba604493d83c9a4f00',
|
|
||||||
'com.android.support:support-annotations:27.1.1:support-annotations-27.1.1.jar:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf',
|
|
||||||
'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3',
|
|
||||||
'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3',
|
|
||||||
'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418',
|
|
||||||
'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89',
|
|
||||||
'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b',
|
|
||||||
'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389',
|
|
||||||
'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c',
|
|
||||||
'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72',
|
|
||||||
'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55',
|
|
||||||
'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd',
|
|
||||||
'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec',
|
|
||||||
'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4',
|
|
||||||
'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265',
|
|
||||||
'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0',
|
|
||||||
'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751',
|
|
||||||
'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001',
|
|
||||||
'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d',
|
|
||||||
'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067',
|
|
||||||
'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68',
|
|
||||||
'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df',
|
|
||||||
'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323',
|
|
||||||
'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2',
|
|
||||||
'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855',
|
|
||||||
'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59',
|
|
||||||
'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1',
|
|
||||||
'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b',
|
|
||||||
'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
|
|
||||||
'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
|
|
||||||
'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
|
|
||||||
'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
|
|
||||||
'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
|
|
||||||
'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
|
|
||||||
'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
|
|
||||||
'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e',
|
|
||||||
'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
|
|
||||||
'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
|
|
||||||
'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
|
|
||||||
'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
|
|
||||||
'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
|
|
||||||
'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
|
|
||||||
'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
|
|
||||||
'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
|
|
||||||
'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86',
|
|
||||||
'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f',
|
|
||||||
'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
|
|
||||||
'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
|
|
||||||
'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
|
|
||||||
'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
|
|
||||||
'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
|
|
||||||
'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
|
|
||||||
'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
|
|
||||||
'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
|
|
||||||
'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
|
|
||||||
'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
|
|
||||||
'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
|
|
||||||
'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
|
|
||||||
'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
|
|
||||||
'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
|
|
||||||
'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
|
|
||||||
'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
|
|
||||||
'org.briarproject:tor-android:0.2.9.16:tor-android-0.2.9.16.zip:515e33dda6a30853c885a2de2c79ae1ab9ad8b6db44f5db8890333ec2e24f4ae',
|
|
||||||
'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
|
|
||||||
'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
|
|
||||||
'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
|
|
||||||
'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
|
|
||||||
'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
|
|
||||||
'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
|
|
||||||
'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
|
|
||||||
'org.jetbrains.kotlin:kotlin-reflect:1.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
|
|
||||||
'org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0:kotlin-stdlib-jre7-1.2.0.jar:c7a20fb951d437797afe8980aff6c1e5a03f310c661ba58ba1d4fa90cb0f2926',
|
|
||||||
'org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0:kotlin-stdlib-jre8-1.2.0.jar:633524eee6ef1941f7cb1dab7ee3927b0a221ceee9047aeb5515f4cbb990c82a',
|
|
||||||
'org.jetbrains.kotlin:kotlin-stdlib:1.2.0:kotlin-stdlib-1.2.0.jar:05cfd9f5ac0b41910703a8925f7211a495909b27a2ffdd1c5106f1689aeafcd4',
|
|
||||||
'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
|
|
||||||
'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
|
|
||||||
'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
|
|
||||||
'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
|
|
||||||
'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
|
|
||||||
'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
|
|
||||||
'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
|
|
||||||
'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
|
|
||||||
'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9',
|
|
||||||
'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be',
|
|
||||||
'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10',
|
|
||||||
'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040',
|
|
||||||
'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
|
|
||||||
'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
apply plugin: 'java-library'
|
|
||||||
sourceCompatibility = 1.8
|
|
||||||
targetCompatibility = 1.8
|
|
||||||
|
|
||||||
apply plugin: 'ru.vyarus.animalsniffer'
|
|
||||||
apply plugin: 'witness'
|
|
||||||
apply from: 'witness.gradle'
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation "com.google.dagger:dagger:2.0.2"
|
|
||||||
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
|
||||||
|
|
||||||
testImplementation 'junit:junit:4.12'
|
|
||||||
testImplementation "org.jmock:jmock:2.8.2"
|
|
||||||
testImplementation "org.jmock:jmock-junit4:2.8.2"
|
|
||||||
testImplementation "org.jmock:jmock-legacy:2.8.2"
|
|
||||||
testImplementation "org.hamcrest:hamcrest-library:1.3"
|
|
||||||
testImplementation "org.hamcrest:hamcrest-core:1.3"
|
|
||||||
|
|
||||||
signature 'org.codehaus.mojo.signature:java16:1.1@signature'
|
|
||||||
}
|
|
||||||
|
|
||||||
// needed to make test output available to bramble-core and briar-core
|
|
||||||
configurations {
|
|
||||||
testOutput.extendsFrom(testCompile)
|
|
||||||
}
|
|
||||||
task jarTest(type: Jar, dependsOn: testClasses) {
|
|
||||||
from sourceSets.test.output
|
|
||||||
classifier = 'test'
|
|
||||||
}
|
|
||||||
artifacts {
|
|
||||||
testOutput jarTest
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(Test) {
|
|
||||||
// Use entropy-gathering device specified on command line, if any
|
|
||||||
systemProperty 'java.security.egd', System.getProperty('java.security.egd')
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package org.briarproject.bramble.api;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An exception that indicates an unrecoverable formatting error.
|
|
||||||
*/
|
|
||||||
public class FormatException extends IOException {
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
package org.briarproject.bramble.api;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.NoSuchElementException;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.NotThreadSafe;
|
|
||||||
|
|
||||||
@NotThreadSafe
|
|
||||||
@NotNullByDefault
|
|
||||||
public class Multiset<T> {
|
|
||||||
|
|
||||||
private final Map<T, Integer> map = new HashMap<>();
|
|
||||||
|
|
||||||
private int total = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns how many items the multiset contains in total.
|
|
||||||
*/
|
|
||||||
public int getTotal() {
|
|
||||||
return total;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns how many unique items the multiset contains.
|
|
||||||
*/
|
|
||||||
public int getUnique() {
|
|
||||||
return map.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns how many of the given item the multiset contains.
|
|
||||||
*/
|
|
||||||
public int getCount(T t) {
|
|
||||||
Integer count = map.get(t);
|
|
||||||
return count == null ? 0 : count;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds the given item to the multiset and returns how many of the item
|
|
||||||
* the multiset now contains.
|
|
||||||
*/
|
|
||||||
public int add(T t) {
|
|
||||||
Integer count = map.get(t);
|
|
||||||
if (count == null) count = 0;
|
|
||||||
map.put(t, count + 1);
|
|
||||||
total++;
|
|
||||||
return count + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the given item from the multiset and returns how many of the
|
|
||||||
* item the multiset now contains.
|
|
||||||
* @throws NoSuchElementException if the item is not in the multiset.
|
|
||||||
*/
|
|
||||||
public int remove(T t) {
|
|
||||||
Integer count = map.get(t);
|
|
||||||
if (count == null) throw new NoSuchElementException();
|
|
||||||
if (count == 1) map.remove(t);
|
|
||||||
else map.put(t, count - 1);
|
|
||||||
total--;
|
|
||||||
return count - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes all occurrences of the given item from the multiset.
|
|
||||||
*/
|
|
||||||
public int removeAll(T t) {
|
|
||||||
Integer count = map.remove(t);
|
|
||||||
if (count == null) return 0;
|
|
||||||
total -= count;
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the multiset contains any occurrences of the given item.
|
|
||||||
*/
|
|
||||||
public boolean contains(T t) {
|
|
||||||
return map.containsKey(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes all items from the multiset.
|
|
||||||
*/
|
|
||||||
public void clear() {
|
|
||||||
map.clear();
|
|
||||||
total = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the set of unique items the multiset contains. The returned set
|
|
||||||
* is unmodifiable.
|
|
||||||
*/
|
|
||||||
public Set<T> keySet() {
|
|
||||||
return Collections.unmodifiableSet(map.keySet());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package org.briarproject.bramble.api;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.ThreadSafe;
|
|
||||||
|
|
||||||
@ThreadSafe
|
|
||||||
@NotNullByDefault
|
|
||||||
public abstract class UniqueId extends Bytes {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The length of a unique identifier in bytes.
|
|
||||||
*/
|
|
||||||
public static final int LENGTH = 32;
|
|
||||||
|
|
||||||
protected UniqueId(byte[] id) {
|
|
||||||
super(id);
|
|
||||||
if (id.length != LENGTH) throw new IllegalArgumentException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package org.briarproject.bramble.api;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An exception that indicates an unrecoverable version mismatch.
|
|
||||||
*/
|
|
||||||
public class UnsupportedVersionException extends IOException {
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.account;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.crypto.SecretKey;
|
|
||||||
import org.briarproject.bramble.api.identity.IdentityManager;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface AccountManager {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the manager has the database key. This will be false
|
|
||||||
* before {@link #createAccount(String, String)} or {@link #signIn(String)}
|
|
||||||
* has been called, and true after {@link #createAccount(String, String)}
|
|
||||||
* or {@link #signIn(String)} has returned true, until the process exits.
|
|
||||||
*/
|
|
||||||
boolean hasDatabaseKey();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the database key if the manager has it. This will be null
|
|
||||||
* before {@link #createAccount(String, String)} or {@link #signIn(String)}
|
|
||||||
* has been called, and non-null after
|
|
||||||
* {@link #createAccount(String, String)} or {@link #signIn(String)} has
|
|
||||||
* returned true, until the process exits.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
SecretKey getDatabaseKey();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the encrypted database key can be loaded from disk, and
|
|
||||||
* the database directory exists and is a directory.
|
|
||||||
*/
|
|
||||||
boolean accountExists();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an identity with the given name and registers it with the
|
|
||||||
* {@link IdentityManager}. Creates a database key, encrypts it with the
|
|
||||||
* given password and stores it on disk.
|
|
||||||
* <p/>
|
|
||||||
* This method does not create the database directory, so
|
|
||||||
* {@link #accountExists()} will continue to return false until the
|
|
||||||
* database directory is created.
|
|
||||||
*/
|
|
||||||
boolean createAccount(String name, String password);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes all account state from disk. {@link #accountExists()} will
|
|
||||||
* return false after this method returns.
|
|
||||||
*/
|
|
||||||
void deleteAccount();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the encrypted database key from disk and decrypts it with the
|
|
||||||
* given password.
|
|
||||||
*
|
|
||||||
* @return true if the database key was successfully loaded and decrypted.
|
|
||||||
*/
|
|
||||||
boolean signIn(String password);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the encrypted database key from disk, decrypts it with the old
|
|
||||||
* password, encrypts it with the new password, and stores it on disk,
|
|
||||||
* replacing the old key.
|
|
||||||
*
|
|
||||||
* @return true if the database key was successfully loaded, re-encrypted
|
|
||||||
* and stored.
|
|
||||||
*/
|
|
||||||
boolean changePassword(String oldPassword, String newPassword);
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.client;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.data.BdfDictionary;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.sync.MessageId;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class BdfMessageContext {
|
|
||||||
|
|
||||||
private final BdfDictionary dictionary;
|
|
||||||
private final Collection<MessageId> dependencies;
|
|
||||||
|
|
||||||
public BdfMessageContext(BdfDictionary dictionary,
|
|
||||||
Collection<MessageId> dependencies) {
|
|
||||||
this.dictionary = dictionary;
|
|
||||||
this.dependencies = dependencies;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BdfMessageContext(BdfDictionary dictionary) {
|
|
||||||
this(dictionary, Collections.emptyList());
|
|
||||||
}
|
|
||||||
|
|
||||||
public BdfDictionary getDictionary() {
|
|
||||||
return dictionary;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Collection<MessageId> getDependencies() {
|
|
||||||
return dependencies;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.client;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.FormatException;
|
|
||||||
import org.briarproject.bramble.api.data.BdfList;
|
|
||||||
import org.briarproject.bramble.api.data.MetadataEncoder;
|
|
||||||
import org.briarproject.bramble.api.db.Metadata;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.sync.Group;
|
|
||||||
import org.briarproject.bramble.api.sync.InvalidMessageException;
|
|
||||||
import org.briarproject.bramble.api.sync.Message;
|
|
||||||
import org.briarproject.bramble.api.sync.MessageContext;
|
|
||||||
import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
|
|
||||||
import org.briarproject.bramble.api.system.Clock;
|
|
||||||
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
|
|
||||||
import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public abstract class BdfMessageValidator implements MessageValidator {
|
|
||||||
|
|
||||||
protected static final Logger LOG =
|
|
||||||
Logger.getLogger(BdfMessageValidator.class.getName());
|
|
||||||
|
|
||||||
protected final ClientHelper clientHelper;
|
|
||||||
protected final MetadataEncoder metadataEncoder;
|
|
||||||
protected final Clock clock;
|
|
||||||
|
|
||||||
protected BdfMessageValidator(ClientHelper clientHelper,
|
|
||||||
MetadataEncoder metadataEncoder, Clock clock) {
|
|
||||||
this.clientHelper = clientHelper;
|
|
||||||
this.metadataEncoder = metadataEncoder;
|
|
||||||
this.clock = clock;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract BdfMessageContext validateMessage(Message m, Group g,
|
|
||||||
BdfList body) throws InvalidMessageException, FormatException;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MessageContext validateMessage(Message m, Group g)
|
|
||||||
throws InvalidMessageException {
|
|
||||||
// Reject the message if it's too far in the future
|
|
||||||
long now = clock.currentTimeMillis();
|
|
||||||
if (m.getTimestamp() - now > MAX_CLOCK_DIFFERENCE) {
|
|
||||||
throw new InvalidMessageException(
|
|
||||||
"Timestamp is too far in the future");
|
|
||||||
}
|
|
||||||
byte[] raw = m.getRaw();
|
|
||||||
if (raw.length <= MESSAGE_HEADER_LENGTH) {
|
|
||||||
throw new InvalidMessageException("Message is too short");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
|
|
||||||
raw.length - MESSAGE_HEADER_LENGTH);
|
|
||||||
BdfMessageContext result = validateMessage(m, g, body);
|
|
||||||
Metadata meta = metadataEncoder.encode(result.getDictionary());
|
|
||||||
return new MessageContext(meta, result.getDependencies());
|
|
||||||
} catch (FormatException e) {
|
|
||||||
throw new InvalidMessageException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.client;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.FormatException;
|
|
||||||
import org.briarproject.bramble.api.data.BdfDictionary;
|
|
||||||
import org.briarproject.bramble.api.data.BdfList;
|
|
||||||
import org.briarproject.bramble.api.db.DbException;
|
|
||||||
import org.briarproject.bramble.api.db.Transaction;
|
|
||||||
import org.briarproject.bramble.api.identity.Author;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
import org.briarproject.bramble.api.properties.TransportProperties;
|
|
||||||
import org.briarproject.bramble.api.sync.GroupId;
|
|
||||||
import org.briarproject.bramble.api.sync.Message;
|
|
||||||
import org.briarproject.bramble.api.sync.MessageId;
|
|
||||||
|
|
||||||
import java.security.GeneralSecurityException;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface ClientHelper {
|
|
||||||
|
|
||||||
void addLocalMessage(Message m, BdfDictionary metadata, boolean shared)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
void addLocalMessage(Transaction txn, Message m, BdfDictionary metadata,
|
|
||||||
boolean shared) throws DbException, FormatException;
|
|
||||||
|
|
||||||
Message createMessage(GroupId g, long timestamp, BdfList body)
|
|
||||||
throws FormatException;
|
|
||||||
|
|
||||||
Message createMessageForStoringMetadata(GroupId g);
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
Message getMessage(MessageId m) throws DbException;
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
Message getMessage(Transaction txn, MessageId m) throws DbException;
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
BdfList getMessageAsList(MessageId m) throws DbException, FormatException;
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
|
|
||||||
FormatException;
|
|
||||||
|
|
||||||
BdfDictionary getGroupMetadataAsDictionary(GroupId g) throws DbException,
|
|
||||||
FormatException;
|
|
||||||
|
|
||||||
BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
BdfDictionary getMessageMetadataAsDictionary(MessageId m)
|
|
||||||
throws DbException,
|
|
||||||
FormatException;
|
|
||||||
|
|
||||||
BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(GroupId g)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
|
|
||||||
Transaction txn, GroupId g) throws DbException, FormatException;
|
|
||||||
|
|
||||||
Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(GroupId g,
|
|
||||||
BdfDictionary query) throws DbException, FormatException;
|
|
||||||
|
|
||||||
Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
|
|
||||||
Transaction txn, GroupId g, BdfDictionary query) throws DbException,
|
|
||||||
FormatException;
|
|
||||||
|
|
||||||
void mergeGroupMetadata(GroupId g, BdfDictionary metadata)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
void mergeGroupMetadata(Transaction txn, GroupId g, BdfDictionary metadata)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
void mergeMessageMetadata(MessageId m, BdfDictionary metadata)
|
|
||||||
throws DbException, FormatException;
|
|
||||||
|
|
||||||
void mergeMessageMetadata(Transaction txn, MessageId m,
|
|
||||||
BdfDictionary metadata) throws DbException, FormatException;
|
|
||||||
|
|
||||||
byte[] toByteArray(BdfDictionary dictionary) throws FormatException;
|
|
||||||
|
|
||||||
byte[] toByteArray(BdfList list) throws FormatException;
|
|
||||||
|
|
||||||
BdfDictionary toDictionary(byte[] b, int off, int len)
|
|
||||||
throws FormatException;
|
|
||||||
|
|
||||||
BdfDictionary toDictionary(TransportProperties transportProperties);
|
|
||||||
|
|
||||||
BdfDictionary toDictionary(Map<TransportId, TransportProperties> map);
|
|
||||||
|
|
||||||
BdfList toList(byte[] b, int off, int len) throws FormatException;
|
|
||||||
|
|
||||||
BdfList toList(byte[] b) throws FormatException;
|
|
||||||
|
|
||||||
BdfList toList(Message m) throws FormatException;
|
|
||||||
|
|
||||||
BdfList toList(Author a);
|
|
||||||
|
|
||||||
byte[] sign(String label, BdfList toSign, byte[] privateKey)
|
|
||||||
throws FormatException, GeneralSecurityException;
|
|
||||||
|
|
||||||
void verifySignature(byte[] signature, String label, BdfList signed,
|
|
||||||
byte[] publicKey) throws FormatException, GeneralSecurityException;
|
|
||||||
|
|
||||||
Author parseAndValidateAuthor(BdfList author) throws FormatException;
|
|
||||||
|
|
||||||
TransportProperties parseAndValidateTransportProperties(
|
|
||||||
BdfDictionary properties) throws FormatException;
|
|
||||||
|
|
||||||
Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
|
|
||||||
BdfDictionary properties) throws FormatException;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.client;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.Contact;
|
|
||||||
import org.briarproject.bramble.api.identity.AuthorId;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.sync.ClientId;
|
|
||||||
import org.briarproject.bramble.api.sync.Group;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface ContactGroupFactory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a group that is not shared with any contacts.
|
|
||||||
*/
|
|
||||||
Group createLocalGroup(ClientId clientId, int majorVersion);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a group for the given client to share with the given contact.
|
|
||||||
*/
|
|
||||||
Group createContactGroup(ClientId clientId, int majorVersion,
|
|
||||||
Contact contact);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a group for the given client to share between the given authors
|
|
||||||
* identified by their AuthorIds.
|
|
||||||
*/
|
|
||||||
Group createContactGroup(ClientId clientId, int majorVersion,
|
|
||||||
AuthorId authorId1, AuthorId authorId2);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.identity.Author;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface ContactExchangeListener {
|
|
||||||
|
|
||||||
void contactExchangeSucceeded(Author remoteAuthor);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The exchange failed because the contact already exists.
|
|
||||||
*/
|
|
||||||
void duplicateContact(Author remoteAuthor);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A general failure.
|
|
||||||
*/
|
|
||||||
void contactExchangeFailed();
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.crypto.SecretKey;
|
|
||||||
import org.briarproject.bramble.api.identity.LocalAuthor;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A task for conducting a contact information exchange with a remote peer.
|
|
||||||
*/
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface ContactExchangeTask {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The current version of the contact exchange protocol.
|
|
||||||
*/
|
|
||||||
byte PROTOCOL_VERSION = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving Alice's header key from the master secret.
|
|
||||||
*/
|
|
||||||
String ALICE_KEY_LABEL =
|
|
||||||
"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving Bob's header key from the master secret.
|
|
||||||
*/
|
|
||||||
String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving Alice's key binding nonce from the master secret.
|
|
||||||
*/
|
|
||||||
String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving Bob's key binding nonce from the master secret.
|
|
||||||
*/
|
|
||||||
String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Exchanges contact information with a remote peer.
|
|
||||||
*/
|
|
||||||
void startExchange(ContactExchangeListener listener,
|
|
||||||
LocalAuthor localAuthor, SecretKey masterSecret,
|
|
||||||
DuplexTransportConnection conn, TransportId transportId,
|
|
||||||
boolean alice);
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.crypto.SecretKey;
|
|
||||||
import org.briarproject.bramble.api.db.DbException;
|
|
||||||
import org.briarproject.bramble.api.db.Transaction;
|
|
||||||
import org.briarproject.bramble.api.identity.Author;
|
|
||||||
import org.briarproject.bramble.api.identity.AuthorId;
|
|
||||||
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface ContactManager {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a hook to be called whenever a contact is added or removed.
|
|
||||||
* This method should be called before
|
|
||||||
* {@link LifecycleManager#startServices(SecretKey)}.
|
|
||||||
*/
|
|
||||||
void registerContactHook(ContactHook hook);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores a contact associated with the given local and remote pseudonyms,
|
|
||||||
* derives and stores transport keys for each transport, and returns an ID
|
|
||||||
* for the contact.
|
|
||||||
*
|
|
||||||
* @param alice true if the local party is Alice
|
|
||||||
*/
|
|
||||||
ContactId addContact(Transaction txn, Author remote, AuthorId local,
|
|
||||||
SecretKey master, long timestamp, boolean alice, boolean verified,
|
|
||||||
boolean active) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores a contact associated with the given local and remote pseudonyms
|
|
||||||
* and returns an ID for the contact.
|
|
||||||
*/
|
|
||||||
ContactId addContact(Transaction txn, Author remote, AuthorId local,
|
|
||||||
boolean verified, boolean active) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores a contact associated with the given local and remote pseudonyms,
|
|
||||||
* derives and stores transport keys for each transport, and returns an ID
|
|
||||||
* for the contact.
|
|
||||||
*
|
|
||||||
* @param alice true if the local party is Alice
|
|
||||||
*/
|
|
||||||
ContactId addContact(Author remote, AuthorId local, SecretKey master,
|
|
||||||
long timestamp, boolean alice, boolean verified, boolean active)
|
|
||||||
throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the contact with the given ID.
|
|
||||||
*/
|
|
||||||
Contact getContact(ContactId c) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the contact with the given remoteAuthorId
|
|
||||||
* that was added by the LocalAuthor with the given localAuthorId
|
|
||||||
*
|
|
||||||
* @throws org.briarproject.bramble.api.db.NoSuchContactException
|
|
||||||
*/
|
|
||||||
Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
|
|
||||||
throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the contact with the given remoteAuthorId
|
|
||||||
* that was added by the LocalAuthor with the given localAuthorId
|
|
||||||
*
|
|
||||||
* @throws org.briarproject.bramble.api.db.NoSuchContactException
|
|
||||||
*/
|
|
||||||
Contact getContact(Transaction txn, AuthorId remoteAuthorId,
|
|
||||||
AuthorId localAuthorId) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns all active contacts.
|
|
||||||
*/
|
|
||||||
Collection<Contact> getActiveContacts() throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes a contact and all associated state.
|
|
||||||
*/
|
|
||||||
void removeContact(ContactId c) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes a contact and all associated state.
|
|
||||||
*/
|
|
||||||
void removeContact(Transaction txn, ContactId c) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Marks a contact as active or inactive.
|
|
||||||
*/
|
|
||||||
void setContactActive(Transaction txn, ContactId c, boolean active)
|
|
||||||
throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return true if a contact with this name and public key already exists
|
|
||||||
*/
|
|
||||||
boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
|
|
||||||
AuthorId localAuthorId) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return true if a contact with this name and public key already exists
|
|
||||||
*/
|
|
||||||
boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
|
|
||||||
throws DbException;
|
|
||||||
|
|
||||||
interface ContactHook {
|
|
||||||
|
|
||||||
void addingContact(Transaction txn, Contact c) throws DbException;
|
|
||||||
|
|
||||||
void removingContact(Transaction txn, Contact c) throws DbException;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Record types for the contact exchange protocol.
|
|
||||||
*/
|
|
||||||
public interface RecordTypes {
|
|
||||||
|
|
||||||
byte CONTACT_INFO = 0;
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.ContactId;
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a contact is added.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class ContactAddedEvent extends Event {
|
|
||||||
|
|
||||||
private final ContactId contactId;
|
|
||||||
private final boolean active;
|
|
||||||
|
|
||||||
public ContactAddedEvent(ContactId contactId, boolean active) {
|
|
||||||
this.contactId = contactId;
|
|
||||||
this.active = active;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ContactId getContactId() {
|
|
||||||
return contactId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isActive() {
|
|
||||||
return active;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.ContactId;
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a contact is removed.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class ContactRemovedEvent extends Event {
|
|
||||||
|
|
||||||
private final ContactId contactId;
|
|
||||||
|
|
||||||
public ContactRemovedEvent(ContactId contactId) {
|
|
||||||
this.contactId = contactId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ContactId getContactId() {
|
|
||||||
return contactId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.ContactId;
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a contact is marked active or inactive.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class ContactStatusChangedEvent extends Event {
|
|
||||||
|
|
||||||
private final ContactId contactId;
|
|
||||||
private final boolean active;
|
|
||||||
|
|
||||||
public ContactStatusChangedEvent(ContactId contactId, boolean active) {
|
|
||||||
this.contactId = contactId;
|
|
||||||
this.active = active;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ContactId getContactId() {
|
|
||||||
return contactId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isActive() {
|
|
||||||
return active;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.contact.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.contact.ContactId;
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a contact is verified.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class ContactVerifiedEvent extends Event {
|
|
||||||
|
|
||||||
private final ContactId contactId;
|
|
||||||
|
|
||||||
public ContactVerifiedEvent(ContactId contactId) {
|
|
||||||
this.contactId = contactId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ContactId getContactId() {
|
|
||||||
return contactId;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.security.GeneralSecurityException;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface CryptoComponent {
|
|
||||||
|
|
||||||
SecretKey generateSecretKey();
|
|
||||||
|
|
||||||
SecureRandom getSecureRandom();
|
|
||||||
|
|
||||||
KeyPair generateAgreementKeyPair();
|
|
||||||
|
|
||||||
KeyParser getAgreementKeyParser();
|
|
||||||
|
|
||||||
KeyPair generateSignatureKeyPair();
|
|
||||||
|
|
||||||
KeyParser getSignatureKeyParser();
|
|
||||||
|
|
||||||
KeyParser getMessageKeyParser();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derives another secret key from the given secret key.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of the derived
|
|
||||||
* key, to prevent it from being repurposed or colliding with a key derived
|
|
||||||
* for another purpose
|
|
||||||
*/
|
|
||||||
SecretKey deriveKey(String label, SecretKey k, byte[]... inputs);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derives a common shared secret from two public keys and one of the
|
|
||||||
* corresponding private keys.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this shared
|
|
||||||
* secret, to prevent it from being repurposed or colliding with a shared
|
|
||||||
* secret derived for another purpose
|
|
||||||
* @param theirPublicKey the public key of the remote party
|
|
||||||
* @param ourKeyPair the key pair of the local party
|
|
||||||
* @return the shared secret
|
|
||||||
*/
|
|
||||||
SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
|
|
||||||
KeyPair ourKeyPair, byte[]... inputs)
|
|
||||||
throws GeneralSecurityException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Signs the given byte[] with the given private key.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this
|
|
||||||
* signature, to prevent it from being repurposed or colliding with a
|
|
||||||
* signature created for another purpose
|
|
||||||
*/
|
|
||||||
byte[] sign(String label, byte[] toSign, byte[] privateKey)
|
|
||||||
throws GeneralSecurityException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Verifies that the given signature is valid for the signed data
|
|
||||||
* and the given public key.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this
|
|
||||||
* signature, to prevent it from being repurposed or colliding with a
|
|
||||||
* signature created for another purpose
|
|
||||||
* @return true if the signature was valid, false otherwise.
|
|
||||||
*/
|
|
||||||
boolean verifySignature(byte[] signature, String label, byte[] signed,
|
|
||||||
byte[] publicKey) throws GeneralSecurityException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the hash of the given inputs. The inputs are unambiguously
|
|
||||||
* combined by prefixing each input with its length.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this hash, to
|
|
||||||
* prevent it from being repurposed or colliding with a hash created for
|
|
||||||
* another purpose
|
|
||||||
*/
|
|
||||||
byte[] hash(String label, byte[]... inputs);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a message authentication code with the given key over the
|
|
||||||
* given inputs. The inputs are unambiguously combined by prefixing each
|
|
||||||
* input with its length.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this MAC, to
|
|
||||||
* prevent it from being repurposed or colliding with a MAC created for
|
|
||||||
* another purpose
|
|
||||||
*/
|
|
||||||
byte[] mac(String label, SecretKey macKey, byte[]... inputs);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Verifies that the given message authentication code is valid for the
|
|
||||||
* given secret key and inputs.
|
|
||||||
*
|
|
||||||
* @param label a namespaced label indicating the purpose of this MAC, to
|
|
||||||
* prevent it from being repurposed or colliding with a MAC created for
|
|
||||||
* another purpose
|
|
||||||
* @return true if the MAC was valid, false otherwise.
|
|
||||||
*/
|
|
||||||
boolean verifyMac(byte[] mac, String label, SecretKey macKey,
|
|
||||||
byte[]... inputs);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encrypts and authenticates the given plaintext so it can be written to
|
|
||||||
* storage. The encryption and authentication keys are derived from the
|
|
||||||
* given password. The ciphertext will be decryptable using the same
|
|
||||||
* password after the app restarts.
|
|
||||||
*/
|
|
||||||
byte[] encryptWithPassword(byte[] plaintext, String password);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decrypts and authenticates the given ciphertext that has been read from
|
|
||||||
* storage. The encryption and authentication keys are derived from the
|
|
||||||
* given password. Returns null if the ciphertext cannot be decrypted and
|
|
||||||
* authenticated (for example, if the password is wrong).
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
byte[] decryptWithPassword(byte[] ciphertext, String password);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encrypts the given plaintext to the given public key.
|
|
||||||
*/
|
|
||||||
byte[] encryptToKey(PublicKey publicKey, byte[] plaintext);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encodes the given data as a hex string divided into lines of the given
|
|
||||||
* length. The line terminator is CRLF.
|
|
||||||
*/
|
|
||||||
String asciiArmour(byte[] b, int lineLength);
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
public interface CryptoConstants {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of an agreement public key in bytes.
|
|
||||||
*/
|
|
||||||
int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of a signature public key in bytes.
|
|
||||||
*/
|
|
||||||
int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of a signature in bytes.
|
|
||||||
*/
|
|
||||||
int MAX_SIGNATURE_BYTES = 64;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The length of a MAC in bytes.
|
|
||||||
*/
|
|
||||||
int MAC_BYTES = SecretKey.LENGTH;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.Target;
|
|
||||||
|
|
||||||
import javax.inject.Qualifier;
|
|
||||||
|
|
||||||
import static java.lang.annotation.ElementType.FIELD;
|
|
||||||
import static java.lang.annotation.ElementType.METHOD;
|
|
||||||
import static java.lang.annotation.ElementType.PARAMETER;
|
|
||||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Annotation for injecting the executor for long-running crypto tasks. Also
|
|
||||||
* used for annotating methods that should run on the crypto executor.
|
|
||||||
* <p>
|
|
||||||
* The contract of this executor is that tasks may be run concurrently, and
|
|
||||||
* submitting a task will never block. Tasks must not run indefinitely. Tasks
|
|
||||||
* submitted during shutdown are discarded.
|
|
||||||
*/
|
|
||||||
@Qualifier
|
|
||||||
@Target({FIELD, METHOD, PARAMETER})
|
|
||||||
@Retention(RUNTIME)
|
|
||||||
public @interface CryptoExecutor {
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Crypto operations for the key agreement protocol - see
|
|
||||||
* https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
|
|
||||||
*/
|
|
||||||
public interface KeyAgreementCrypto {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hash label for public key commitment.
|
|
||||||
*/
|
|
||||||
String COMMIT_LABEL = "org.briarproject.bramble.keyagreement/COMMIT";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Key derivation label for confirmation record.
|
|
||||||
*/
|
|
||||||
String CONFIRMATION_KEY_LABEL =
|
|
||||||
"org.briarproject.bramble.keyagreement/CONFIRMATION_KEY";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MAC label for confirmation record.
|
|
||||||
*/
|
|
||||||
String CONFIRMATION_MAC_LABEL =
|
|
||||||
"org.briarproject.bramble.keyagreement/CONFIRMATION_MAC";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derives a commitment to the provided public key.
|
|
||||||
*
|
|
||||||
* @param publicKey the public key
|
|
||||||
* @return the commitment to the provided public key.
|
|
||||||
*/
|
|
||||||
byte[] deriveKeyCommitment(PublicKey publicKey);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derives the content of a confirmation record.
|
|
||||||
*
|
|
||||||
* @param sharedSecret the common shared secret
|
|
||||||
* @param theirPayload the key exchange payload of the remote party
|
|
||||||
* @param ourPayload the key exchange payload of the local party
|
|
||||||
* @param theirPublicKey the ephemeral public key of the remote party
|
|
||||||
* @param ourKeyPair our ephemeral key pair of the local party
|
|
||||||
* @param alice true if the local party is Alice
|
|
||||||
* @param aliceRecord true if the confirmation record is for use by Alice
|
|
||||||
* @return the confirmation record
|
|
||||||
*/
|
|
||||||
byte[] deriveConfirmationRecord(SecretKey sharedSecret,
|
|
||||||
byte[] theirPayload, byte[] ourPayload,
|
|
||||||
PublicKey theirPublicKey, KeyPair ourKeyPair,
|
|
||||||
boolean alice, boolean aliceRecord);
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The private half of a public/private {@link KeyPair}.
|
|
||||||
*/
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface PrivateKey {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the encoded representation of this key.
|
|
||||||
*/
|
|
||||||
byte[] getEncoded();
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The public half of a public/private {@link KeyPair}.
|
|
||||||
*/
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface PublicKey {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the encoded representation of this key.
|
|
||||||
*/
|
|
||||||
byte[] getEncoded();
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.transport.StreamContext;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface StreamDecrypterFactory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a {@link StreamDecrypter} for decrypting a transport stream.
|
|
||||||
*/
|
|
||||||
StreamDecrypter createStreamDecrypter(InputStream in, StreamContext ctx);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a {@link StreamDecrypter} for decrypting a contact exchange
|
|
||||||
* stream.
|
|
||||||
*/
|
|
||||||
StreamDecrypter createContactExchangeStreamDecrypter(InputStream in,
|
|
||||||
SecretKey headerKey);
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface StreamEncrypter {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encrypts the given frame and writes it to the stream.
|
|
||||||
*/
|
|
||||||
void writeFrame(byte[] payload, int payloadLength, int paddingLength,
|
|
||||||
boolean finalFrame) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Flushes the stream.
|
|
||||||
*/
|
|
||||||
void flush() throws IOException;
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.transport.StreamContext;
|
|
||||||
|
|
||||||
import java.io.OutputStream;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface StreamEncrypterFactory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a {@link StreamEncrypter} for encrypting a transport stream.
|
|
||||||
*/
|
|
||||||
StreamEncrypter createStreamEncrypter(OutputStream out, StreamContext ctx);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a {@link StreamEncrypter} for encrypting a contact exchange
|
|
||||||
* stream.
|
|
||||||
*/
|
|
||||||
StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
|
|
||||||
SecretKey headerKey);
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.crypto;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
import org.briarproject.bramble.api.transport.TransportKeys;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Crypto operations for the transport security protocol - see
|
|
||||||
* https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
|
|
||||||
*/
|
|
||||||
public interface TransportCrypto {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Derives initial transport keys for the given transport in the given
|
|
||||||
* rotation period from the given master secret.
|
|
||||||
*
|
|
||||||
* @param alice whether the keys are for use by Alice or Bob.
|
|
||||||
* @param active whether the keys are usable for outgoing streams.
|
|
||||||
*/
|
|
||||||
TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
|
|
||||||
long rotationPeriod, boolean alice, boolean active);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rotates the given transport keys to the given rotation period. If the
|
|
||||||
* keys are for the given period or any later period they are not rotated.
|
|
||||||
*/
|
|
||||||
TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encodes the pseudo-random tag that is used to recognise a stream.
|
|
||||||
*/
|
|
||||||
void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
|
|
||||||
long streamNumber);
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.data;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class BdfEntry implements Entry<String, Object>, Comparable<BdfEntry> {
|
|
||||||
|
|
||||||
private final String key;
|
|
||||||
private final Object value;
|
|
||||||
|
|
||||||
public BdfEntry(String key, Object value) {
|
|
||||||
this.key = key;
|
|
||||||
this.value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getKey() {
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getValue() {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object setValue(Object value) {
|
|
||||||
throw new UnsupportedOperationException();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int compareTo(BdfEntry e) {
|
|
||||||
if (e == this) return 0;
|
|
||||||
return key.compareTo(e.key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.data;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface BdfReaderFactory {
|
|
||||||
|
|
||||||
BdfReader createReader(InputStream in);
|
|
||||||
|
|
||||||
BdfReader createReader(InputStream in, int nestedLimit,
|
|
||||||
int maxBufferSize);
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.data;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.OutputStream;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface BdfWriterFactory {
|
|
||||||
|
|
||||||
BdfWriter createWriter(OutputStream out);
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.data;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.FormatException;
|
|
||||||
import org.briarproject.bramble.api.db.Metadata;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface MetadataEncoder {
|
|
||||||
|
|
||||||
Metadata encode(BdfDictionary d) throws FormatException;
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.data;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.FormatException;
|
|
||||||
import org.briarproject.bramble.api.db.Metadata;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface MetadataParser {
|
|
||||||
|
|
||||||
BdfDictionary parse(Metadata m) throws FormatException;
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thrown when the database uses a newer schema than the current code.
|
|
||||||
*/
|
|
||||||
public class DataTooNewException extends DbException {
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thrown when the database uses an older schema than the current code and
|
|
||||||
* cannot be migrated.
|
|
||||||
*/
|
|
||||||
public class DataTooOldException extends DbException {
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface DatabaseConfig {
|
|
||||||
|
|
||||||
File getDatabaseDirectory();
|
|
||||||
|
|
||||||
File getDatabaseKeyDirectory();
|
|
||||||
|
|
||||||
long getMaxSize();
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.Target;
|
|
||||||
|
|
||||||
import javax.inject.Qualifier;
|
|
||||||
|
|
||||||
import static java.lang.annotation.ElementType.FIELD;
|
|
||||||
import static java.lang.annotation.ElementType.METHOD;
|
|
||||||
import static java.lang.annotation.ElementType.PARAMETER;
|
|
||||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Annotation for injecting the executor for database tasks. Also used for
|
|
||||||
* annotating methods that should run on the database executor.
|
|
||||||
* <p>
|
|
||||||
* The contract of this executor is that tasks are run in the order they're
|
|
||||||
* submitted, tasks are not run concurrently, and submitting a task will never
|
|
||||||
* block. Tasks must not run indefinitely. Tasks submitted during shutdown are
|
|
||||||
* discarded.
|
|
||||||
*/
|
|
||||||
@Qualifier
|
|
||||||
@Target({FIELD, METHOD, PARAMETER})
|
|
||||||
@Retention(RUNTIME)
|
|
||||||
public @interface DatabaseExecutor {
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thrown when a database operation is attempted and the database is closed.
|
|
||||||
*/
|
|
||||||
public class DbClosedException extends DbException {
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
public class DbException extends Exception {
|
|
||||||
|
|
||||||
public DbException() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public DbException(Throwable t) {
|
|
||||||
super(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
import java.util.TreeMap;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.NotThreadSafe;
|
|
||||||
|
|
||||||
@NotThreadSafe
|
|
||||||
public class Metadata extends TreeMap<String, byte[]> {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Special value to indicate that a key is being removed.
|
|
||||||
*/
|
|
||||||
public static final byte[] REMOVE = new byte[0];
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.db;
|
|
||||||
|
|
||||||
public interface MigrationListener {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is called when a migration is started while opening the database.
|
|
||||||
* It will be called once for each migration being applied.
|
|
||||||
*/
|
|
||||||
void onMigrationRun();
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.event;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An abstract superclass for events.
|
|
||||||
*/
|
|
||||||
public abstract class Event {
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface EventBus {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a listener to be notified when events occur.
|
|
||||||
*/
|
|
||||||
void addListener(EventListener l);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes a listener.
|
|
||||||
*/
|
|
||||||
void removeListener(EventListener l);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Notifies all listeners of an event.
|
|
||||||
*/
|
|
||||||
void broadcast(Event e);
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An interface for receiving notifications when events occur.
|
|
||||||
*/
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface EventListener {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when an event is broadcast. Implementations of this method must
|
|
||||||
* not block.
|
|
||||||
*/
|
|
||||||
void eventOccurred(Event e);
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.util.StringUtils;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
|
|
||||||
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A pseudonym for a user.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class Author {
|
|
||||||
|
|
||||||
public enum Status {
|
|
||||||
NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The current version of the author structure.
|
|
||||||
*/
|
|
||||||
public static final int FORMAT_VERSION = 1;
|
|
||||||
|
|
||||||
private final AuthorId id;
|
|
||||||
private final int formatVersion;
|
|
||||||
private final String name;
|
|
||||||
private final byte[] publicKey;
|
|
||||||
|
|
||||||
public Author(AuthorId id, int formatVersion, String name,
|
|
||||||
byte[] publicKey) {
|
|
||||||
int nameLength = StringUtils.toUtf8(name).length;
|
|
||||||
if (nameLength == 0 || nameLength > MAX_AUTHOR_NAME_LENGTH)
|
|
||||||
throw new IllegalArgumentException();
|
|
||||||
if (publicKey.length == 0 || publicKey.length > MAX_PUBLIC_KEY_LENGTH)
|
|
||||||
throw new IllegalArgumentException();
|
|
||||||
this.id = id;
|
|
||||||
this.formatVersion = formatVersion;
|
|
||||||
this.name = name;
|
|
||||||
this.publicKey = publicKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the author's unique identifier.
|
|
||||||
*/
|
|
||||||
public AuthorId getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the version of the author structure used to create the author.
|
|
||||||
*/
|
|
||||||
public int getFormatVersion() {
|
|
||||||
return formatVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the author's name.
|
|
||||||
*/
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the public key used to verify the pseudonym's signatures.
|
|
||||||
*/
|
|
||||||
public byte[] getPublicKey() {
|
|
||||||
return publicKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return id.hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o) {
|
|
||||||
return o instanceof Author && id.equals(((Author) o).id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity;
|
|
||||||
|
|
||||||
import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_BYTES;
|
|
||||||
import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
|
|
||||||
|
|
||||||
public interface AuthorConstants {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of an author's name in UTF-8 bytes.
|
|
||||||
*/
|
|
||||||
int MAX_AUTHOR_NAME_LENGTH = 50;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of a public key in bytes. This applies to the
|
|
||||||
* signature algorithm used by the current {@link Author format version}.
|
|
||||||
*/
|
|
||||||
int MAX_PUBLIC_KEY_LENGTH = MAX_SIGNATURE_PUBLIC_KEY_BYTES;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The maximum length of a signature in bytes. This applies to the
|
|
||||||
* signature algorithm used by the current {@link Author format version}.
|
|
||||||
*/
|
|
||||||
int MAX_SIGNATURE_LENGTH = MAX_SIGNATURE_BYTES;
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface AuthorFactory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an author with the current format version and the given name and
|
|
||||||
* public key.
|
|
||||||
*/
|
|
||||||
Author createAuthor(String name, byte[] publicKey);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an author with the given format version, name and public key.
|
|
||||||
*/
|
|
||||||
Author createAuthor(int formatVersion, String name, byte[] publicKey);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a local author with the current format version and the given
|
|
||||||
* name and keys.
|
|
||||||
*/
|
|
||||||
LocalAuthor createLocalAuthor(String name, byte[] publicKey,
|
|
||||||
byte[] privateKey);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a local author with the given format version, name and keys.
|
|
||||||
*/
|
|
||||||
LocalAuthor createLocalAuthor(int formatVersion, String name,
|
|
||||||
byte[] publicKey, byte[] privateKey);
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.crypto.CryptoExecutor;
|
|
||||||
import org.briarproject.bramble.api.db.DbException;
|
|
||||||
import org.briarproject.bramble.api.db.Transaction;
|
|
||||||
import org.briarproject.bramble.api.identity.Author.Status;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface IdentityManager {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a local identity with the given name.
|
|
||||||
*/
|
|
||||||
@CryptoExecutor
|
|
||||||
LocalAuthor createLocalAuthor(String name);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers the given local identity with the manager. The identity is
|
|
||||||
* not stored until {@link #storeLocalAuthor()} is called.
|
|
||||||
*/
|
|
||||||
void registerLocalAuthor(LocalAuthor a);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the local identity registered with
|
|
||||||
* {@link #registerLocalAuthor(LocalAuthor)}, if any.
|
|
||||||
*/
|
|
||||||
void storeLocalAuthor() throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the cached local identity or loads it from the database.
|
|
||||||
*/
|
|
||||||
LocalAuthor getLocalAuthor() throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the cached local identity or loads it from the database.
|
|
||||||
*/
|
|
||||||
LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the {@link Status} of the given author.
|
|
||||||
*/
|
|
||||||
Status getAuthorStatus(AuthorId a) throws DbException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the {@link Status} of the given author.
|
|
||||||
*/
|
|
||||||
Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A pseudonym for the local user.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class LocalAuthor extends Author {
|
|
||||||
|
|
||||||
private final byte[] privateKey;
|
|
||||||
private final long created;
|
|
||||||
|
|
||||||
public LocalAuthor(AuthorId id, int formatVersion, String name,
|
|
||||||
byte[] publicKey, byte[] privateKey, long created) {
|
|
||||||
super(id, formatVersion, name, publicKey);
|
|
||||||
this.privateKey = privateKey;
|
|
||||||
this.created = created;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the private key used to generate the pseudonym's signatures.
|
|
||||||
*/
|
|
||||||
public byte[] getPrivateKey() {
|
|
||||||
return privateKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the time the pseudonym was created, in milliseconds since the
|
|
||||||
* Unix epoch.
|
|
||||||
*/
|
|
||||||
public long getTimeCreated() {
|
|
||||||
return created;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.identity.AuthorId;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a local pseudonym is added.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class LocalAuthorAddedEvent extends Event {
|
|
||||||
|
|
||||||
private final AuthorId authorId;
|
|
||||||
|
|
||||||
public LocalAuthorAddedEvent(AuthorId authorId) {
|
|
||||||
this.authorId = authorId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AuthorId getAuthorId() {
|
|
||||||
return authorId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.identity.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.identity.AuthorId;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a local pseudonym is removed.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class LocalAuthorRemovedEvent extends Event {
|
|
||||||
|
|
||||||
private final AuthorId authorId;
|
|
||||||
|
|
||||||
public LocalAuthorRemovedEvent(AuthorId authorId) {
|
|
||||||
this.authorId = authorId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AuthorId getAuthorId() {
|
|
||||||
return authorId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement;
|
|
||||||
|
|
||||||
public interface KeyAgreementConstants {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The current version of the BQP protocol. Version number 89 is reserved.
|
|
||||||
*/
|
|
||||||
byte PROTOCOL_VERSION = 4;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The length of the BQP key commitment in bytes.
|
|
||||||
*/
|
|
||||||
int COMMIT_LENGTH = 16;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The connection timeout in milliseconds.
|
|
||||||
*/
|
|
||||||
long CONNECTION_TIMEOUT = 20 * 1000;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The transport identifier for Bluetooth.
|
|
||||||
*/
|
|
||||||
int TRANSPORT_ID_BLUETOOTH = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The transport identifier for LAN.
|
|
||||||
*/
|
|
||||||
int TRANSPORT_ID_LAN = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving the shared secret.
|
|
||||||
*/
|
|
||||||
String SHARED_SECRET_LABEL =
|
|
||||||
"org.briarproject.bramble.keyagreement/SHARED_SECRET";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Label for deriving the master secret.
|
|
||||||
*/
|
|
||||||
String MASTER_SECRET_LABEL =
|
|
||||||
"org.briarproject.bramble.keyagreement/MASTER_SECRET";
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.data.BdfList;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An class for managing a particular key agreement listener.
|
|
||||||
*/
|
|
||||||
public abstract class KeyAgreementListener {
|
|
||||||
|
|
||||||
private final BdfList descriptor;
|
|
||||||
|
|
||||||
public KeyAgreementListener(BdfList descriptor) {
|
|
||||||
this.descriptor = descriptor;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the descriptor that a remote peer can use to connect to this
|
|
||||||
* listener.
|
|
||||||
*/
|
|
||||||
public BdfList getDescriptor() {
|
|
||||||
return descriptor;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Blocks until an incoming connection is received and returns it.
|
|
||||||
*
|
|
||||||
* @throws IOException if an error occurs or {@link #close()} is called.
|
|
||||||
*/
|
|
||||||
public abstract KeyAgreementConnection accept() throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Closes the underlying server socket.
|
|
||||||
*/
|
|
||||||
public abstract void close();
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface PayloadEncoder {
|
|
||||||
|
|
||||||
byte[] encode(Payload p);
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@NotNullByDefault
|
|
||||||
public interface PayloadParser {
|
|
||||||
|
|
||||||
Payload parse(byte[] raw) throws IOException;
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.data.BdfList;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
import org.briarproject.bramble.api.plugin.TransportId;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class TransportDescriptor {
|
|
||||||
|
|
||||||
private final TransportId id;
|
|
||||||
private final BdfList descriptor;
|
|
||||||
|
|
||||||
public TransportDescriptor(TransportId id, BdfList descriptor) {
|
|
||||||
this.id = id;
|
|
||||||
this.descriptor = descriptor;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TransportId getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BdfList getDescriptor() {
|
|
||||||
return descriptor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a BQP protocol aborts.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class KeyAgreementAbortedEvent extends Event {
|
|
||||||
|
|
||||||
private final boolean remoteAborted;
|
|
||||||
|
|
||||||
public KeyAgreementAbortedEvent(boolean remoteAborted) {
|
|
||||||
this.remoteAborted = remoteAborted;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean didRemoteAbort() {
|
|
||||||
return remoteAborted;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a BQP connection cannot be created.
|
|
||||||
*/
|
|
||||||
public class KeyAgreementFailedEvent extends Event {
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.briarproject.bramble.api.keyagreement.event;
|
|
||||||
|
|
||||||
import org.briarproject.bramble.api.event.Event;
|
|
||||||
import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
|
|
||||||
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
|
|
||||||
|
|
||||||
import javax.annotation.concurrent.Immutable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event that is broadcast when a BQP protocol completes.
|
|
||||||
*/
|
|
||||||
@Immutable
|
|
||||||
@NotNullByDefault
|
|
||||||
public class KeyAgreementFinishedEvent extends Event {
|
|
||||||
|
|
||||||
private final KeyAgreementResult result;
|
|
||||||
|
|
||||||
public KeyAgreementFinishedEvent(KeyAgreementResult result) {
|
|
||||||
this.result = result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public KeyAgreementResult getResult() {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user