diff --git a/appmock/build.gradle b/appmock/build.gradle index 0a7cabc..aa65e90 100644 --- a/appmock/build.gradle +++ b/appmock/build.gradle @@ -2,12 +2,7 @@ plugins { id 'com.android.application' id 'kotlin-android' } -task wrapper(type: Wrapper){ - gradleVersion = '7.3.1' -} -task prepareKotlinBuildScriptModel { -} android { compileSdkVersion 31 buildFeatures { diff --git a/appmock/gradle/wrapper/gradle-wrapper.jar b/appmock/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927..0000000 Binary files a/appmock/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/appmock/gradle/wrapper/gradle-wrapper.properties b/appmock/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 84d1f85..0000000 --- a/appmock/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/appmock/gradlew b/appmock/gradlew deleted file mode 100644 index 1b6c787..0000000 --- a/appmock/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/appmock/gradlew.bat b/appmock/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/appmock/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/appmock/local.properties b/appmock/local.properties deleted file mode 100644 index 8f5852b..0000000 --- a/appmock/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Mon Dec 12 21:57:15 EST 2022 -sdk.dir=C\:\\Users\\ehsan\\AppData\\Local\\Android\\Sdk diff --git a/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt b/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt index bda4584..b57e0b2 100644 --- a/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt +++ b/appmock/src/androidTest/java/land/fx/app/WNFSTest.kt @@ -12,8 +12,6 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import java.io.File -import java.nio.charset.StandardCharsets -import java.security.MessageDigest @RunWith(AndroidJUnit4::class) @@ -70,11 +68,8 @@ class WNFSTest { println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") println(privateForest) - val keyPhrase = ("test").toByteArray(StandardCharsets.UTF_8) - val digest: MessageDigest = MessageDigest.getInstance("SHA-256"); - val hash: ByteArray = digest.digest(keyPhrase); - var config = createRootDir(client, privateForest, hash, false) + var config = createRootDir(client, privateForest) Log.d("AppMock", "config crecreateRootDirated. cid="+config.cid+" & private_ref="+config.private_ref) assertNotNull("cid should not be null", config.cid) assertNotNull("private_ref should not be null", config.private_ref) diff --git a/dep/wnfsutils/Cargo.toml b/dep/wnfsutils/Cargo.toml index 56bc9b9..bf03845 100644 --- a/dep/wnfsutils/Cargo.toml +++ b/dep/wnfsutils/Cargo.toml @@ -19,5 +19,4 @@ serde = "1.0.149" serde_json = "1.0.89" anyhow = "1.0.66" async-trait = "0.1.58" -log = "0.4.14" -sha3 = "0.10" \ No newline at end of file +log = "0.4.14" \ No newline at end of file diff --git a/dep/wnfsutils/src/private_forest.rs b/dep/wnfsutils/src/private_forest.rs index 3305581..655d041 100644 --- a/dep/wnfsutils/src/private_forest.rs +++ b/dep/wnfsutils/src/private_forest.rs @@ -10,13 +10,12 @@ use std::{ io::{Read, Write} }; use wnfs::{ - dagcbor, Hasher, utils, - private::{PrivateForest, PrivateRef, PrivateNode, Key}, + dagcbor, + private::{PrivateForest, PrivateRef}, BlockStore, Namefilter, PrivateDirectory, PrivateOpResult, Metadata, }; use anyhow::Result; use log::{trace, Level}; -use sha3::Sha3_256; use crate::blockstore::FFIFriendlyBlockStore; @@ -43,8 +42,12 @@ impl<'a> PrivateDirectoryHelper<'a> { pub async fn create_private_forest(&mut self) -> Result { // Create the private forest (also HAMT), a map-like structure where files and directories are stored. let forest = Rc::new(PrivateForest::new()); + + // Serialize the private forest to DAG CBOR. + let cbor_bytes = dagcbor::async_encode(&forest, &mut self.store).await.unwrap(); - self.update_forest(forest).await + // Persist encoded private forest to the block store. + self.store.put_serializable(&cbor_bytes).await } pub async fn load_forest(&mut self, forest_cid: Cid) -> Result> { @@ -58,9 +61,9 @@ impl<'a> PrivateDirectoryHelper<'a> { Ok(Rc::new(dagcbor::decode::(cbor_bytes.as_ref()).unwrap())) } - pub async fn update_forest(&mut self, forest: Rc) -> Result { + pub async fn update_forest(&mut self, hamt: Rc) -> Result { // Serialize the private forest to DAG CBOR. - let cbor_bytes = dagcbor::async_encode(&forest, &mut self.store).await.unwrap(); + let cbor_bytes = dagcbor::async_encode(&hamt, &mut self.store).await.unwrap(); // Persist encoded private forest to the block store. self.store.put_serializable(&cbor_bytes).await @@ -74,60 +77,20 @@ impl<'a> PrivateDirectoryHelper<'a> { .unwrap().unwrap().as_dir() } - pub async fn init(&mut self, forest: Rc, wnfs_key: Vec, reload: bool) -> (Cid, PrivateRef) { - let ratchet_seed: [u8; 32]; - let inumber: [u8; 32]; - if wnfs_key.is_empty() { - let wnfs_random_key = Key::new(utils::get_random_bytes::<32>(&mut self.rng)); - ratchet_seed = Sha3_256::hash(&wnfs_random_key.as_bytes()); - inumber = utils::get_random_bytes::<32>(&mut self.rng); // Needs to be random - }else { - ratchet_seed = Sha3_256::hash(&wnfs_key); - inumber = Sha3_256::hash(&ratchet_seed); - } - + pub async fn init(&mut self, forest: Rc) -> (Cid, PrivateRef) { + // Create a new directory. + let dir = Rc::new(PrivateDirectory::new( + Namefilter::default(), + Utc::now(), + &mut self.rng, + )); - //START TO RETRIEVE CURRENT FOREST - if reload { - let private_ref = PrivateRef::with_seed(Default::default(), ratchet_seed, inumber); - let dir = forest - .get( - &private_ref, - PrivateForest::resolve_lowest, - &mut self.store - ) - .await - .unwrap() - .unwrap() - .as_dir() - .unwrap(); - //END OF LOAD CURRENT FOREST - return (self.update_forest(forest).await.unwrap(), private_ref); - } else { - - // Create a new directory. - let dir = Rc::new(PrivateDirectory::with_seed( - Namefilter::default(), - Utc::now(), - ratchet_seed, - inumber - )); - let PrivateOpResult { root_dir, forest, .. } = dir - .mkdir( - &["root".into()], - true, - Utc::now(), - forest, - &mut self.store, - &mut self.rng - ) + let PrivateOpResult { root_dir, forest, .. } = dir + .mkdir(&["root".into()], true, Utc::now(), forest, &mut self.store,&mut self.rng) .await .unwrap(); - return (self.update_forest(forest).await.unwrap(), root_dir.header.get_private_ref()); - - } - + (self.update_forest(forest).await.unwrap(), root_dir.header.get_private_ref()) } fn get_file_as_byte_vec(&mut self, filename: &String) -> Vec { @@ -244,11 +207,11 @@ impl<'a> PrivateDirectoryHelper<'a> { return runtime.block_on(self.get_root_dir(forest, private_ref)); } - pub fn synced_init(&mut self, forest: Rc, wnfs_key: Vec, reload: bool) -> (Cid, PrivateRef) + pub fn synced_init(&mut self, forest: Rc) -> (Cid, PrivateRef) { let runtime = tokio::runtime::Runtime::new().expect("Unable to create a runtime"); - return runtime.block_on(self.init(forest, wnfs_key, reload)); + return runtime.block_on(self.init(forest)); } pub fn synced_write_file_from_path(&mut self, forest: Rc, root_dir: Rc, path_segments: &[String], filename: &String) -> (Cid, PrivateRef) @@ -325,14 +288,13 @@ mod private_tests { #[async_std::test] async fn iboverall() { - let empty_key: Vec = vec![0; 32]; let store = KVBlockStore::new(String::from("./tmp/test2"), IpldCodec::DagCbor); let blockstore = FFIFriendlyBlockStore::new(Box::new(store)); let helper = &mut PrivateDirectoryHelper::new(blockstore); let forest_cid = helper.create_private_forest().await.unwrap(); println!("cid: {:?}", forest_cid); let forest = helper.load_forest(forest_cid).await.unwrap(); - let (forest_cid, private_ref) = helper.init(forest, empty_key, false).await; + let (forest_cid, private_ref) = helper.init(forest).await; let forest = helper.load_forest(forest_cid).await.unwrap(); let root_dir = helper.get_root_dir(forest.to_owned(), private_ref.to_owned()).await.unwrap(); let (new_cid, _) = helper.write_file(forest.to_owned(), root_dir.to_owned(), &["root".into(), "hello".into(), "world.txt".into()], b"hello, world!".to_vec()).await; diff --git a/lib/src/main/java/land/fx/wnfslib/Fs.java b/lib/src/main/java/land/fx/wnfslib/Fs.java index d2f5941..1ef97f5 100644 --- a/lib/src/main/java/land/fx/wnfslib/Fs.java +++ b/lib/src/main/java/land/fx/wnfslib/Fs.java @@ -6,7 +6,7 @@ public final class Fs { private static native String createPrivateForestNative(Datastore datastore); - private static native Config createRootDirNative(Datastore datastore, String cid, byte[] wnfsKey, Boolean reload); + private static native Config createRootDirNative(Datastore datastore, String cid); private static native Config writeFileFromPathNative(Datastore datastore, String cid, String privateRef, String path, String filename); @@ -26,8 +26,8 @@ public static String createPrivateForest(Datastore datastore) { return createPrivateForestNative(datastore); } - public static Config createRootDir(Datastore datastore, String cid, byte[] wnfsKey, Boolean reload) { - return createRootDirNative(datastore, cid, wnfsKey, reload); + public static Config createRootDir(Datastore datastore, String cid) { + return createRootDirNative(datastore, cid); } public static Config writeFileFromPath(Datastore datastore, String cid, String privateRef, String path, String filename) { diff --git a/wnfslib/src/lib.rs b/wnfslib/src/lib.rs index dbf884a..d243dfc 100644 --- a/wnfslib/src/lib.rs +++ b/wnfslib/src/lib.rs @@ -7,7 +7,7 @@ pub mod android { use jni::objects::{JClass, JObject, JString, JValue}; use jni::signature::JavaType; - use jni::sys::{jbyteArray, jobject, jstring, jboolean, JNI_TRUE}; + use jni::sys::{jbyteArray, jobject, jstring}; use jni::JNIEnv; use libipld::Cid; use log::{trace, Level}; @@ -132,8 +132,6 @@ pub mod android { _: JClass, jni_fula_client: JObject, jni_cid: JString, - jni_wnfs_key: jbyteArray, - jni_reload: jboolean, ) -> jobject { trace!("**********************createRootDirNative started**************"); let store = JNIStore::new(env, jni_fula_client); @@ -142,9 +140,7 @@ pub mod android { let forest_cid = deserialize_cid(env, jni_cid); trace!("cid: {}", forest_cid); let forest = helper.synced_load_forest(forest_cid).unwrap(); - let wnfs_key: Vec = jbyte_array_to_vec(env, jni_wnfs_key); - let reload: bool = jni_reload == JNI_TRUE; - let (cid, private_ref) = helper.synced_init(forest, wnfs_key, reload); + let (cid, private_ref) = helper.synced_init(forest); trace!("pref: {:?}", private_ref); trace!("**********************createRootDirNative finished**************"); serialize_config(env, cid, private_ref)