-
Notifications
You must be signed in to change notification settings - Fork 593
HDDS-6214. [Multi-Tenant] Fix KMS Encryption/Decryption #3010
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.
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
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b73dc44
HDDS-6214. [Multi-Tenant] Fix KMS Encryption/Decryption
smengcl 2a9d719
Fix TestRootList.
smengcl 2c47725
Cleanup.
smengcl 982f41d
Retrigger CI
smengcl 1f40395
Address comments.
smengcl 94c3676
Move `getS3Volume` set S3Auth logic to `ObjectStore`; Rename `GetS3Vo…
smengcl db5f45b
`getS3VolumeInfo()` now returns `S3VolumeInfo` instead of protobuf cl…
smengcl 6b74131
Add `DeleteTenantInfo` helper class to fix the same issue with `delet…
smengcl b6359ae
Rename S3VolumeInfo -> S3VolumeContext per Aravindan's request.
smengcl 2b2d29a
GetS3VolumeRequest -> GetS3VolumeContextRequest; GetS3Volume -> GetS3…
smengcl f328077
Address comment.
smengcl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/DeleteTenantInfo.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
| package org.apache.hadoop.ozone.om.helpers; | ||
|
|
||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteTenantResponse; | ||
|
|
||
| /** | ||
| * A class that encapsulates DeleteTenantResponse protobuf message. | ||
| */ | ||
| public class DeleteTenantInfo { | ||
|
|
||
| /** | ||
| * Volume name associated to the deleted tenant. | ||
| */ | ||
| private final String volumeName; | ||
|
|
||
| /** | ||
| * Reference count remaining of the volume associated to the deleted tenant. | ||
| */ | ||
| private final long volRefCount; | ||
|
|
||
| public DeleteTenantInfo(String volumeName, long volRefCount) { | ||
| this.volumeName = volumeName; | ||
| this.volRefCount = volRefCount; | ||
| } | ||
|
|
||
| public String getVolumeName() { | ||
| return volumeName; | ||
| } | ||
|
|
||
| public long getVolRefCount() { | ||
| return volRefCount; | ||
| } | ||
|
|
||
| public static DeleteTenantInfo fromProtobuf(DeleteTenantResponse resp) { | ||
| return new DeleteTenantInfo(resp.getVolumeName(), resp.getVolRefCount()); | ||
| } | ||
|
|
||
| public DeleteTenantResponse getProtobuf() { | ||
| return DeleteTenantResponse.newBuilder() | ||
| .setVolumeName(volumeName) | ||
| .setVolRefCount(volRefCount) | ||
| .build(); | ||
| } | ||
|
|
||
| public static DeleteTenantInfo.Builder newBuilder() { | ||
| return new DeleteTenantInfo.Builder(); | ||
| } | ||
|
|
||
| /** | ||
| * Builder for TenantDeleted. | ||
| */ | ||
| @SuppressWarnings("checkstyle:hiddenfield") | ||
| public static final class Builder { | ||
| private String volumeName; | ||
| private long volRefCount; | ||
|
|
||
| private Builder() { | ||
| } | ||
|
|
||
| public Builder setVolumeName(String volumeName) { | ||
| this.volumeName = volumeName; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder setVolRefCount(long volRefCount) { | ||
| this.volRefCount = volRefCount; | ||
| return this; | ||
| } | ||
|
|
||
| public DeleteTenantInfo build() { | ||
| return new DeleteTenantInfo(volumeName, volRefCount); | ||
| } | ||
| } | ||
| } |
94 changes: 94 additions & 0 deletions
94
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3VolumeContext.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
| package org.apache.hadoop.ozone.om.helpers; | ||
|
|
||
| import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.GetS3VolumeContextResponse; | ||
|
|
||
| /** | ||
| * A class that encapsulates GetS3VolumeContextResponse protobuf message. | ||
| */ | ||
| public class S3VolumeContext { | ||
|
|
||
| /** | ||
| * Various volume arguments. | ||
| */ | ||
| private final OmVolumeArgs omVolumeArgs; | ||
|
|
||
| /** | ||
| * Piggybacked username (principal) response. | ||
| * To be used for client-side operations involving KMS like getDEK(). | ||
| */ | ||
| private final String userPrincipal; | ||
|
|
||
| public S3VolumeContext(OmVolumeArgs omVolumeArgs, String userPrincipal) { | ||
| this.omVolumeArgs = omVolumeArgs; | ||
| this.userPrincipal = userPrincipal; | ||
| } | ||
|
|
||
| public OmVolumeArgs getOmVolumeArgs() { | ||
| return omVolumeArgs; | ||
| } | ||
|
|
||
| public String getUserPrincipal() { | ||
| return userPrincipal; | ||
| } | ||
|
|
||
| public static S3VolumeContext fromProtobuf(GetS3VolumeContextResponse resp) { | ||
| return new S3VolumeContext( | ||
| OmVolumeArgs.getFromProtobuf(resp.getVolumeInfo()), | ||
| resp.getUserPrincipal()); | ||
| } | ||
|
|
||
| public GetS3VolumeContextResponse getProtobuf() { | ||
| return GetS3VolumeContextResponse.newBuilder() | ||
| .setVolumeInfo(omVolumeArgs.getProtobuf()) | ||
| .setUserPrincipal(userPrincipal) | ||
| .build(); | ||
| } | ||
|
|
||
| public static S3VolumeContext.Builder newBuilder() { | ||
| return new S3VolumeContext.Builder(); | ||
| } | ||
|
|
||
| /** | ||
| * Builder for S3VolumeContext. | ||
| */ | ||
| @SuppressWarnings("checkstyle:hiddenfield") | ||
| public static final class Builder { | ||
| private OmVolumeArgs omVolumeArgs; | ||
| private String userPrincipal; | ||
|
|
||
| private Builder() { | ||
| } | ||
|
|
||
| public Builder setOmVolumeArgs(OmVolumeArgs omVolumeArgs) { | ||
| this.omVolumeArgs = omVolumeArgs; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder setUserPrincipal(String userPrincipal) { | ||
| this.userPrincipal = userPrincipal; | ||
| return this; | ||
| } | ||
|
|
||
| public S3VolumeContext build() { | ||
| return new S3VolumeContext(omVolumeArgs, userPrincipal); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.