Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow partyinfo to update url #952

Merged
merged 3 commits into from
Dec 31, 2019
Merged

Allow partyinfo to update url #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45d5c5a
Allow partyinfo to update existing key with new url. This was the beh…
namtruong Dec 31, 2019
97bc8b6
Update unit test for partyinfo service
namtruong Dec 31, 2019
5ec814a
Merge branch 'master' into allow-partyinfo-to-update-url
namtruong Dec 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tessera-partyinfo/src/main/java/com/quorum/tessera/partyinfo/PartyInfoServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public PartyInfo updatePartyInfo(final PartyInfo partyInfo) {

if (!this.validateKeysToUrls(existingPartyInfo, partyInfo)) {
LOGGER.warn(
"Attempt is being made to update existing key with new url. Terminating party info update.");
return this.getPartyInfo();
"Attempt is being made to update existing key with new url. " +
"Please switch on remote key validation to avoid a security breach.");
}
}

Expand Down
3 changes: 2 additions & 1 deletion tessera-partyinfo/src/test/java/com/quorum/tessera/partyinfo/PartyInfoServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public void createWithFactoryConstructor() throws Exception {
}

@Test
public void attemptToUpdateRecipientWithExistingKeyWithNewUrlIsIgnoredIfToggleDisabled() {
public void attemptToUpdateRecipientWithExistingKeyWithNewUrlIfToggleDisabled() {
// setup services
final FeatureToggles featureToggles = new FeatureToggles();
featureToggles.setEnableRemoteKeyValidation(false);
Expand Down Expand Up @@ -305,6 +305,7 @@ public void attemptToUpdateRecipientWithExistingKeyWithNewUrlIsIgnoredIfToggleDi
assertThat(updatedInfo.getRecipients()).hasSize(1).containsExactly(new Recipient(testKey, uri));
verify(partyInfoStore, times(2)).getPartyInfo();
verify(configService).featureToggles();
verify(configService).isDisablePeerDiscovery();
}

@Test
Expand Down