Skip to content

Commit

Permalink
alow root user to find suspended topics and accounts
Browse files Browse the repository at this point in the history
  • Loading branch information
@or-else
or-else committed Mar 20, 2023
1 parent 929b752 commit e9ab4e3
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 37 deletions.
8 changes: 4 additions & 4 deletions server/db/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ type Adapter interface {

// Search

// FindUsers searches for new contacts given a list of tags
FindUsers(user t.Uid, req [][]string, opt []string) ([]t.Subscription, error)
// FindTopics searches for group topics given a list of tags
FindTopics(req [][]string, opt []string) ([]t.Subscription, error)
// FindUsers searches for new contacts given a list of tags.
FindUsers(user t.Uid, req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error)
// FindTopics searches for group topics given a list of tags.
FindTopics(req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error)

// Messages

Expand Down
19 changes: 10 additions & 9 deletions server/db/mongodb/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ func (a *adapter) subsDelete(ctx context.Context, filter b.M, hard bool) error {
}

// Search
func (a *adapter) getFindPipeline(req [][]string, opt []string) (map[string]struct{}, b.A) {
func (a *adapter) getFindPipeline(req [][]string, opt []string, activeOnly bool) (map[string]struct{}, b.A) {
allReq := t.FlattenDoubleSlice(req)
index := make(map[string]struct{})
var allTags []interface{}
Expand All @@ -2063,11 +2063,12 @@ func (a *adapter) getFindPipeline(req [][]string, opt []string) (map[string]stru
index[tag] = struct{}{}
}

matchOn := b.M{"tags": b.M{"$in": allTags}}
if activeOnly {
matchOn["state"] = b.M{"$eq": t.StateOK}
}
pipeline := b.A{
b.M{"$match": b.M{
"tags": b.M{"$in": allTags},
"state": b.M{"$ne": t.StateDeleted},
}},
b.M{"$match": matchOn},

b.M{"$project": b.M{"_id": 1, "access": 1, "createdat": 1, "updatedat": 1, "public": 1, "trusted": 1, "tags": 1}},

Expand Down Expand Up @@ -2104,8 +2105,8 @@ func (a *adapter) getFindPipeline(req [][]string, opt []string) (map[string]stru
}

// FindUsers searches for new contacts given a list of tags
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscription, error) {
index, pipeline := a.getFindPipeline(req, opt)
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index, pipeline := a.getFindPipeline(req, opt, activeOnly)
cur, err := a.db.Collection("users").Aggregate(a.ctx, pipeline)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2143,8 +2144,8 @@ func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscr
}

// FindTopics searches for group topics given a list of tags
func (a *adapter) FindTopics(req [][]string, opt []string) ([]t.Subscription, error) {
index, pipeline := a.getFindPipeline(req, opt)
func (a *adapter) FindTopics(req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index, pipeline := a.getFindPipeline(req, opt, activeOnly)
cur, err := a.db.Collection("topics").Aggregate(a.ctx, pipeline)
if err != nil {
return nil, err
Expand Down
20 changes: 14 additions & 6 deletions server/db/mysql/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2341,10 +2341,14 @@ func (a *adapter) SubsDelForUser(user t.Uid, hard bool) error {

// Returns a list of users who match given tags, such as "email:[email protected]" or "tel:+18003287448".
// Searching the 'users.Tags' for the given tags using respective index.
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscription, error) {
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index := make(map[string]struct{})
var args []interface{}
args = append(args, t.StateOK)
stateConstraint := ""
if activeOnly {
args = append(args, t.StateOK)
stateConstraint = "u.state=? AND "
}
allReq := t.FlattenDoubleSlice(req)
for _, tag := range append(allReq, opt...) {
args = append(args, tag)
Expand All @@ -2353,7 +2357,7 @@ func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscr

query := "SELECT u.id,u.createdat,u.updatedat,u.access,u.public,u.trusted,u.tags,COUNT(*) AS matches " +
"FROM users AS u LEFT JOIN usertags AS t ON t.userid=u.id " +
"WHERE u.state=? AND t.tag IN (?" + strings.Repeat(",?", len(allReq)+len(opt)-1) + ") " +
"WHERE " + stateConstraint + "t.tag IN (?" + strings.Repeat(",?", len(allReq)+len(opt)-1) + ") " +
"GROUP BY u.id,u.createdat,u.updatedat,u.access,u.public,u.trusted,u.tags "
if len(allReq) > 0 {
query += "HAVING"
Expand Down Expand Up @@ -2429,10 +2433,14 @@ func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscr

// Returns a list of topics with matching tags.
// Searching the 'topics.Tags' for the given tags using respective index.
func (a *adapter) FindTopics(req [][]string, opt []string) ([]t.Subscription, error) {
func (a *adapter) FindTopics(req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index := make(map[string]struct{})
var args []interface{}
args = append(args, t.StateOK)
stateConstraint := ""
if activeOnly {
args = append(args, t.StateOK)
stateConstraint = "u.state=? AND "
}
var allReq []string
for _, el := range req {
allReq = append(allReq, el...)
Expand All @@ -2444,7 +2452,7 @@ func (a *adapter) FindTopics(req [][]string, opt []string) ([]t.Subscription, er

query := "SELECT t.name AS topic,t.createdat,t.updatedat,t.usebt,t.access,t.public,t.trusted,t.tags,COUNT(*) AS matches " +
"FROM topics AS t LEFT JOIN topictags AS tt ON t.name=tt.topic " +
"WHERE t.state=? AND tt.tag IN (?" + strings.Repeat(",?", len(allReq)+len(opt)-1) + ") " +
"WHERE " + stateConstraint + "tt.tag IN (?" + strings.Repeat(",?", len(allReq)+len(opt)-1) + ") " +
"GROUP BY t.name,t.createdat,t.updatedat,t.usebt,t.access,t.public,t.trusted,t.tags "
if len(allReq) > 0 {
query += "HAVING"
Expand Down
20 changes: 12 additions & 8 deletions server/db/rethinkdb/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ func (a *adapter) subsDelForUser(user t.Uid, hard bool) error {

// FindUsers returns a list of users who match given tags, such as "email:[email protected]" or "tel:+18003287448".
// Searching the 'users.Tags' for the given tags using respective index.
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscription, error) {
func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index := make(map[string]struct{})
allReq := t.FlattenDoubleSlice(req)
var allTags []interface{}
Expand All @@ -1888,9 +1888,11 @@ func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscr
// Get users matched by tags, sort by number of matches from high to low.
query := rdb.DB(a.dbName).
Table("users").
GetAllByIndex("Tags", allTags...).
Filter(rdb.Row.Field("State").Eq(t.StateOK)).
Pluck("Id", "Access", "CreatedAt", "UpdatedAt", "Public", "Trusted", "Tags").
GetAllByIndex("Tags", allTags...)
if activeOnly {
query = query.Filter(rdb.Row.Field("State").Eq(t.StateOK))
}
query = query.Pluck("Id", "Access", "CreatedAt", "UpdatedAt", "Public", "Trusted", "Tags").
Group("Id").
Ungroup().
Map(func(row rdb.Term) rdb.Term {
Expand Down Expand Up @@ -1948,7 +1950,7 @@ func (a *adapter) FindUsers(uid t.Uid, req [][]string, opt []string) ([]t.Subscr

// FindTopics returns a list of topics with matching tags.
// Searching the 'topics.Tags' for the given tags using respective index.
func (a *adapter) FindTopics(req [][]string, opt []string) ([]t.Subscription, error) {
func (a *adapter) FindTopics(req [][]string, opt []string, activeOnly bool) ([]t.Subscription, error) {
index := make(map[string]struct{})
var allReq []string
for _, el := range req {
Expand All @@ -1961,9 +1963,11 @@ func (a *adapter) FindTopics(req [][]string, opt []string) ([]t.Subscription, er
}
query := rdb.DB(a.dbName).
Table("topics").
GetAllByIndex("Tags", allTags...).
Filter(rdb.Row.Field("State").Eq(t.StateOK)).
Pluck("Id", "Access", "CreatedAt", "UpdatedAt", "UseBt", "Public", "Trusted", "Tags").
GetAllByIndex("Tags", allTags...)
if activeOnly {
query = query.Filter(rdb.Row.Field("State").Eq(t.StateOK))
}
query = query.Pluck("Id", "Access", "CreatedAt", "UpdatedAt", "UseBt", "Public", "Trusted", "Tags").
Group("Id").
Ungroup().
Map(func(row rdb.Term) rdb.Term {
Expand Down
8 changes: 4 additions & 4 deletions server/store/mock_store/mock_store.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions server/store/store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ type UsersPersistenceInterface interface {
UpdateTags(uid types.Uid, add, remove, reset []string) ([]string, error)
UpdateState(uid types.Uid, state types.ObjState) error
GetSubs(id types.Uid) ([]types.Subscription, error)
FindSubs(id types.Uid, required [][]string, optional []string) ([]types.Subscription, error)
FindSubs(id types.Uid, required [][]string, optional []string, activeOnly bool) ([]types.Subscription, error)
GetTopics(id types.Uid, opts *types.QueryOpt) ([]types.Subscription, error)
GetTopicsAny(id types.Uid, opts *types.QueryOpt) ([]types.Subscription, error)
GetOwnTopics(id types.Uid) ([]string, error)
Expand Down Expand Up @@ -424,12 +424,12 @@ func (usersMapper) GetSubs(id types.Uid) ([]types.Subscription, error) {
// `required` specifies an AND of ORs for required terms:
// at least one element of every sublist in `required` must be present in the object's tags list.
// `optional` specifies a list of optional terms.
func (usersMapper) FindSubs(id types.Uid, required [][]string, optional []string) ([]types.Subscription, error) {
usubs, err := adp.FindUsers(id, required, optional)
func (usersMapper) FindSubs(id types.Uid, required [][]string, optional []string, activeOnly bool) ([]types.Subscription, error) {
usubs, err := adp.FindUsers(id, required, optional, activeOnly)
if err != nil {
return nil, err
}
tsubs, err := adp.FindTopics(required, optional)
tsubs, err := adp.FindTopics(required, optional, activeOnly)
if err != nil {
return nil, err
}
Expand Down
3 changes: 1 addition & 2 deletions server/topic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2419,8 +2419,7 @@ func (t *Topic) replyGetSub(sess *Session, asUid types.Uid, authLevel auth.Level
return errors.New("attempt to search by restricted tags")
}

// TODO: allow root to find suspended users and topics.
subs, err = store.Users.FindSubs(asUid, req, opt)
subs, err = store.Users.FindSubs(asUid, req, opt, sess.authLvl == auth.LevelRoot)
if err != nil {
sess.queueOut(decodeStoreErrorExplicitTs(err, id, msg.Original, now, incomingReqTs, nil))
return err
Expand Down

0 comments on commit e9ab4e3

Please sign in to comment.