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
fixes for #41 to enable basic password for onion service
n8fr873841cb09b25
diff --git a/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java b/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.javaindex 034e504..986b000 100644--- a/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java+++ b/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java@@ -2,22 +2,67 @@ package info.guardianproject.phoneypot;import android.app.Application;import android.support.multidex.MultiDexApplication;+import android.text.TextUtils;+import android.util.Log;import com.facebook.drawee.backends.pipeline.Fresco;import com.orm.SugarApp;import com.orm.SugarContext;+import java.io.IOException;+import java.util.prefs.Preferences;++import info.guardianproject.phoneypot.service.WebServer;+/*** Created by n8fr8 on 8/9/17.*/public class PhoneyPotApp extends MultiDexApplication {++ /*+ ** Onion-available Web Server for optional remote access+ */+ WebServer mOnionServer = null;++ PreferenceManager mPrefs = null;+@Overridepublic void onCreate() {super.onCreate();+ mPrefs = new PreferenceManager(this);+Fresco.initialize(this);SugarContext.init(this);++ if (mPrefs.getRemoteAccessActive())+ startServer();++ }+++ public void startServer ()+ {+ if (mOnionServer == null || (!mOnionServer.isAlive()))+ {+ try {+ mOnionServer = new WebServer();++ if (!TextUtils.isEmpty(mPrefs.getRemoteAccessCredential()))+ mOnionServer.setPassword(mPrefs.getRemoteAccessCredential());+ } catch (IOException ioe) {+ Log.e("OnioNServer", "unable to start onion server", ioe);+ }+ }+ }++ public void stopServer ()+ {+ if (mOnionServer != null && mOnionServer.isAlive())+ {+ mOnionServer.stop();+ }}}diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex 9adbc43..7f55de4 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -23,8 +23,11 @@ import android.support.v4.content.ContextCompat;import android.support.v7.app.AlertDialog;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.Toolbar;+import android.text.Editable;import android.text.TextUtils;+import android.text.TextWatcher;import android.util.Log;+import android.view.KeyEvent;import android.view.Menu;import android.view.MenuItem;import android.view.View;@@ -51,24 +54,28 @@ import me.angrybyte.numberpicker.view.ActualNumberPicker;public class SettingsActivity extends AppCompatActivity {private PreferenceManager preferences = null;+ private PhoneyPotApp app = null;+ private EditText remoteAccessCredential;@Overridepublic void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);-+setContentView(R.layout.activity_settings);- Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);setSupportActionBar(toolbar);preferences = new PreferenceManager(this.getApplicationContext());-++ app = (PhoneyPotApp)getApplication();+/** We create an application directory to store images and audio*/- File directory = new File(Environment.getExternalStorageDirectory()+preferences.getDirPath());+ File directory = new File(Environment.getExternalStorageDirectory() + preferences.getDirPath());directory.mkdirs();-+/*** Checkboxes for enabled app options*/@@ -77,56 +84,68 @@ public class SettingsActivity extends AppCompatActivity {final EditText phoneNumber = (EditText)- this.findViewById(R.id.phone_number);+ this.findViewById(R.id.phone_number);final EditText remoteAccessOnion = (EditText)this.findViewById(R.id.remote_access_onion);+ remoteAccessCredential = (EditText)+ this.findViewById(R.id.remote_access_credential);++final ActualNumberPicker timerDelay = (ActualNumberPicker)this.findViewById(R.id.timer_delay);smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {-- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {- if (isChecked) {- askForPermission(Manifest.permission.SEND_SMS,6);- }- }- });++ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {+ if (isChecked) {+ askForPermission(Manifest.permission.SEND_SMS, 6);+ }+ }+ });remoteAccessCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {@Overridepublic void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {if (isChecked) {checkRemoteAccessOnion();+ app.startServer();+ }+ else+ {+ app.stopServer();}}});-if (preferences.getCameraActivation()) {String camera = preferences.getCamera();- if (camera.equals(PreferenceManager.FRONT))- ((RadioButton)findViewById(R.id.radio_camera_front)).setChecked(true);- else if (camera.equals(PreferenceManager.BACK))- ((RadioButton)findViewById(R.id.radio_camera_back)).setChecked(true);+ if (camera.equals(PreferenceManager.FRONT))+ ((RadioButton) findViewById(R.id.radio_camera_front)).setChecked(true);+ else if (camera.equals(PreferenceManager.BACK))+ ((RadioButton) findViewById(R.id.radio_camera_back)).setChecked(true);else if (camera.equals(PreferenceManager.OFF))- ((RadioButton)findViewById(R.id.radio_camera_none)).setChecked(true);+ ((RadioButton) findViewById(R.id.radio_camera_none)).setChecked(true);}if (preferences.getSmsActivation()) {- smsCheck.setChecked(true);- phoneNumber.setText(preferences.getSmsNumber());+ smsCheck.setChecked(true);+ phoneNumber.setText(preferences.getSmsNumber());}- if (preferences.getRemoteAccessActive())- {+ if (preferences.getRemoteAccessActive()) {remoteAccessCheck.setChecked(true);remoteAccessOnion.setText(preferences.getRemoteAccessOnion() + ":" + WebServer.LOCAL_PORT);}+ if (!TextUtils.isEmpty(preferences.getRemoteAccessCredential()))+ {+ ((EditText)findViewById(R.id.remote_access_credential)).setText(preferences.getRemoteAccessCredential());+ }+timerDelay.setMaxValue(600);timerDelay.setMinValue(0);timerDelay.setValue(preferences.getTimerDelay());@@ -241,6 +260,15 @@ public class SettingsActivity extends AppCompatActivity {preferences.activateRemoteAccess(remoteAccessCheck.isChecked());+ String password = remoteAccessCredential.getText().toString();+ if (TextUtils.isEmpty(preferences.getRemoteAccessCredential())+ || (!password.equals(preferences.getRemoteAccessCredential()))) {+ preferences.setRemoteAccessCredential(password);+ app.stopServer();+ app.startServer();+ }++preferences.setTimerDelay(timerDelay.getValue());setResult(RESULT_OK);diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex bc071c8..c87599b 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -33,6 +33,7 @@ import java.util.Date;import java.util.StringTokenizer;import info.guardianproject.phoneypot.MonitorActivity;+import info.guardianproject.phoneypot.PhoneyPotApp;import info.guardianproject.phoneypot.R;import info.guardianproject.phoneypot.PreferenceManager;import info.guardianproject.phoneypot.model.Event;@@ -63,7 +64,7 @@ public class MonitorService extends Service {/*** Object used to retrieve shared preferences*/- private PreferenceManager prefs = null;+ private PreferenceManager mPrefs = null;/**@@ -106,9 +107,10 @@ public class MonitorService extends Service {PowerManager.WakeLock wakeLock;/*- ** Onion-available Web Server for optional remote access+ **+ * Application*/- WebServer mOnionServer = null;+ PhoneyPotApp mApp = null;/*** Called on service creation, sends a notification@@ -118,11 +120,13 @@ public class MonitorService extends Service {sInstance = this;+ mApp = (PhoneyPotApp)getApplication();+manager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);- prefs = new PreferenceManager(this);+ mPrefs = new PreferenceManager(this);- if (prefs.getRemoteAccessActive())- startServer();+ // if (mPrefs.getRemoteAccessActive())+ // startServer();startSensors();@@ -148,10 +152,6 @@ public class MonitorService extends Service {wakeLock.release();stopSensors();-- if (mOnionServer != null)- mOnionServer.stop();-stopForeground(true);@@ -215,13 +215,13 @@ public class MonitorService extends Service {{mIsRunning = true;- if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {+ if (mPrefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {mAccelManager = new AccelerometerMonitor(this);mBaroMonitor = new BarometerMonitor(this);mLightMonitor = new AmbientLightMonitor(this);}- if (prefs.getMicrophoneSensitivity() != PreferenceManager.OFF)+ if (mPrefs.getMicrophoneSensitivity() != PreferenceManager.OFF)mMicMonitor = new MicrophoneMonitor(this);@@ -231,13 +231,13 @@ public class MonitorService extends Service {{mIsRunning = false;- if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {+ if (mPrefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {mAccelManager.stop(this);mBaroMonitor.stop(this);mLightMonitor.stop(this);}- if (prefs.getMicrophoneSensitivity() != PreferenceManager.OFF)+ if (mPrefs.getMicrophoneSensitivity() != PreferenceManager.OFF)mMicMonitor.stop(this);}@@ -276,18 +276,18 @@ public class MonitorService extends Service {StringBuffer alertMessage = new StringBuffer();alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));- if (prefs.getSignalUsername() != null)+ if (mPrefs.getSignalUsername() != null){//since this is a secure channel, we can add the Onion address- if (prefs.getRemoteAccessActive() && (!TextUtils.isEmpty(prefs.getRemoteAccessOnion())))+ if (mPrefs.getRemoteAccessActive() && (!TextUtils.isEmpty(mPrefs.getRemoteAccessOnion()))){- alertMessage.append(" http://").append(prefs.getRemoteAccessOnion())+ alertMessage.append(" http://").append(mPrefs.getRemoteAccessOnion()).append(':').append(WebServer.LOCAL_PORT);}- SignalSender sender = SignalSender.getInstance(this,prefs.getSignalUsername());+ SignalSender sender = SignalSender.getInstance(this,mPrefs.getSignalUsername());ArrayList<String> recips = new ArrayList<>();- StringTokenizer st = new StringTokenizer(prefs.getSmsNumber(),",");+ StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");while (st.hasMoreTokens())recips.add(st.nextToken());@@ -299,11 +299,11 @@ public class MonitorService extends Service {sender.sendMessage(recips,alertMessage.toString(), attachment);}- else if (prefs.getSmsActivation())+ else if (mPrefs.getSmsActivation()){SmsManager manager = SmsManager.getDefault();- StringTokenizer st = new StringTokenizer(prefs.getSmsNumber(),",");+ StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");while (st.hasMoreTokens())manager.sendTextMessage(st.nextToken(), null, alertMessage.toString(), null, null);@@ -315,16 +315,5 @@ public class MonitorService extends Service {}- private void startServer ()- {- try {- mOnionServer = new WebServer();- mOnionServer.setPassword("foobar");- }- 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.javaindex f8df79e..f037596 100644--- a/src/main/java/info/guardianproject/phoneypot/service/WebServer.java+++ b/src/main/java/info/guardianproject/phoneypot/service/WebServer.java@@ -42,6 +42,7 @@ public class WebServer extends NanoHTTPD {public Response serve(IHTTPSession session) {StringBuffer page = new StringBuffer();+ Cookie cookie = null;if (mPassword != null){@@ -50,12 +51,12 @@ public class WebServer extends NanoHTTPD {if (inPassword != null && mPassword.equals(inPassword)) {mSession = UUID.randomUUID().toString();- session.getCookies().set("sid",mSession,-1);+ cookie = new OnionCookie ("sid",mSession,100000);+ session.getCookies().set(cookie);}- else if (inSid != null && (!mSession.equals(inSid))) {+ else if (inSid == null || (inSid != null && (!mSession.equals(inSid)))) {showLogin(page);return newFixedLengthResponse(page.toString());-}}@@ -74,7 +75,6 @@ public class WebServer extends NanoHTTPD {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;}@@ -106,10 +106,14 @@ public class WebServer extends NanoHTTPD {}page.append("</body></html>\n");- return newFixedLengthResponse(page.toString());+ Response response = newFixedLengthResponse(page.toString());+ session.getCookies().unloadQueue(response);+ return response;}- return newFixedLengthResponse(Response.Status.INTERNAL_ERROR,"text/plain","Error");+ Response response = newFixedLengthResponse(Response.Status.INTERNAL_ERROR,"text/plain","Error");+ session.getCookies().unloadQueue(response);+ return response;}private void showLogin (StringBuffer page) {@@ -206,4 +210,16 @@ public class WebServer extends NanoHTTPD {}+ class OnionCookie extends Cookie+ {++ public OnionCookie(String name, String value, int numDays) {+ super(name, value, numDays);+ }++ public String getHTTPHeader() {+ return super.getHTTPHeader() + "; path=/";+ }+ }+}diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xmlindex 00327fd..ddab0cd 100644--- a/src/main/res/layout/activity_settings.xml+++ b/src/main/res/layout/activity_settings.xml@@ -188,7 +188,13 @@android:layout_height="wrap_content"android:layout_centerHorizontal="true"tools:context=".SettingsActivity" />-+ <EditText+ android:id="@+id/remote_access_credential"+ android:hint="@string/remote_access_credential_hint"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_centerHorizontal="true"+ tools:context=".SettingsActivity" /><LinearLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 97135b1..ed57043 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -97,7 +97,7 @@<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>-+ <string name="remote_access_credential_hint">Set remote access password here</string><string name="camera_front">Front</string><string name="camera_back">Back</string><string name="camera_none">None</string>