From 88c54ed3b02a723b6d1db1661850ef52a032c48c Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 17 Feb 2022 14:18:07 -0300 Subject: [PATCH] Rename getOnionAddress() to getBaseUrl() This can later include a version parameter as well. --- .../bramble/api/mailbox/MailboxProperties.java | 10 +++++----- .../briarproject/bramble/mailbox/MailboxApiImpl.java | 10 +++++----- .../bramble/mailbox/MailboxPairingTaskImpl.java | 5 +++-- .../bramble/mailbox/MailboxSettingsManagerImpl.java | 2 +- .../bramble/mailbox/MailboxIntegrationTest.java | 2 +- .../bramble/mailbox/MailboxPairingTaskImplTest.java | 7 ++++--- .../mailbox/MailboxSettingsManagerImplTest.java | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java index 26025fc8e..7d8d3c5c4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxProperties.java @@ -8,19 +8,19 @@ import javax.annotation.concurrent.Immutable; @NotNullByDefault public class MailboxProperties { - private final String onionAddress; + private final String baseUrl; private final MailboxAuthToken authToken; private final boolean owner; - public MailboxProperties(String onionAddress, MailboxAuthToken authToken, + public MailboxProperties(String baseUrl, MailboxAuthToken authToken, boolean owner) { - this.onionAddress = onionAddress; + this.baseUrl = baseUrl; this.authToken = authToken; this.owner = owner; } - public String getOnionAddress() { - return onionAddress; + public String getBaseUrl() { + return baseUrl; } public MailboxAuthToken getAuthToken() { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java index 0bf0bef47..e1c67841a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxApiImpl.java @@ -60,7 +60,7 @@ class MailboxApiImpl implements MailboxApi { throws IOException, ApiException { if (!properties.isOwner()) throw new IllegalArgumentException(); Request request = getRequestBuilder(properties.getAuthToken()) - .url(properties.getOnionAddress() + "/setup") + .url(properties.getBaseUrl() + "/setup") .put(EMPTY_REQUEST) .build(); OkHttpClient client = httpClientProvider.get(); @@ -108,7 +108,7 @@ class MailboxApiImpl implements MailboxApi { public void deleteContact(MailboxProperties properties, ContactId contactId) throws IOException, ApiException, TolerableFailureException { if (!properties.isOwner()) throw new IllegalArgumentException(); - String url = properties.getOnionAddress() + "/contacts/" + + String url = properties.getBaseUrl() + "/contacts/" + contactId.getInt(); Request request = getRequestBuilder(properties.getAuthToken()) .delete() @@ -212,7 +212,7 @@ class MailboxApiImpl implements MailboxApi { String path = "/files/" + folderId + "/" + fileId; Request request = getRequestBuilder(properties.getAuthToken()) .delete() - .url(properties.getOnionAddress() + path) + .url(properties.getBaseUrl() + path) .build(); OkHttpClient client = httpClientProvider.get(); Response response = client.newCall(request).execute(); @@ -254,7 +254,7 @@ class MailboxApiImpl implements MailboxApi { private Response sendGetRequest(MailboxProperties properties, String path) throws IOException { Request request = getRequestBuilder(properties.getAuthToken()) - .url(properties.getOnionAddress() + path) + .url(properties.getBaseUrl() + path) .build(); OkHttpClient client = httpClientProvider.get(); return client.newCall(request).execute(); @@ -263,7 +263,7 @@ class MailboxApiImpl implements MailboxApi { private Response sendPostRequest(MailboxProperties properties, String path, RequestBody body) throws IOException { Request request = getRequestBuilder(properties.getAuthToken()) - .url(properties.getOnionAddress() + path) + .url(properties.getBaseUrl() + path) .post(body) .build(); OkHttpClient client = httpClientProvider.get(); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java index 479b59f4d..ac288b432 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImpl.java @@ -110,7 +110,7 @@ class MailboxPairingTaskImpl implements MailboxPairingTask { } MailboxAuthToken ownerToken = api.setup(mailboxProperties); MailboxProperties ownerProperties = new MailboxProperties( - mailboxProperties.getOnionAddress(), ownerToken, true); + mailboxProperties.getBaseUrl(), ownerToken, true); db.transaction(false, txn -> mailboxSettingsManager .setOwnMailboxProperties(txn, ownerProperties)); synchronized (lock) { @@ -158,9 +158,10 @@ class MailboxPairingTaskImpl implements MailboxPairingTask { LOG.info("QR code is valid"); byte[] onionPubKey = Arrays.copyOfRange(bytes, 1, 33); String onionAddress = crypto.encodeOnionAddress(onionPubKey); + String baseUrl = "http://" + onionAddress + ".onion"; byte[] tokenBytes = Arrays.copyOfRange(bytes, 33, 65); MailboxAuthToken setupToken = new MailboxAuthToken(tokenBytes); - return new MailboxProperties(onionAddress, setupToken, true); + return new MailboxProperties(baseUrl, setupToken, true); } } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java index bfb9f085e..4e0065037 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImpl.java @@ -57,7 +57,7 @@ class MailboxSettingsManagerImpl implements MailboxSettingsManager { public void setOwnMailboxProperties(Transaction txn, MailboxProperties p) throws DbException { Settings s = new Settings(); - s.put(SETTINGS_KEY_ONION, p.getOnionAddress()); + s.put(SETTINGS_KEY_ONION, p.getBaseUrl()); s.put(SETTINGS_KEY_TOKEN, p.getAuthToken().toString()); settingsManager.mergeSettings(txn, s, SETTINGS_NAMESPACE); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxIntegrationTest.java index eccb311ed..f0b130059 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxIntegrationTest.java @@ -131,7 +131,7 @@ public class MailboxIntegrationTest extends BrambleTestCase { ContactId contactId = new ContactId(1); MailboxContact contact = getMailboxContact(contactId); MailboxProperties contactProperties = new MailboxProperties( - ownerProperties.getOnionAddress(), contact.token, false); + ownerProperties.getBaseUrl(), contact.token, false); api.addContact(ownerProperties, contact); // upload a file for our contact diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java index 619eafd4b..47c937eea 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPairingTaskImplTest.java @@ -44,15 +44,16 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase { private final String onion = getRandomString(64); private final byte[] onionBytes = getRandomBytes(32); + private final String onionAddress = "http://" + onion + ".onion"; private final MailboxAuthToken setupToken = new MailboxAuthToken(getRandomId()); private final MailboxAuthToken ownerToken = new MailboxAuthToken(getRandomId()); private final String validPayload = getValidPayload(); private final MailboxProperties setupProperties = - new MailboxProperties(onion, setupToken, true); + new MailboxProperties(onionAddress, setupToken, true); private final MailboxProperties ownerProperties = - new MailboxProperties(onion, ownerToken, true); + new MailboxProperties(onionAddress, ownerToken, true); @Test public void testInitialQrCodeReceivedState() { @@ -180,7 +181,7 @@ public class MailboxPairingTaskImplTest extends BrambleMockTestCase { private PredicateMatcher matches(MailboxProperties p2) { return new PredicateMatcher<>(MailboxProperties.class, p1 -> p1.getAuthToken().equals(p2.getAuthToken()) && - p1.getOnionAddress().equals(p2.getOnionAddress()) && + p1.getBaseUrl().equals(p2.getBaseUrl()) && p1.isOwner() == p2.isOwner()); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java index 57aa8894a..21fe9266f 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxSettingsManagerImplTest.java @@ -73,7 +73,7 @@ public class MailboxSettingsManagerImplTest extends BrambleMockTestCase { MailboxProperties properties = manager.getOwnMailboxProperties(txn); assertNotNull(properties); - assertEquals(onion, properties.getOnionAddress()); + assertEquals(onion, properties.getBaseUrl()); assertEquals(token, properties.getAuthToken()); assertTrue(properties.isOwner()); }