Ver 2.4(major)

Privacy_policy.md

@@ -0,0 +1,73 @@
+Last updated: 24 August, 2021
+
+# Privacy Policy
+
+Aalborg University, Denmark built the HosTaGe app as an Open Source app. This SERVICE is provided by Aalborg University, Denmark at no cost and is intended for use as is.
+
+This page is used to inform visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use our Service.
+
+If you choose to use our Service, then you agree to the collection and use of information in relation to this policy. The Personal Information that we collect is used for providing and improving the Service. We will not use or share your information with anyone except as described in this Privacy Policy.
+
+The users can consent for the following:
+
+*   The right to be forgotten – to get your data deleted. The right to have incorrect data corrected.
+*   The right to know what data a controller have on you.
+*   The right to have your data shared with another organization, if requested be the subject.
+*   The right to not be profiled, the right to object.
+
+The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible at HosTaGe unless otherwise defined in this Privacy Policy. The Privacy Policy of Aalborg University can be accessed at [https://www.en.aau.dk/privacy-policy-cookies#370625](https://www.en.aau.dk/privacy-policy-cookies#370625)
+
+**Information Collection and Use**
+
+For a better experience, while using our Service, we may require you to provide us with certain personally identifiable information. The information that we request will be retained by us and used as described in this privacy policy.
+
+On app startup, we ask for user consent for accessing the location permission. This information is required to access the network related information, necessary for the app main functionality.
+
+The app does use third party services that may collect information used to identify you.
+
+Link to privacy policy of third party service providers used by the app
+
+*   [Google Play Services](https://policies.google.com/privacy)
+
+**Log Data**
+
+We want to inform you that whenever you use our Service, in a case of an error in the app we collect data and information (through third party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing our Service, the time and date of your use of the Service, and other statistics. The logs will be purged periodically every 3 months.
+
+**Cookies**
+
+Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These are sent to your browser from the websites that you visit and are stored on your device's internal memory.
+
+This Service does not use these “cookies” explicitly. However, the app may use third party code and libraries that use “cookies” to collect information and improve their services. You have the option to either accept or refuse these cookies and know when a cookie is being sent to your device. If you choose to refuse our cookies, you may not be able to use some portions of this Service.
+
+**Service Providers**
+
+We may employ third-party companies and individuals due to the following reasons:
+
+*   To facilitate our Service;(Google Services for hosting the app information)
+*   To provide the Service on our behalf;
+*   To perform Service-related services; or
+*   To assist us in analyzing how our Service is used.
+
+We want to inform users of this Service that these third parties have access to your Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.
+
+**Security**
+
+We value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security.
+
+**Links to Other Sites**
+
+This Service may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by us. Therefore, we strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services.
+
+**Children’s Privacy**
+
+These Services do not address anyone under the age of 13. We do not knowingly collect personally identifiable information from children under 13 years of age. In the case we discover that a child under 13 has provided us with personal information, we immediately delete this from our servers. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact us so that we will be able to do necessary actions.
+
+**Changes to This Privacy Policy**
+
+We may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.
+
+This policy is effective as of 2021-03-08
+
+**Contact Us**
+
+If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us at [email protected]. Data subjects have the right to submit a complaint about how their personal data is processed to the Danish Data Protection Agency at [email protected] or by post to Datatilsynet/the Danish Data Protection Agency, Borgergade 28, 5., 1300 Copenhagen K. Please contact our Data Protection Officer if you have any question about the processing of your personal data at [email protected] However, before contacting the Danish Data Protection Agency, we recommend that you contact Aalborg University’s data protection officer who may be able to solve the matter.

README.md

@@ -1,6 +1,6 @@
-![alt text](https://github.com/aau-network-security/HosTaGe/blob/master/jekyll/ic_launcher.png  "Logo Title Text 1")
+![HosTaGe Logo](./jekyll/ic_launcher.png  "Logo")
 
-[<img src="https://github.com/aau-network-security/HosTaGe/blob/ver-2.3.4/jekyll/gsoc.png" width="250" height="200">](https://www.honeynet.org/2020/09/29/gsoc-2020-project-summary-hostage/) [<img src="https://github.com/aau-network-security/HosTaGe/blob/ver-2.3.4/jekyll/bh_eu_2020.jpg" width="400" height="200">](https://www.youtube.com/watch?v=uMR76HTm9M0)
+[<img src="./jekyll/gsoc.png" width="336" height="200">](https://www.honeynet.org/2020/09/29/gsoc-2020-project-summary-hostage/) [<img src="./jekyll/bh_eu_2020.jpg" width="400" height="200">](https://www.youtube.com/watch?v=uMR76HTm9M0)
 
 
 
@@ -37,11 +37,11 @@ The research behind HosTaGe has been published and presented in a number of scie
 
 __Download APK__
 
-[HosTaGe-v2.2.11.apk](https://github.com/aau-network-security/HosTaGe/releases/download/v2.2.11/HosTaGe-2.2.11.apk) [Release-Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.2.11)(latest) 
+[HosTaGe-v2.4.apk](https://github.com/aau-network-security/HosTaGe/releases/download/v2.4/HosTaGe-release.apk) (latest) [Release Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.4)
 
-HosTaGe-v2.1.1.apk [Release-Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.1.1)
+HosTaGe-v2.2.11.apk [Release Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.2.11)
 
-HosTaGe-v2.0.0.apk [Release-Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.0.0)
+HosTaGe-v2.1.1.apk [Release Notes](https://github.com/aau-network-security/HosTaGe/releases/tag/v2.1.1)
 
 
 __Wiki__
@@ -61,9 +61,11 @@ __Original Authors__
 
 __Contributors__
 
-[Shreyas Srinivasa](https://sastry17.github.io/), lead developer, Aalborg University and Technische Universität Darmstadt (Github - @sastry17)
+[Shreyas Srinivasa](https://sastry17.github.io/), lead developer, Aalborg University and Technische Universität Darmstadt ([@sastry17](https://github.com/sastry17))
 
-Eirini Lygerou, GSoC 2020 Developer (Github - @irinil)
+Eirini Lygerou, GSoC 2020 Developer ([@irinil](https://github.com/irinil))
+
+Filip Adamík, GSoC 2021 Developer ([@zafodB](https://github.com/zafodB))
 
 Mihai Plasoianu, student developer, Technische Universität Darmstadt
 
@@ -104,3 +106,11 @@ Please use the Github issues to report any issues or for questions.
 __License & Distribution__
 
 Distributed under the MIT license. See [LICENSE](./LICENSE.md) for license information. 
+
+__Terms and Conditions__
+
+Use of the application is subject to [Terms and Conditions](./terms.md). 
+
+__Privacy Policy__
+
+You can find the privacy policy under [Privacy Policy](./Privacy_policy.md)

build.gradle

@@ -8,11 +8,11 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' // add plugin
 
         classpath 'com.google.gms:google-services:4.3.8' //added gms support
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -31,7 +31,7 @@ allprojects {
 }
 dependencies {
     //firebase
-    implementation 'com.google.firebase:firebase-crashlytics:18.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.0.1'
     implementation 'com.google.firebase:firebase-analytics:19.0.0'
     implementation 'com.google.firebase:firebase-core:19.0.0'
     //google api
@@ -50,13 +50,15 @@ dependencies {
 
     //COAP
     //implementation 'com.mbed.java-coap:coap-core:5.0.0' //original package
-    implementation files('libs/coap-core-5.1.0-SNAPSHOT.jar') //forked repo https://github.com/irinil/java-coap
+    implementation files('libs/coap-core-5.1.0-SNAPSHOT.jar')
+    //forked repo https://github.com/irinil/java-coap
 
     //AMQP
     // https://mvnrepository.com/artifact/com.rabbitmq/amqp-client
     implementation group: 'com.rabbitmq', name: 'amqp-client', version: '5.12.0'
 
-    implementation files('libs/qpid-broker-core-9.0.0-SNAPSHOT.jar') //forked repo https://github.com/irinil/qpid-broker-j
+    implementation files('libs/qpid-broker-core-9.0.0-SNAPSHOT.jar')
+    //forked repo https://github.com/irinil/qpid-broker-j
     //implementation group: 'org.apache.qpid', name: 'qpid-broker-core', version: '8.0.0' //default package doesn't support android.
     // https://mvnrepository.com/artifact/javax.naming/jndi
     implementation files('libs/jndi-1.2.1.jar');
@@ -88,13 +90,17 @@ dependencies {
     implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214'
 
     //RootTools Library
-    implementation 'com.github.Stericson:RootShell:1.6' //RootTolls depends on RootShell and it's not correctly setUped for the jitpack
-    implementation ('com.github.Stericson:RootTools:5.0') {//Refer to https://github.com/Stericson/RootTools/issues/65
+    implementation 'com.github.Stericson:RootShell:1.6'
+    //RootTolls depends on RootShell and it's not correctly setUped for the jitpack
+    implementation('com.github.Stericson:RootTools:5.0') {
+//Refer to https://github.com/Stericson/RootTools/issues/65
         exclude group: 'com.github.Stericson'
     }
 
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
+    implementation "androidx.work:work-runtime:2.6.0-beta01"
+
     //androidX legacy support
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
@@ -120,7 +126,7 @@ dependencies {
     implementation 'com.jaredrummler:android-device-names:2.0.0'
 
     //materialDesign
-    implementation 'com.google.android.material:material:1.4.0-beta01'
+    implementation 'com.google.android.material:material:1.4.0-rc01'
 
     //leakcanary
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
@@ -133,8 +139,8 @@ dependencies {
     testImplementation "org.mockito:mockito-core:3.10.0"
     implementation 'androidx.annotation:annotation:1.0.0'
 
-    androidTestImplementation 'androidx.test:rules:1.4.0-beta01'
-    androidTestImplementation 'androidx.test:runner:1.4.0-beta01'
+    androidTestImplementation 'androidx.test:rules:1.4.0-beta02'
+    androidTestImplementation 'androidx.test:runner:1.4.0-beta02'
 
     // Optional -- UI testing with Espresso
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -148,10 +154,10 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.4.1'
 }
 
-greendao{
+greendao {
     schemaVersion 1
     //generateTests true
-   // targetGenDir "src/db/"
+    // targetGenDir "src/db/"
 }
 //The first is for the conflict of common apache libraries between moquette and VirusTotalApi
 //The second one is for the conflict with an older version of deprecated slf4j
@@ -161,19 +167,14 @@ configurations {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
-        versionCode 11
-        versionName "2.3.4"
+        versionCode 16
+        versionName "2.4"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
-        javaCompileOptions {
-            annotationProcessorOptions {
-                includeCompileClasspath true
-            }
-        }
 
         //   signingConfig signingConfigs.config
 
@@ -184,11 +185,6 @@ android {
         }
     }
 
-    dexOptions {
-        incremental true
-        preDexLibraries = false
-        javaMaxHeapSize "4g"
-    }
     sourceSets {
 
         // Move the build types to build-types/<type>

google-services.json

@@ -6,35 +6,6 @@
     "storage_bucket": "hostage-4f7c7.appspot.com"
   },
   "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:283609891050:android:c9df120509b30ca36e9793",
-        "android_client_info": {
-          "package_name": "de.tudarmstadt.informatik.hostage"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "283609891050-36dl28rq07gt758o64dotvfceotf9deg.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyD0RyNSaOfTPFui8xfnibzPI8qt0bklFXQ"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "283609891050-36dl28rq07gt758o64dotvfceotf9deg.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:283609891050:android:e30069f416053d0f6e9793",
@@ -43,6 +14,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "283609891050-6n077vjif0t40i4lnno35lhafrir2kt1.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "dk.aau.netsec.hostage",
+            "certificate_hash": "eff2e4f53a06fd5f3a5074df5250d7b757af784e"
+          }
+        },
         {
           "client_id": "283609891050-36dl28rq07gt758o64dotvfceotf9deg.apps.googleusercontent.com",
           "client_type": 3

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=hostage.wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=hostage.wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 11,
-      "versionName": "2.3.4",
+      "versionCode": 13,
+      "versionName": "2.4",
       "outputFile": "HosTaGe-release.apk"
     }
   ]