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

fix: tokenClaimAirdrop throws NPE on null sender or receiver #17096

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix: tokenClaimAirdrop throws NPE on null sender or receiver #17096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...c/main/java/com/hedera/node/app/service/token/impl/handlers/TokenClaimAirdropHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static com.hedera.hapi.node.base.ResponseCodeEnum.EMPTY_PENDING_AIRDROP_ID_LIST;
import static com.hedera.hapi.node.base.ResponseCodeEnum.INVALID_ACCOUNT_ID;
import static com.hedera.hapi.node.base.ResponseCodeEnum.INVALID_PENDING_AIRDROP_ID;
import static com.hedera.hapi.node.base.ResponseCodeEnum.PENDING_AIRDROP_ID_LIST_TOO_LONG;
import static com.hedera.hapi.node.base.ResponseCodeEnum.PENDING_AIRDROP_ID_REPEATED;
import static com.hedera.hapi.node.base.ResponseCodeEnum.TOKEN_AIRDROP_WITH_FALLBACK_ROYALTY;
Expand Down Expand Up @@ -114,6 +115,11 @@ public void pureChecks(@NonNull TransactionBody txn) throws PreCheckException {

final var uniqueAirdrops = Set.copyOf(pendingAirdrops);
validateTruePreCheck(pendingAirdrops.size() == uniqueAirdrops.size(), PENDING_AIRDROP_ID_REPEATED);

validateTruePreCheck(
pendingAirdrops.stream().allMatch(PendingAirdropId::hasSenderId), INVALID_PENDING_AIRDROP_ID);
validateTruePreCheck(
pendingAirdrops.stream().allMatch(PendingAirdropId::hasReceiverId), INVALID_PENDING_AIRDROP_ID);
}

@Override
Expand Down
28 changes: 28 additions & 0 deletions ...va/com/hedera/node/app/service/token/impl/test/handlers/TokenClaimAirdropHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,34 @@ void pureChecksHasValidPath() {
.doesNotThrowAnyException();
}

@Test
void pureChecksEmptySenderThrows() {
final List<PendingAirdropId> pendingAirdropIds = new ArrayList<>();
pendingAirdropIds.add(PendingAirdropId.newBuilder()
.receiverId(ACCOUNT_ID_3333)
.fungibleTokenType(TOKEN_2468)
.build());
final var txn = newTokenClaimAirdrop(TokenClaimAirdropTransactionBody.newBuilder()
.pendingAirdrops(pendingAirdropIds)
.build());
Assertions.assertThatThrownBy(() -> tokenClaimAirdropHandler.pureChecks(txn))
.isInstanceOf(PreCheckException.class);
}

@Test
void pureChecksEmptyReceiverThrows() {
final List<PendingAirdropId> pendingAirdropIds = new ArrayList<>();
pendingAirdropIds.add(PendingAirdropId.newBuilder()
.senderId(ACCOUNT_ID_4444)
.fungibleTokenType(TOKEN_2468)
.build());
final var txn = newTokenClaimAirdrop(TokenClaimAirdropTransactionBody.newBuilder()
.pendingAirdrops(pendingAirdropIds)
.build());
Assertions.assertThatThrownBy(() -> tokenClaimAirdropHandler.pureChecks(txn))
.isInstanceOf(PreCheckException.class);
}

@Test
void preHandleAccountNotExistPath() throws PreCheckException {
final List<PendingAirdropId> pendingAirdropIds = new ArrayList<>();
Expand Down
8 changes: 7 additions & 1 deletion ...lients/src/main/java/com/hedera/services/bdd/spec/utilops/mod/BodyIdClearingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ETHEREUM_TRANSACTION;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_FILE_ID;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NODE_ACCOUNT;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_PENDING_AIRDROP_ID;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SCHEDULE_ID;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SIGNATURE;
import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID;
Expand Down Expand Up @@ -141,7 +142,12 @@ public class BodyIdClearingStrategy extends IdClearingStrategy<TxnModification>
entry(
"proto.EthereumTransactionBody.call_data",
ExpectedResponse.atConsensus(INVALID_ETHEREUM_TRANSACTION)),
entry("proto.TokenUpdateNftsTransactionBody.token", ExpectedResponse.atIngest(INVALID_TOKEN_ID)));
entry("proto.TokenUpdateNftsTransactionBody.token", ExpectedResponse.atIngest(INVALID_TOKEN_ID)),
entry("proto.PendingAirdropId.receiver_id", ExpectedResponse.atIngest(INVALID_PENDING_AIRDROP_ID)),
entry(
"proto.PendingAirdropId.fungible_token_type",
mhess-swl marked this conversation as resolved.
Show resolved Hide resolved
ExpectedResponse.atConsensus(INVALID_PENDING_AIRDROP_ID)),
entry("proto.PendingAirdropId.sender_id", ExpectedResponse.atIngest(INVALID_PENDING_AIRDROP_ID)));

private static final Map<String, ExpectedResponse> SCHEDULED_CLEARED_ID_RESPONSES = Map.ofEntries(
entry("proto.AccountAmount.accountID", ExpectedResponse.atConsensusOneOf(INVALID_ACCOUNT_ID)));
Expand Down
19 changes: 19 additions & 0 deletions ...st-clients/src/main/java/com/hedera/services/bdd/suites/hip904/TokenClaimAirdropTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.logIt;
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.newKeyNamed;
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.overriding;
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.submitModified;
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.validateChargedUsd;
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.withOpContext;
import static com.hedera.services.bdd.spec.utilops.mod.ModificationUtils.withSuccessivelyVariedBodyIds;
import static com.hedera.services.bdd.suites.HapiSuite.DEFAULT_PAYER;
import static com.hedera.services.bdd.suites.HapiSuite.ONE_HBAR;
import static com.hedera.services.bdd.suites.HapiSuite.ONE_HUNDRED_HBARS;
Expand Down Expand Up @@ -222,6 +224,23 @@ final Stream<DynamicTest> claimFungibleTokenAirdrop() {
getAccountInfo(RECEIVER).hasToken(relationshipWith(NON_FUNGIBLE_TOKEN)));
}

@HapiTest
@DisplayName("fails gracefully with null parameters")
final Stream<DynamicTest> idVariantsTreatedAsExpected() {
return hapiTest(
cryptoCreate(OWNER).balance(ONE_HUNDRED_HBARS),
cryptoCreate(RECEIVER_WITH_0_AUTO_ASSOCIATIONS)
.balance(ONE_HUNDRED_HBARS)
.maxAutomaticTokenAssociations(0),
createFT(FUNGIBLE_TOKEN_1, OWNER, 1000L),
tokenAirdrop(moving(1, FUNGIBLE_TOKEN_1).between(OWNER, RECEIVER_WITH_0_AUTO_ASSOCIATIONS))
.payingWith(OWNER),
submitModified(withSuccessivelyVariedBodyIds(), () -> tokenClaimAirdrop(
pendingAirdrop(OWNER, RECEIVER_WITH_0_AUTO_ASSOCIATIONS, FUNGIBLE_TOKEN_1))
.signedBy(DEFAULT_PAYER, RECEIVER_WITH_0_AUTO_ASSOCIATIONS)
.payingWith(RECEIVER_WITH_0_AUTO_ASSOCIATIONS)));
}

@HapiTest
@DisplayName("single token claim success that receiver paying for it")
final Stream<DynamicTest> singleTokenClaimSuccessThatReceiverPayingForIt() {
Expand Down
Loading