Skip to content

Storage/STG93 Add UserPrincipalName support for GetAccessControlList #5287

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
merged 2 commits into from
Jan 22, 2024
Merged

Storage/STG93 Add UserPrincipalName support for GetAccessControlList #5287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b717115
add upn support for get acl
microzchang Jan 22, 2024
ef3c42f
add test record
microzchang Jan 22, 2024
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
2 changes: 1 addition & 1 deletion sdk/storage/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "cpp",
"TagPrefix": "cpp/storage",
"Tag": "cpp/storage_56979c9851"
"Tag": "cpp/storage_96b65030ae"
}
9 changes: 9 additions & 0 deletions ...torage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,15 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
* Specify the access condition for the path.
*/
PathAccessConditions AccessConditions;

/**
* Valid only when Hierarchical Namespace is enabled for the account. If "true", the user
* identity values returned in the owner and group fields of each list entry will be transformed
* from Azure Active Directory Object IDs to User Principal Names. If "false", the values will
* be returned as Azure Active Directory Object IDs. The default value is false. Note that group
* and application Object IDs are not translated because they do not have unique friendly names.
*/
Nullable<bool> UserPrincipalName;
};

/**
Expand Down
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
protocolLayerOptions.IfNoneMatch = options.AccessConditions.IfNoneMatch;
protocolLayerOptions.IfModifiedSince = options.AccessConditions.IfModifiedSince;
protocolLayerOptions.IfUnmodifiedSince = options.AccessConditions.IfUnmodifiedSince;
protocolLayerOptions.Upn = options.UserPrincipalName;
auto response = _detail::PathClient::GetAccessControlList(
*m_pipeline, m_pathUrl, protocolLayerOptions, _internal::WithReplicaStatus(context));
Azure::Nullable<std::vector<Models::Acl>> acl;
Expand Down
34 changes: 34 additions & 0 deletions sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,40 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_NE(it, acls.end());
}

TEST_F(DataLakePathClientTest, GetAccessControlListWithUserPrincipalName)
{
std::string userPrincipalName = "[email protected]";
std::string userObjectId = "72a3f86f-271f-439e-b031-25678907d381";
std::vector<Files::DataLake::Models::Acl> acls;
Files::DataLake::Models::Acl acl;
acl.Type = "user";
acl.Id = userObjectId;
acl.Permissions = "rwx";
acls.emplace_back(acl);
m_pathClient->SetAccessControlList(acls);
Files::DataLake::GetPathAccessControlListOptions options;

// UserPrincipalName = true
options.UserPrincipalName = true;
auto properties = m_pathClient->GetAccessControlList(options).Value;
ASSERT_TRUE(!properties.Acls.empty());
// Validate that the user principal name is returned
acls = properties.Acls;
auto it = std::find_if(
acls.begin(), acls.end(), [&](const auto& acl) { return acl.Id == userPrincipalName; });
EXPECT_NE(it, acls.end());

// UserPrincipalName = false
options.UserPrincipalName = false;
properties = m_pathClient->GetAccessControlList(options).Value;
ASSERT_TRUE(!properties.Acls.empty());
// Validate that the user principal name is returned
acls = properties.Acls;
it = std::find_if(
acls.begin(), acls.end(), [&](const auto& acl) { return acl.Id == userObjectId; });
EXPECT_NE(it, acls.end());
}

TEST_F(DataLakePathClientTest, Audience)
{
auto credential = std::make_shared<Azure::Identity::ClientSecretCredential>(
Expand Down