CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ask for confirmation before showing the payload

Browse Source 
Payload information can contain sensitive data. A scam alert is now shown
before the first time the payload tab is open. This should prevent scam
attempts.
This commit is contained in:
emanuele-f 2022-07-11 11:54:12 +02:00
parent fefd477d4f
commit f8a59ecbcf
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
View File

@ -20,7 +20,9 @@
package com.emanuelef.remote_capture.fragments;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -31,7 +33,9 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
import com.emanuelef.remote_capture.CaptureService;
import com.emanuelef.remote_capture.ConnectionsRegister;
@ -41,6 +45,7 @@ import com.emanuelef.remote_capture.activities.ConnectionDetailsActivity;
import com.emanuelef.remote_capture.adapters.PayloadAdapter;
import com.emanuelef.remote_capture.model.ConnectionDescriptor;
import com.emanuelef.remote_capture.model.PayloadChunk;
import com.emanuelef.remote_capture.model.Prefs;
import com.emanuelef.remote_capture.views.EmptyRecyclerView;
public class ConnectionPayload extends Fragment implements ConnectionDetailsActivity.ConnUpdateListener {
@ -49,6 +54,7 @@ public class ConnectionPayload extends Fragment implements ConnectionDetailsActi
private ConnectionDescriptor mConn;
private PayloadAdapter mAdapter;
private TextView mTruncatedWarning;
private EmptyRecyclerView mRecyclerView;
private int mCurChunks;
private Menu mMenu;
private boolean mJustCreated;
@ -99,9 +105,9 @@ public class ConnectionPayload extends Fragment implements ConnectionDetailsActi
return;
}
EmptyRecyclerView recyclerView = view.findViewById(R.id.payload);
mRecyclerView = view.findViewById(R.id.payload);
EmptyRecyclerView.MyLinearLayoutManager layoutMan = new EmptyRecyclerView.MyLinearLayoutManager(requireContext());
recyclerView.setLayoutManager(layoutMan);
mRecyclerView.setLayoutManager(layoutMan);
mTruncatedWarning = view.findViewById(R.id.truncated_warning);
mTruncatedWarning.setText(String.format(getString(R.string.payload_truncated), getString(R.string.full_payload)));
@ -110,8 +116,39 @@ public class ConnectionPayload extends Fragment implements ConnectionDetailsActi
mAdapter = new PayloadAdapter(requireContext(), mConn, mode);
mCurChunks = mConn.getNumPayloadChunks();
recyclerView.setAdapter(mAdapter);
mJustCreated = true;
// only set adapter after acknowledged (see setMenuVisibility below)
if(payloadNoticeAcknowledged(PreferenceManager.getDefaultSharedPreferences(requireContext())))
mRecyclerView.setAdapter(mAdapter);
}
@Override
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
Log.d(TAG, "setMenuVisibility : " + menuVisible);
Context context = requireContext();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if(menuVisible && !payloadNoticeAcknowledged(prefs)) {
AlertDialog dialog = new AlertDialog.Builder(context)
.setTitle(R.string.scam_alert)
.setMessage(R.string.payload_scams_notice)
.setOnCancelListener((d) -> requireActivity().finish())
.setNegativeButton(R.string.cancel_action, (d, b) -> requireActivity().finish())
.setPositiveButton(R.string.show_data_action, (d, whichButton) -> {
// show the data
mRecyclerView.setAdapter(mAdapter);
prefs.edit().putBoolean(Prefs.PREF_PAYLOAD_NOTICE_ACK, true).apply();
}).show();
dialog.setCanceledOnTouchOutside(false);
}
}
private boolean payloadNoticeAcknowledged(SharedPreferences prefs) {
return prefs.getBoolean(Prefs.PREF_PAYLOAD_NOTICE_ACK, false);
}
@Override

1
app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java
View File

@ -76,6 +76,7 @@ public class Prefs {
public static final String PREF_LOCKDOWN_VPN_NOTICE_SHOWN = "vpn_lockdown_notice";
public static final String PREF_VPN_EXCEPTIONS = "vpn_exceptions";
public static final String PREF_BLOCK_NEW_APPS = "block_new_apps";
public static final String PREF_PAYLOAD_NOTICE_ACK = "payload_notice";
public enum DumpMode {
NONE,

4
app/src/main/res/values/strings.xml
View File

@ -382,4 +382,8 @@
<string name="block_new_apps">Block newly installed apps</string>
<string name="app_blocked">App blocked</string>
<string name="app_blocked_info">The %1$s app has been blocked by the firewall</string>
<string name="scam_alert">Scam alert</string>
<string name="payload_scams_notice">This view may contain sensitive information, like your passwords and access tokens.\n\nNever give out this information to anyone, it may be a scam attempt</string>
<string name="cancel_action">Cancel</string>
<string name="show_data_action">Show data</string>
</resources>