Skip to content

Fixing encryption create with contentResponseOnWriteEnabled false #23218

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

Merged
simplynaveen20 merged 3 commits into from
Jul 29, 2021
Merged

Fixing encryption create with contentResponseOnWriteEnabled false #23218

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
87ffb29
Fixing encryption create with contentResponseOnWriteEnabled false
simplynaveen20 Jul 28, 2021
3bcdc1e
resolving comments
simplynaveen20 Jul 28, 2021
e96497a
fixing spot bugs
simplynaveen20 Jul 28, 2021
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: 5 additions & 1 deletion ...-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionAsyncContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ public <T> Mono<CosmosItemResponse<T>> readItem(String id,
PartitionKey partitionKey,
CosmosItemRequestOptions requestOptions,
Class<T> classType) {
if (requestOptions == null) {
requestOptions = new CosmosItemRequestOptions();
}

Mono<CosmosItemResponse<byte[]>> responseMessageMono = this.readItemHelper(id, partitionKey, requestOptions, false);

return responseMessageMono.publishOn(encryptionScheduler).flatMap(cosmosItemResponse -> setByteArrayContent(cosmosItemResponse,
Expand Down Expand Up @@ -311,7 +315,7 @@ private Mono<CosmosItemResponse<byte[]>> setByteArrayContent(CosmosItemResponse<
this.cosmosItemResponseBuilderAccessor.setByteArrayContent(rsp, bytes);
return Mono.just(rsp);
}
);
).defaultIfEmpty(rsp);
}

private <T> Function<CosmosPagedFluxOptions, Flux<FeedResponse<T>>> queryDecryptionTransformer(Class<T> classType,
Expand Down
6 changes: 5 additions & 1 deletion ...ryption/src/main/java/com/azure/cosmos/encryption/implementation/EncryptionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,12 @@ public Mono<byte[]> decrypt(byte[] input) {
input == null ? null : input.length,
Thread.currentThread().getName());
}
ObjectNode itemJObj = Utils.parse(input, ObjectNode.class);

if (input == null || input.length == 0) {
return Mono.empty();
}

ObjectNode itemJObj = Utils.parse(input, ObjectNode.class);
assert (itemJObj != null);
return initEncryptionSettingsIfNotInitializedAsync().then(Mono.defer(() -> {
for (ClientEncryptionIncludedPath includedPath : this.clientEncryptionPolicy.getIncludedPaths()) {
Expand Down
13 changes: 12 additions & 1 deletion ...smos-encryption/src/test/java/com/azure/cosmos/encryption/EncryptionAsyncApiCrudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public EncryptionAsyncApiCrudTest(CosmosClientBuilder clientBuilder) {
public void before_CosmosItemTest() {
assertThat(this.client).isNull();
this.client = getClientBuilder().buildAsyncClient();
EncryptionKeyStoreProvider encryptionKeyStoreProvider = new TestEncryptionKeyStoreProvider();
TestEncryptionKeyStoreProvider encryptionKeyStoreProvider = new TestEncryptionKeyStoreProvider();
cosmosAsyncDatabase = getSharedCosmosDatabase(this.client);
cosmosEncryptionAsyncClient = CosmosEncryptionAsyncClient.createCosmosEncryptionAsyncClient(this.client,
encryptionKeyStoreProvider);
Expand Down Expand Up @@ -123,6 +123,17 @@ public void createItemEncrypt_readItemDecrypt() {
validateResponse(properties, responseItem);
}

@Test(groups = {"encryption"}, timeOut = TIMEOUT)
public void createItemEncryptWithContentResponseOnWriteEnabledFalse() {
CosmosItemRequestOptions requestOptions = new CosmosItemRequestOptions();
requestOptions.setContentResponseOnWriteEnabled(false);
EncryptionPojo properties = getItem(UUID.randomUUID().toString());
CosmosItemResponse<EncryptionPojo> itemResponse = cosmosEncryptionAsyncContainer.createItem(properties,
new PartitionKey(properties.getMypk()), requestOptions).block();
assertThat(itemResponse.getRequestCharge()).isGreaterThan(0);
assertThat(itemResponse.getItem()).isNull();
}

@Test(groups = {"encryption"}, timeOut = TIMEOUT)
public void upsertItem_readItem() {
EncryptionPojo properties = getItem(UUID.randomUUID().toString());
Expand Down