Skip to content

Commit 3cfbcde

Browse files
MB-61292: Fix ns_bucket:get_encryption
It should check if bucket exists on that node first, and only after that it should check if encryption is enabled. Reason: if get_encryption() returns disabled, cb_cluster_secrets assumes that the bucket is present on that node. Change-Id: Id3755f16ba0a67c9beecb2fc65c10b9d6132272d Reviewed-on: https://review.couchbase.org/c/ns_server/+/215090 Reviewed-by: Navdeep S Boparai <[email protected]> Tested-by: Build Bot <[email protected]> Well-Formed: Build Bot <[email protected]> Tested-by: Timofey Barmin <[email protected]>
1 parent 11081ec commit 3cfbcde

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

apps/ns_server/src/ns_bucket.erl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,14 +2521,15 @@ validate_encryption_secret(SecretId, Bucket, Snapshot) ->
25212521
get_encryption(BucketName, Snapshot) ->
25222522
case get_bucket(BucketName, Snapshot) of
25232523
{ok, BucketConfig} ->
2524-
case proplists:get_value(encryption_secret_id, BucketConfig,
2525-
?SECRET_ID_NOT_SET) of
2526-
?SECRET_ID_NOT_SET -> {ok, disabled};
2527-
Id ->
2528-
case lists:member(node(), get_servers(BucketConfig)) of
2529-
true -> {ok, {secret, Id}};
2530-
false -> {error, not_found}
2531-
end
2524+
case lists:member(node(), get_servers(BucketConfig)) of
2525+
true ->
2526+
case proplists:get_value(encryption_secret_id, BucketConfig,
2527+
?SECRET_ID_NOT_SET) of
2528+
?SECRET_ID_NOT_SET -> {ok, disabled};
2529+
Id -> {ok, {secret, Id}}
2530+
end;
2531+
false ->
2532+
{error, not_found}
25322533
end;
25332534
not_present ->
25342535
{error, not_found}

0 commit comments

Comments
 (0)