Skip to content

WIP: ignore asterisk in user search #5343

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

Draft
jessegeens wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: ignore asterisk in user search #5343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions internal/http/services/owncloud/ocgraph/groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ func (s *svc) listGroups(w http.ResponseWriter, r *http.Request) {
log.Debug().Err(err).Interface("query", r.URL.Query()).Msg("must pass a search string of at least length 3 to list groups")
}
queryVal := strings.Trim(req.Query.Search.RawValue, "\"")
queryVal = strings.ReplaceAll(queryVal, "*", "")

if len(queryVal) < 3 {
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Search query must contain at least three valid characters"))
}

log.Debug().Str("Query", queryVal).Str("orderBy", req.Query.OrderBy.RawValue).Any("select", getGroupSelectionFromRequest(req.Query.Select)).Msg("Listing groups in libregraph API")

Expand Down
6 changes: 6 additions & 0 deletions internal/http/services/owncloud/ocgraph/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,14 @@ func (s *svc) listUsers(w http.ResponseWriter, r *http.Request) {
log.Debug().Err(err).Interface("query", r.URL.Query()).Msg("must pass a search string of at least length 3 to list users")
}
queryVal := strings.Trim(req.Query.Search.RawValue, "\"")
queryVal = strings.ReplaceAll(queryVal, "*", "")
log.Debug().Str("Query", queryVal).Str("orderBy", req.Query.OrderBy.RawValue).Any("select", getUserSelectionFromRequest(req.Query.Select)).Msg("Listing users in libregraph API")

if len(queryVal) < 3 {
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Search query must contain at least three valid characters"))
}

filters, err := generateUserFilters(req)
if err != nil {
handleError(ctx, err, http.StatusBadRequest, w)
Expand Down
Loading