empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Prevent changes to conversations while device is unregistered."

Browse source 
This reverts commit ed8edb5aee.
This commit is contained in:
Cody Henthorne 2021-04-14 18:02:57 -04:00
parent 9363f0ebb4
commit 2547db2a8e
5 changed files with 6 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/net/PipeConnectivityListener.java
View file

@ -70,10 +70,6 @@ public class PipeConnectivityListener implements ConnectivityListener {
Log.w(TAG, "Encountered an error while we had a proxy set! Terminating the connection to prevent retry spam.");
ApplicationDependencies.closeConnections();
return false;
} else if (TextSecurePreferences.isUnauthorizedRecieved(ApplicationDependencies.getApplication())) {
Log.w(TAG, "Encountered an error while unregistered! Terminating the connection to prevent retry spam.");
ApplicationDependencies.closeConnections();
return false;
} else {
return true;
}

41
app/src/main/java/org/thoughtcrime/securesms/net/UnregisteredBlockingInterceptor.java
View file

@ -1,41 +0,0 @@
package org.thoughtcrime.securesms.net;
import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.internal.push.PushServiceSocket;
import java.io.IOException;
import okhttp3.Interceptor;
import okhttp3.Protocol;
import okhttp3.Response;
import okhttp3.ResponseBody;
/**
* Blocks network access when device is unregistered.
*/
public final class UnregisteredBlockingInterceptor implements Interceptor {
private static final String TAG = Log.tag(UnregisteredBlockingInterceptor.class);
@Override
public @NonNull Response intercept(@NonNull Chain chain) throws IOException {
if (TextSecurePreferences.isUnauthorizedRecieved(ApplicationDependencies.getApplication()) &&
PushServiceSocket.isNotRegistrationPath(chain.request().url().encodedPath()))
{
Log.w(TAG, "Preventing request because device is unregistered.");
return new Response.Builder().request(chain.request())
.protocol(Protocol.HTTP_1_1)
.receivedResponseAtMillis(System.currentTimeMillis())
.message("")
.body(ResponseBody.create(null, ""))
.code(508)
.build();
}
return chain.proceed(chain.request());
}
}

8
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
View file

@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.push;
import android.content.Context;
import androidx.annotation.Nullable;
import com.annimon.stream.Stream;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
import org.thoughtcrime.securesms.net.RemoteDeprecationDetectorInterceptor;
import org.thoughtcrime.securesms.net.SequentialDns;
import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
import org.thoughtcrime.securesms.net.UnregisteredBlockingInterceptor;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libsignal.util.guava.Optional;
@ -35,6 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.net.ssl.SSLContext;
import okhttp3.CipherSuite;
import okhttp3.ConnectionSpec;
import okhttp3.Dns;
@ -184,7 +185,6 @@ public class SignalServiceNetworkAccess {
final List<Interceptor> interceptors = Arrays.asList(new StandardUserAgentInterceptor(),
new RemoteDeprecationDetectorInterceptor(),
new DeprecatedClientPreventionInterceptor(),
new UnregisteredBlockingInterceptor(),
DeviceTransferBlockingInterceptor.getInstance());
final Optional<Dns> dns = Optional.of(DNS);

6
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View file

@ -466,12 +466,6 @@ public class TextSecurePreferences {
}
public static void setUnauthorizedReceived(Context context, boolean value) {
if (value) {
ApplicationDependencies.closeConnections();
} else {
ApplicationDependencies.getIncomingMessageObserver();
}
setBooleanPreference(context, UNAUTHORIZED_RECEIVED, value);
}

29
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View file

@ -121,7 +121,6 @@ import java.io.UnsupportedEncodingException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@ -224,13 +223,8 @@ public class PushServiceSocket {
private static final String SERVER_DELIVERED_TIMESTAMP_HEADER = "X-Signal-Timestamp";
private static final Map<String, String> NO_HEADERS = Collections.emptyMap();
private static final ResponseCodeHandler NO_HANDLER = new EmptyResponseCodeHandler();
private static final List<String> REQUIRED_REGISTRATION_PATHS = Arrays.asList(CREATE_ACCOUNT_SMS_PATH,
REQUEST_PUSH_CHALLENGE,
VERIFY_ACCOUNT_CODE_PATH,
PREKEY_METADATA_PATH,
REGISTER_GCM_PATH);
private static final Map<String, String> NO_HEADERS = Collections.emptyMap();
private static final ResponseCodeHandler NO_HANDLER = new EmptyResponseCodeHandler();
private static final long CDN2_RESUMABLE_LINK_LIFETIME_MILLIS = TimeUnit.DAYS.toMillis(7);
@ -2169,25 +2163,6 @@ public class PushServiceSocket {
}
}
public static boolean isNotRegistrationPath(String path) {
if (path == null || path.isEmpty()) {
return true;
}
for (String registrationPath : REQUIRED_REGISTRATION_PATHS) {
String trimmedRegistrationPath = registrationPath;
int replacementIndex = registrationPath.indexOf("%s");
if (replacementIndex >= 0) {
trimmedRegistrationPath = trimmedRegistrationPath.substring(0, replacementIndex);
}
if (path.startsWith(trimmedRegistrationPath)) {
return false;
}
}
return true;
}
public static final class GroupHistory {
private final GroupChanges groupChanges;
private final Optional<ContentRange> contentRange;