Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Throw TolerableFailureException when deleting a contact returns 404

Browse Source
This commit is contained in:
Torsten Grote
2022-01-07 12:03:21 -03:00
parent df4e6aa207
commit f5cdad9100
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApi.java
View File

@@ -50,9 +50,12 @@ interface MailboxApi {
/** /**
* Gets a list of {@link ContactId}s from the mailbox. * Gets a list of {@link ContactId}s from the mailbox.
* These are the contacts that the mailbox already knows about. * These are the contacts that the mailbox already knows about.
*
* @throws TolerableFailureException if response code is 404
* (contact probably was already deleted).
*/ */
Collection<ContactId> getContacts(MailboxProperties properties) Collection<ContactId> getContacts(MailboxProperties properties)
throws IOException, ApiException; throws IOException, ApiException, TolerableFailureException;
@Immutable @Immutable
@JsonSerialize @JsonSerialize

24
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java
View File

@@ -89,11 +89,7 @@ class MailboxApiImpl implements MailboxApi {
public boolean checkStatus(MailboxProperties properties) public boolean checkStatus(MailboxProperties properties)
throws IOException, ApiException { throws IOException, ApiException {
if (!properties.isOwner()) throw new IllegalArgumentException(); if (!properties.isOwner()) throw new IllegalArgumentException();
Request request = getRequestBuilder(properties.getAuthToken()) Response response = sendGetRequest(properties, "/status");
.url(properties.getOnionAddress() + "/status")
.build();
OkHttpClient client = httpClientProvider.get();
Response response = client.newCall(request).execute();
if (response.code() == 401) throw new ApiException(); if (response.code() == 401) throw new ApiException();
return response.isSuccessful(); return response.isSuccessful();
} }
@@ -132,13 +128,10 @@ class MailboxApiImpl implements MailboxApi {
@Override @Override
public Collection<ContactId> getContacts(MailboxProperties properties) public Collection<ContactId> getContacts(MailboxProperties properties)
throws IOException, ApiException { throws IOException, ApiException, TolerableFailureException {
if (!properties.isOwner()) throw new IllegalArgumentException(); if (!properties.isOwner()) throw new IllegalArgumentException();
Request request = getRequestBuilder(properties.getAuthToken()) Response response = sendGetRequest(properties, "/contacts");
.url(properties.getOnionAddress() + "/contacts") if (response.code() == 404) throw new TolerableFailureException();
.build();
OkHttpClient client = httpClientProvider.get();
Response response = client.newCall(request).execute();
if (response.code() != 200) throw new ApiException(); if (response.code() != 200) throw new ApiException();
ResponseBody body = response.body(); ResponseBody body = response.body();
@@ -162,6 +155,15 @@ class MailboxApiImpl implements MailboxApi {
} }
} }
private Response sendGetRequest(MailboxProperties properties, String path)
throws IOException {
Request request = getRequestBuilder(properties.getAuthToken())
.url(properties.getOnionAddress() + path)
.build();
OkHttpClient client = httpClientProvider.get();
return client.newCall(request).execute();
}
private Request.Builder getRequestBuilder(String token) { private Request.Builder getRequestBuilder(String token) {
return new Request.Builder() return new Request.Builder()
.addHeader("Authorization", "Bearer " + token); .addHeader("Authorization", "Bearer " + token);

9
bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxApiTest.java
View File

@@ -286,6 +286,7 @@ public class MailboxApiTest extends BrambleTestCase {
server.enqueue(new MockResponse().setBody(invalidResponse3)); server.enqueue(new MockResponse().setBody(invalidResponse3));
server.enqueue(new MockResponse().setResponseCode(401)); server.enqueue(new MockResponse().setResponseCode(401));
server.enqueue(new MockResponse().setResponseCode(500)); server.enqueue(new MockResponse().setResponseCode(500));
server.enqueue(new MockResponse().setResponseCode(404));
server.start(); server.start();
String baseUrl = getBaseUrl(server); String baseUrl = getBaseUrl(server);
MailboxProperties properties = MailboxProperties properties =
@@ -349,6 +350,14 @@ public class MailboxApiTest extends BrambleTestCase {
assertEquals("/contacts", request8.getPath()); assertEquals("/contacts", request8.getPath());
assertEquals("GET", request8.getMethod()); assertEquals("GET", request8.getMethod());
assertToken(request8, token); assertToken(request8, token);
// tolerable 404 not found error
assertThrows(TolerableFailureException.class,
() -> api.getContacts(properties));
RecordedRequest request9 = server.takeRequest();
assertEquals("/contacts", request9.getPath());
assertEquals("GET", request9.getMethod());
assertToken(request9, token);
} }
@Test @Test