feat(list): Add ProfileID restriction option to List

qri-io · Mar 15, 2021 · 774fa06 · 774fa06
1 parent 9e8122b
commit 774fa06
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/base/dataset.go b/base/dataset.go
@@ -157,7 +157,7 @@ func CloseDataset(ds *dataset.Dataset) (err error) {
 }
 
 // ListDatasets lists datasets from a repo
-func ListDatasets(ctx context.Context, r repo.Repo, term string, offset, limit int, RPC, publishedOnly, showVersions bool) ([]dsref.VersionInfo, error) {
+func ListDatasets(ctx context.Context, r repo.Repo, term, profileID string, offset, limit int, RPC, publishedOnly, showVersions bool) ([]dsref.VersionInfo, error) {
 	fs := r.Filesystem()
 	num, err := r.RefCount()
 	if err != nil {
@@ -209,6 +209,11 @@ func ListDatasets(ctx context.Context, r repo.Repo, term string, offset, limit i
 				continue
 			}
 		}
+		if profileID != "" {
+			if profileID != ref.ProfileID.String() {
+				continue
+			}
+		}
 
 		if ref.Path != "" {
 			ds, err := dsfs.LoadDataset(ctx, fs, ref.Path)

diff --git a/base/dataset_test.go b/base/dataset_test.go
@@ -16,7 +16,7 @@ func TestListDatasets(t *testing.T) {
 	ref := addCitiesDataset(t, r)
 
 	// Limit to one
-	res, err := ListDatasets(ctx, r, "", 0, 1, false, false, false)
+	res, err := ListDatasets(ctx, r, "", "", 0, 1, false, false, false)
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -25,7 +25,7 @@ func TestListDatasets(t *testing.T) {
 	}
 
 	// Limit to published datasets
-	res, err = ListDatasets(ctx, r, "", 0, 1, false, true, false)
+	res, err = ListDatasets(ctx, r, "", "", 0, 1, false, true, false)
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -39,7 +39,7 @@ func TestListDatasets(t *testing.T) {
 	}
 
 	// Limit to published datasets, after publishing cities
-	res, err = ListDatasets(ctx, r, "", 0, 1, false, true, false)
+	res, err = ListDatasets(ctx, r, "", "", 0, 1, false, true, false)
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -49,7 +49,7 @@ func TestListDatasets(t *testing.T) {
 	}
 
 	// Limit to datasets with "city" in their name
-	res, err = ListDatasets(ctx, r, "city", 0, 1, false, false, false)
+	res, err = ListDatasets(ctx, r, "city", "", 0, 1, false, false, false)
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -58,15 +58,15 @@ func TestListDatasets(t *testing.T) {
 	}
 
 	// Limit to datasets with "cit" in their name
-	res, err = ListDatasets(ctx, r, "cit", 0, 1, false, false, false)
+	res, err = ListDatasets(ctx, r, "cit", "", 0, 1, false, false, false)
 	if err != nil {
 		t.Error(err.Error())
 	}
 	if len(res) != 1 {
 		t.Error(`expected one dataset with \"cit\" in their name`)
 	}
 
-	res, err = ListDatasets(ctx, r, "", 0, -1, false, false, false)
+	res, err = ListDatasets(ctx, r, "", "", 0, -1, false, false, false)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/lib/datasets.go b/lib/datasets.go
@@ -77,6 +77,11 @@ func (m *DatasetMethods) List(ctx context.Context, p *ListParams) ([]dsref.Versi
 		return res, nil
 	}
 
+	// TODO(dustmop): When List is converted to use scope, get the ProfileID from
+	// the scope if the user is authorized to only view their own datasets, as opposed
+	// to the full collection that exists in this node's repository.
+	restrictPid := ""
+
 	// ensure valid limit value
 	if p.Limit <= 0 {
 		p.Limit = 25
@@ -142,7 +147,7 @@ func (m *DatasetMethods) List(ctx context.Context, p *ListParams) ([]dsref.Versi
 			infos[i] = reporef.ConvertToVersionInfo(&r)
 		}
 	} else if listProfile.Peername == "" || reqProfile.Peername == listProfile.Peername {
-		infos, err = base.ListDatasets(ctx, m.inst.repo, p.Term, p.Offset, p.Limit, p.RPC, p.Public, p.ShowNumVersions)
+		infos, err = base.ListDatasets(ctx, m.inst.repo, p.Term, restrictPid, p.Offset, p.Limit, p.RPC, p.Public, p.ShowNumVersions)
 		if errors.Is(err, ErrListWarning) {
 			listWarning = err
 			err = nil

diff --git a/p2p/datasets.go b/p2p/datasets.go
@@ -83,7 +83,7 @@ func (n *QriNode) handleDatasetsList(ws *WrappedStream, msg Message) (hangup boo
 			dlp.Limit = listMax
 		}
 
-		refs, err := base.ListDatasets(context.TODO(), n.Repo, dlp.Term, dlp.Offset, dlp.Limit, false, true, false)
+		refs, err := base.ListDatasets(context.TODO(), n.Repo, dlp.Term, "", dlp.Offset, dlp.Limit, false, true, false)
 		if err != nil {
 			log.Error(err)
 			return

diff --git a/registry/regserver/mock.go b/registry/regserver/mock.go
@@ -107,7 +107,7 @@ type MockRepoSearch struct {
 // Search implements the registry.Searchable interface
 func (ss MockRepoSearch) Search(p registry.SearchParams) ([]*dataset.Dataset, error) {
 	ctx := context.Background()
-	infos, err := base.ListDatasets(ctx, ss.Repo, p.Q, 0, 1000, false, true, false)
+	infos, err := base.ListDatasets(ctx, ss.Repo, p.Q, "", 0, 1000, false, true, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/remote/browse.go b/remote/browse.go
@@ -59,7 +59,7 @@ func (rf RepoFeeds) Feed(ctx context.Context, userID, name string, offset, limit
 	if name != "recent" {
 		return nil, fmt.Errorf("unknown feed name '%s'", name)
 	}
-	return base.ListDatasets(ctx, rf.Repo, "", offset, limit, false, true, false)
+	return base.ListDatasets(ctx, rf.Repo, "", "", offset, limit, false, true, false)
 }
 
 // Previews is an interface for generating constant-size summaries of dataset

diff --git a/remote/registry/regserver/mock.go b/remote/registry/regserver/mock.go
@@ -107,7 +107,7 @@ type MockRepoSearch struct {
 // Search implements the registry.Searchable interface
 func (ss MockRepoSearch) Search(p registry.SearchParams) ([]*dataset.Dataset, error) {
 	ctx := context.Background()
-	infos, err := base.ListDatasets(ctx, ss.Repo, p.Q, 0, 1000, false, true, false)
+	infos, err := base.ListDatasets(ctx, ss.Repo, p.Q, "", 0, 1000, false, true, false)
 	if err != nil {
 		return nil, err
 	}