Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
implement #21 remote access via onion server and orbot! The app allows you to now enable remote access through an HTTP web interface that is available, in coordination with the Orbot Tor for Android app, as a Tor Hidden or "onion" service.
n8fr8dc22847db32b
diff --git a/build.gradle b/build.gradleindex 29686c6..24d1833 100644--- a/build.gradle+++ b/build.gradle@@ -3,7 +3,7 @@ buildscript {jcenter()}dependencies {- classpath 'com.android.tools.build:gradle:2.2.0'+ classpath 'com.android.tools.build:gradle:2.3.3'}}@@ -54,6 +54,6 @@ dependencies {compile 'com.squareup.picasso:picasso:2.5.2'compile 'net.the4thdimension:audio-wife:1.0.3'compile 'com.github.paolorotolo:appintro:4.1.0'+ compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'--}+ compile 'com.nanohttpd:nanohttpd-webserver:2.2.0'}diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex e15c98c..8145a3b 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@-#Fri Mar 17 12:27:46 EDT 2017+#Sat Jun 24 00:08:44 EDT 2017distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/distszipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zipdiff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.javaindex d8906a9..9579c17 100644--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java@@ -7,6 +7,7 @@ import android.support.v7.widget.RecyclerView;import info.guardianproject.phoneypot.model.Event;import info.guardianproject.phoneypot.model.EventTrigger;+import info.guardianproject.phoneypot.service.WebServer;import info.guardianproject.phoneypot.ui.EventActivity;import info.guardianproject.phoneypot.ui.EventAdapter;import info.guardianproject.phoneypot.ui.PPAppIntro;@@ -25,6 +26,8 @@ import android.support.v4.graphics.drawable.DrawableCompat;import android.support.v7.widget.LinearLayoutManager;import android.support.v7.widget.helper.ItemTouchHelper;import android.util.Log;+import android.view.Menu;+import android.view.MenuItem;import android.view.View;import java.io.File;@@ -265,4 +268,21 @@ public class ListActivity extends AppCompatActivity {}+ /**+ @Override+ public boolean onCreateOptionsMenu(Menu menu) {+ getMenuInflater().inflate(R.menu.menu_main, menu);+ return true;+ }++ @Override+ public boolean onOptionsItemSelected (MenuItem item) {+ switch (item.getItemId()){+ case R.id.menu_remote:+ enableRemoteAccess();+ break;+ }+ return true;+ }**/+}\ No newline at end of filediff --git a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.javaindex 8a5f79f..d41b54c 100644--- a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java+++ b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java@@ -49,14 +49,46 @@ public class PreferenceManager {private static final String TIMER_DELAY="timer_delay";private static final String DIR_PATH = "/secureit";- private Context context;+ private static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";+ private static final String REMOTE_ACCESS_ONION = "remote_access_onion";+ private static final String REMOTE_ACCESS_CRED = "remote_access_credential";++ private Context context;public PreferenceManager(Context context) {this.context = context;this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, Activity.MODE_PRIVATE);this.prefsEditor = appSharedPrefs.edit();}-++ public void activateRemoteAccess (boolean active) {+ prefsEditor.putBoolean(REMOTE_ACCESS_ACTIVE,active);+ prefsEditor.commit();+ }++ public boolean getRemoteAccessActive ()+ {+ return appSharedPrefs.getBoolean(REMOTE_ACCESS_ACTIVE,false);+ }++ public void setRemoteAccessOnion (String onionAddress) {+ prefsEditor.putString(REMOTE_ACCESS_ONION,onionAddress);+ prefsEditor.commit();+ }++ public String getRemoteAccessOnion () {+ return appSharedPrefs.getString(REMOTE_ACCESS_ONION,"");+ }++ public void setRemoteAccessCredential (String remoteCredential) {+ prefsEditor.putString(REMOTE_ACCESS_CRED,remoteCredential);+ prefsEditor.commit();+ }++ public String getRemoteAccessCredential () {+ return appSharedPrefs.getString(REMOTE_ACCESS_CRED,null);+ }+public void activateAccelerometer(boolean active) {prefsEditor.putBoolean(ACCELEROMETER_ACTIVE, active);prefsEditor.commit();diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex aa8f05d..c988f3d 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -12,6 +12,7 @@ package info.guardianproject.phoneypot;import java.io.File;import android.Manifest;+import android.content.Intent;import android.os.Bundle;import android.os.Environment;import android.content.pm.PackageManager;@@ -19,6 +20,7 @@ import android.support.v4.app.ActivityCompat;import android.support.v4.content.ContextCompat;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.Toolbar;+import android.text.TextUtils;import android.util.Log;import android.view.Menu;import android.view.MenuItem;@@ -28,6 +30,11 @@ import android.widget.EditText;import android.widget.CompoundButton.OnCheckedChangeListener;import android.widget.Spinner;+import org.w3c.dom.Text;++import info.guardianproject.netcipher.proxy.OrbotHelper;+import info.guardianproject.phoneypot.service.WebServer;+public class SettingsActivity extends AppCompatActivity {private PreferenceManager preferences = null;@@ -41,7 +48,6 @@ public class SettingsActivity extends AppCompatActivity {Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);setSupportActionBar(toolbar);-preferences = new PreferenceManager(this.getApplicationContext());/*@@ -54,7 +60,8 @@ public class SettingsActivity extends AppCompatActivity {* Checkboxes for enabled app options*/final CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);-+ final CheckBox remoteAccessCheck = (CheckBox) this.findViewById(R.id.remote_access_check);+/** Detecting if the device has a front camera* and configuring the spinner of camera selection@@ -85,6 +92,8 @@ public class SettingsActivity extends AppCompatActivity {final EditText phoneNumber = (EditText)this.findViewById(R.id.phone_number);+ final EditText remoteAccessOnion = (EditText)+ this.findViewById(R.id.remote_access_onion);final EditText timerDelay = (EditText)this.findViewById(R.id.timer_delay);@@ -98,6 +107,15 @@ public class SettingsActivity extends AppCompatActivity {}});+ remoteAccessCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {+ @Override+ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {+ if (isChecked) {+ checkRemoteAccessOnion();+ }+ }+ });+/*** Loads preferences and sets view*/@@ -151,6 +169,13 @@ public class SettingsActivity extends AppCompatActivity {phoneNumber.setText(preferences.getSmsNumber());}+ if (preferences.getRemoteAccessActive())+ {+ remoteAccessCheck.setChecked(true);+ remoteAccessOnion.setText(preferences.getRemoteAccessOnion() + ":" + WebServer.LOCAL_PORT);++ }+timerDelay.setText(preferences.getTimerDelay()+"");askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);@@ -210,7 +235,7 @@ public class SettingsActivity extends AppCompatActivity {Spinner selectCameraSpinner = (Spinner) this.findViewById(R.id.camera_spinner);CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);-+ CheckBox remoteAccessCheck = (CheckBox) this.findViewById(R.id.remote_access_check);preferences.activateAccelerometer(true);preferences.setAccelerometerSensitivity(@@ -236,6 +261,8 @@ public class SettingsActivity extends AppCompatActivity {preferences.activateSms(false);}+ preferences.activateRemoteAccess(remoteAccessCheck.isChecked());+preferences.setTimerDelay(Integer.parseInt(timerDelay.getText().toString()));setResult(RESULT_OK);@@ -259,4 +286,34 @@ public class SettingsActivity extends AppCompatActivity {return true;}+ private void checkRemoteAccessOnion ()+ {+ if (OrbotHelper.isOrbotInstalled(this))+ {+ OrbotHelper.requestStartTor(this);++ if (TextUtils.isEmpty(preferences.getRemoteAccessOnion()))+ OrbotHelper.requestHiddenServiceOnPort(this, WebServer.LOCAL_PORT);+ }+ }++ @Override+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {+ super.onActivityResult(requestCode, resultCode, data);++ if (resultCode == RESULT_OK && data != null)+ {+ String onionHost = data.getStringExtra("hs_host");++ if (!TextUtils.isEmpty(onionHost)) {+ preferences.setRemoteAccessOnion(onionHost);+ final EditText remoteAccessOnion = (EditText)+ this.findViewById(R.id.remote_access_onion);+ remoteAccessOnion.setText(onionHost + ":" + WebServer.LOCAL_PORT);+ }++ }+ }+}+diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex 084bf2c..7d4d34e 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -22,7 +22,9 @@ import android.os.Messenger;import android.os.PowerManager;import android.support.v4.app.NotificationCompat;import android.telephony.SmsManager;+import android.util.Log;+import java.io.IOException;import java.util.Date;import info.guardianproject.phoneypot.MonitorActivity;@@ -90,6 +92,11 @@ public class MonitorService extends Service {*/PowerManager.WakeLock wakeLock;+ /*+ ** Onion-available Web Server for optional remote access+ */+ WebServer mOnionServer = null;+/*** Called on service creation, sends a notification*/@@ -98,6 +105,9 @@ public class MonitorService extends Service {manager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);prefs = new PreferenceManager(this);+ if (prefs.getRemoteAccessActive())+ startServer();+startSensors();showNotification();@@ -117,6 +127,10 @@ public class MonitorService extends Service {wakeLock.release();stopSensors();++ if (mOnionServer != null)+ mOnionServer.stop();+stopForeground(true);@@ -235,5 +249,15 @@ public class MonitorService extends Service {}+ private void startServer ()+ {+ try {+ mOnionServer = new WebServer();+ }+ catch (IOException ioe)+ {+ Log.e("OnioNServer","unable to start onion server",ioe);+ }+ }}diff --git a/src/main/java/info/guardianproject/phoneypot/service/WebServer.java b/src/main/java/info/guardianproject/phoneypot/service/WebServer.javanew file mode 100644index 0000000..52d94ef--- /dev/null+++ b/src/main/java/info/guardianproject/phoneypot/service/WebServer.java@@ -0,0 +1,167 @@+package info.guardianproject.phoneypot.service;++import android.net.Uri;+import android.text.TextUtils;+import android.util.Log;++import java.io.File;+import java.io.FileInputStream;+import java.io.IOException;+import java.util.List;++import fi.iki.elonen.NanoHTTPD;+import info.guardianproject.phoneypot.model.Event;+import info.guardianproject.phoneypot.model.EventTrigger;++/**+ * Created by n8fr8 on 6/25/17.+ */++public class WebServer extends NanoHTTPD {++ public final static int LOCAL_PORT = 8888;++ private final static String TAG = "WebServer";++ public WebServer() throws IOException {+ super(LOCAL_PORT);+ start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);+ }++ @Override+ public Response serve(IHTTPSession session) {++ Uri uri = Uri.parse(session.getUri());+ List<String> pathSegs = uri.getPathSegments();++ if (pathSegs.size() == 4 && pathSegs.get(2).equals("trigger"))+ {+ //long eventId = Long.parseLong(pathSegs.get(1));++ long eventTriggerId = Long.parseLong(pathSegs.get(3));+ EventTrigger eventTrigger = EventTrigger.findById(EventTrigger.class, eventTriggerId);++ try {+ File fileMedia = new File(eventTrigger.getPath());+ FileInputStream fis = new FileInputStream(fileMedia);+ Response res = newChunkedResponse(Response.Status.OK, getMimeType(eventTrigger), fis);+ // res.addHeader("Content-Disposition", "attachment; filename=\"" + fileMedia.getName() + "\"");+ return res;++ }+ catch (IOException ioe)+ {+ Log.e(TAG,"unable to return media file",ioe);+ }+ }+ else {+ StringBuffer page = new StringBuffer();+ page.append("<html><head><title>PhoneyPot</title>");+ page.append("<meta http-equiv=\"Content-Type\" content=\"application/xhtml+xml; charset=utf-8\" />");+ page.append("<meta name = \"viewport\" content = \"user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width\">");++ page.append("</head><body>");++ if (TextUtils.isEmpty(uri.getPath()) || uri.getPath().equals("/"))+ showEvents(page);+ else {+ try {+ if (pathSegs.size() == 2 && pathSegs.get(0).equals("event")) {+ long eventId = Long.parseLong(pathSegs.get(1));+ Event event = Event.findById(Event.class, eventId);+ showEvent(event, page);++ }++ } catch (Exception e) {+ Log.e(TAG, "Something went wrong with parsing the path", e);+ }+ }++ page.append("</body></html>\n");+ return newFixedLengthResponse(page.toString());+ }++ return newFixedLengthResponse(Response.Status.INTERNAL_ERROR,"text/plain","Error");+ }++ private void showEvent (Event event, StringBuffer page) {++ List<EventTrigger> triggers = event.getEventTriggers();++ page.append("<h1>Event: ").append(event.getStartTime().toLocaleString()).append("</h1><hr/>\n");++ for (EventTrigger eventTrigger: triggers)+ {+ String title = eventTrigger.getStringType();+ String desc = eventTrigger.getTriggerTime().toString();++ page.append("<b>");+ page.append(title).append("</b><br/>");+ page.append(desc).append("<br/>");++ String mediaPath = "/event/" + event.getId() + "/trigger/" + eventTrigger.getId();++ if (eventTrigger.getType() == EventTrigger.CAMERA)+ {+ page.append("<img src=\"").append(mediaPath).append("\" width=\"100%\"/>");+ page.append("<a href=\"" + mediaPath + "\">Download Media").append("</a>");++ }+ else if (eventTrigger.getType() == EventTrigger.MICROPHONE)+ {+ page.append("<audio src=\"").append(mediaPath).append("\"></audio>");+ page.append("<a href=\"" + mediaPath + "\">Download Media").append("</a>");++ }+++ page.append("<hr/>");+ }++++ }++ private void showEvents(StringBuffer page)+ {+ page.append("<h1>Events</h1><hr/>\n");++ List<Event> events = Event.listAll(Event.class);++ for (Event event: events)+ {+ String title = event.getStartTime().toLocaleString();+ String desc = event.getEventTriggers().size() + " triggered events";++ page.append("<b>").append("<a href=\"/event/").append(event.getId()).append("\">");+ page.append(title).append("</a></b><br/>");+ page.append(desc);+ page.append("<hr/>");+ }++ }++ private String getMimeType (EventTrigger eventTrigger)+ {+ String sType = "";++ switch (eventTrigger.getType()) {+ case EventTrigger.ACCELEROMETER:+ sType = null;+ break;+ case EventTrigger.CAMERA:+ sType = "image/jpeg";+ break;+ case EventTrigger.MICROPHONE:+ sType = "audio/mp4";+ break;+ default:+ sType = null;+ }++ return sType;++ }++}diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.pngnew file mode 100644index 0000000..57c9fa5Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png differdiff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.pngnew file mode 100644index 0000000..547ef30Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png differdiff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.pngnew file mode 100644index 0000000..c61e948Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png differdiff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.pngnew file mode 100644index 0000000..a3c80e7Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png differdiff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.pngnew file mode 100644index 0000000..a3c80e7Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png differdiff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.pngnew file mode 100644index 0000000..be5c062Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png differdiff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.pngnew file mode 100644index 0000000..547ef30Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png differdiff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.pngnew file mode 100644index 0000000..2745c3aBinary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png differdiff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.pngnew file mode 100644index 0000000..be5c062Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png differdiff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.pngnew file mode 100644index 0000000..8dbc4eaBinary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.png differdiff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xmlindex 1382a5c..45e0fc8 100644--- a/src/main/res/layout/activity_list.xml+++ b/src/main/res/layout/activity_list.xml@@ -58,7 +58,7 @@android:layout_height="wrap_content"android:layout_gravity="bottom|end"android:layout_margin="@dimen/fab_margin"- android:src="@drawable/ic_phone_alert"+ android:src="@drawable/ic_play_arrow_white_48dp"android:tint="@android:color/white" /></android.support.design.widget.CoordinatorLayout>\ No newline at end of filediff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xmlindex 2a11c1c..c9cbaba 100644--- a/src/main/res/layout/activity_settings.xml+++ b/src/main/res/layout/activity_settings.xml@@ -130,5 +130,20 @@android:layout_height="wrap_content"android:paddingTop="10dp"/>+ <CheckBox+ android:id="@+id/remote_access_check"+ android:text="@string/remote_access_label"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_centerHorizontal="true"+ tools:context=".SettingsActivity" />+ <EditText+ android:id="@+id/remote_access_onion"+ android:hint="@string/remote_access_hint"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_centerHorizontal="true"+ tools:context=".SettingsActivity" />+</LinearLayout></LinearLayout>\ No newline at end of filediff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xmlnew file mode 100644index 0000000..b887f12--- /dev/null+++ b/src/main/res/menu/menu_main.xml@@ -0,0 +1,7 @@+<menu xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto">+ <item android:id="@+id/menu_remote"+ android:title="@string/menu_save"+ android:orderInCategory="100"+ app:showAsAction="always|withText" />+</menu>diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex d7ad68d..a8ec66e 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -5,7 +5,7 @@<string name="menu_stop">Stop</string><string name="menu_start">Start</string><string name="menu_save">Save</string>-+ <string name="menu_remote_access">Remote Access</string><string name="title_activity_start">PhoneyPot</string>@@ -88,12 +88,14 @@<string name="intro3_title">DANGER WILL ROBINSON!</string><string name="intro3_desc">You will be notified via text message of any intrusion event</string>- <string name="intro4_title">Captian\'s Log!</string>+ <string name="intro4_title">Captain\'s Log!</string><string name="intro4_desc">Any detection is logged for review upon your return for further investigation.</string><string name="intro5_title">Ready to go?</string>- <string name="intro5_desc">Now we\'ll start your first Phoneypot session!</string>+ <string name="intro5_desc">Now we\'ll help you configure your device for detection...</string><string name="onboarding_action_end">Let\'s go!</string>+ <string name="remote_access_label">Enable remote access via Tor Onion Service</string>+ <string name="remote_access_hint">(onion service address will be displayed here)</string></resources>\ No newline at end of file