Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Scrub Bluetooth MAC addresses before logging

Browse Source
This commit is contained in:
Torsten Grote
2016-08-23 13:46:22 -03:00
parent 83be5c766e
commit ca094620d8
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -172,7 +172,7 @@ class DroidtoothPlugin implements DuplexPlugin {
String address = AndroidUtils.getBluetoothAddress(appContext, String address = AndroidUtils.getBluetoothAddress(appContext,
adapter); adapter);
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Local address " + address); LOG.info("Local address " + scrub(address));
if (!StringUtils.isNullOrEmpty(address)) { if (!StringUtils.isNullOrEmpty(address)) {
// Advertise the Bluetooth address to contacts // Advertise the Bluetooth address to contacts
TransportProperties p = new TransportProperties(); TransportProperties p = new TransportProperties();
@@ -237,7 +237,7 @@ class DroidtoothPlugin implements DuplexPlugin {
} }
if (LOG.isLoggable(INFO)) { if (LOG.isLoggable(INFO)) {
String address = s.getRemoteDevice().getAddress(); String address = s.getRemoteDevice().getAddress();
LOG.info("Connection from " + address); LOG.info("Connection from " + scrub(address));
} }
backoff.reset(); backoff.reset();
callback.incomingConnectionCreated(wrapSocket(s)); callback.incomingConnectionCreated(wrapSocket(s));
@@ -307,6 +307,7 @@ class DroidtoothPlugin implements DuplexPlugin {
// Validate the address // Validate the address
if (!BluetoothAdapter.checkBluetoothAddress(address)) { if (!BluetoothAdapter.checkBluetoothAddress(address)) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
// not scrubbing here to be able to figure out the problem
LOG.warning("Invalid address " + address); LOG.warning("Invalid address " + address);
return null; return null;
} }
@@ -323,13 +324,15 @@ class DroidtoothPlugin implements DuplexPlugin {
BluetoothSocket s = null; BluetoothSocket s = null;
try { try {
s = d.createInsecureRfcommSocketToServiceRecord(u); s = d.createInsecureRfcommSocketToServiceRecord(u);
if (LOG.isLoggable(INFO)) LOG.info("Connecting to " + address); if (LOG.isLoggable(INFO))
LOG.info("Connecting to " + scrub(address));
s.connect(); s.connect();
if (LOG.isLoggable(INFO)) LOG.info("Connected to " + address); if (LOG.isLoggable(INFO))
LOG.info("Connected to " + scrub(address));
return s; return s;
} catch (IOException e) { } catch (IOException e) {
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Failed to connect to " + address); LOG.info("Failed to connect to " + scrub(address));
tryToClose(s); tryToClose(s);
return null; return null;
} }
@@ -487,6 +490,12 @@ class DroidtoothPlugin implements DuplexPlugin {
return new DroidtoothTransportConnection(this, s); return new DroidtoothTransportConnection(this, s);
} }
private static String scrub(String address) {
return address.substring(0, 3) +
"[scrubbed]" +
address.substring(14, 17);
}
private class BluetoothStateReceiver extends BroadcastReceiver { private class BluetoothStateReceiver extends BroadcastReceiver {
@Override @Override
@@ -567,7 +576,7 @@ class DroidtoothPlugin implements DuplexPlugin {
} else if (action.equals(FOUND)) { } else if (action.equals(FOUND)) {
BluetoothDevice d = intent.getParcelableExtra(EXTRA_DEVICE); BluetoothDevice d = intent.getParcelableExtra(EXTRA_DEVICE);
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Discovered device: " + d.getAddress()); LOG.info("Discovered device: " + scrub(d.getAddress()));
addresses.add(d.getAddress()); addresses.add(d.getAddress());
} }
} }