Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix pulsar admin revoke subscription permission endpoint #1251

Merged
merged 3 commits into from
Jul 22, 2024
Merged

fix pulsar admin revoke subscription permission endpoint #1251

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
1a5f2b3
fix pulsar admin revoke subscription permission endpoint
Jul 15, 2024
4f49fb4
feat: support get subscription permissions and add test case
Jul 19, 2024
fd5a228
feat: remove fmt package
Jul 19, 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
12 changes: 11 additions & 1 deletion pulsaradmin/pkg/admin/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ type Namespaces interface {
// RevokeSubPermission revoke permissions on a subscription's admin-api access
RevokeSubPermission(namespace utils.NameSpaceName, sName, role string) error

// GetSubPermissions returns subscription permissions on a namespace
GetSubPermissions(namespace utils.NameSpaceName) (map[string][]string, error)

// SetSubscriptionAuthMode sets the given subscription auth mode on all topics on a namespace
SetSubscriptionAuthMode(namespace utils.NameSpaceName, mode utils.SubscriptionAuthMode) error

Expand Down Expand Up @@ -750,10 +753,17 @@ func (n *namespaces) GrantSubPermission(namespace utils.NameSpaceName, sName str

func (n *namespaces) RevokeSubPermission(namespace utils.NameSpaceName, sName, role string) error {
endpoint := n.pulsar.endpoint(n.basePath, namespace.String(), "permissions",
"subscription", sName, role)
sName, role)
return n.pulsar.Client.Delete(endpoint)
}

func (n *namespaces) GetSubPermissions(namespace utils.NameSpaceName) (map[string][]string, error) {
endpoint := n.pulsar.endpoint(n.basePath, namespace.String(), "permissions", "subscription")
var permissions map[string][]string
err := n.pulsar.Client.Get(endpoint, &permissions)
return permissions, err
}

func (n *namespaces) SetSubscriptionAuthMode(namespace utils.NameSpaceName, mode utils.SubscriptionAuthMode) error {
endpoint := n.pulsar.endpoint(n.basePath, namespace.String(), "subscriptionAuthMode")
return n.pulsar.Client.Post(endpoint, mode.String())
Expand Down
28 changes: 28 additions & 0 deletions pulsaradmin/pkg/admin/namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,31 @@ func TestGetTopicAutoCreation(t *testing.T) {
}
assert.Equal(t, expected, *topicAutoCreation)
}

func TestRevokeSubPermission(t *testing.T) {
config := &config.Config{}
admin, err := New(config)
require.NoError(t, err)
require.NotNil(t, admin)

namespace, err := utils.GetNamespaceName("public/default")
require.NoError(t, err)
require.NotNil(t, namespace)

sub := "subscription"
roles := []string{"user"}

// grant subscription permission and get it
err = admin.Namespaces().GrantSubPermission(*namespace, sub, roles)
require.NoError(t, err)
permissions, err := admin.Namespaces().GetSubPermissions(*namespace)
require.NoError(t, err)
assert.Equal(t, roles, permissions[sub])

// revoke subscription permission and get it
err = admin.Namespaces().RevokeSubPermission(*namespace, sub, roles[0])
require.NoError(t, err)
permissions, err = admin.Namespaces().GetSubPermissions(*namespace)
require.NoError(t, err)
assert.Equal(t, 0, len(permissions[sub]))
}
Loading