scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 09:05:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extend mw

Browse source
This commit is contained in:
Samir Patel 2021-12-28 09:24:46 -05:00
parent b9961870c1
commit 7544e7d1cb
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
http/handler.go
View file

@ -410,7 +410,7 @@ func newRouter(handler *Handler) http.Handler {
router.HandleFunc("/index/{index}/field/{field}/import", handler.handlePostImport).Methods("POST").Name("PostImport")
router.HandleFunc("/index/{index}/field/{field}/mutex-check", handler.handleGetMutexCheck).Methods("GET").Name("GetMutexCheck")
router.HandleFunc("/index/{index}/field/{field}/import-roaring/{shard}", handler.handlePostImportRoaring).Methods("POST").Name("PostImportRoaring")
router.HandleFunc("/index/{index}/query", handler.handlePostQuery).Methods("POST").Name("PostQuery")
router.HandleFunc("/index/{index}/query", handler.mwAuth(handler.handlePostQuery, authz.Read)).Methods("POST").Name("PostQuery")
router.HandleFunc("/info", handler.mwAuth(handler.handleGetInfo, authz.Admin)).Methods("GET").Name("GetInfo")
router.HandleFunc("/recalculate-caches", handler.handleRecalculateCaches).Methods("POST").Name("RecalculateCaches")
router.HandleFunc("/schema", handler.handleGetSchema).Methods("GET").Name("GetSchema")
@ -547,14 +547,21 @@ func (h *Handler) mwAuth(handler http.HandlerFunc, perm authz.Permission) http.H
uinfo := h.auth.GetUserInfo(w, r)
//get query string if applicable
var query string
// qreq := r.Context().Value(contextKeyQueryRequest)
// req, ok := qreq.(*pilosa.QueryRequest)
// if !ok {
// query = fmt.Sprintf("%s%s", req.Query, req.SQLQuery)
// }
queryRequest := r.Context().Value(contextKeyQueryRequest)
h.querylogger.Infof("User ID: %s, User Name: %s, Endpoint: %s, Index: %s, Query: %s, Err: %v", uinfo.UserID, uinfo.UserName, r.URL.Path, indexName, query, err)
var queryString string
if req, ok := queryRequest.(*pilosa.QueryRequest); ok {
queryString = req.Query
}
writeWords := []string{"store", "set", "clear", "clearrow"}
q := strings.ToLower(queryString)
for _, w := range writeWords {
if strings.Contains(q, w) {
perm = authz.Write
}
}
h.querylogger.Infof("User ID: %s, User Name: %s, Endpoint: %s, Index: %s, Query: %s, Err: %v", uinfo.UserID, uinfo.UserName, r.URL.Path, indexName, queryString, err)
if err != nil || !authz.IsComparable(p, perm.String()) {
w.Header().Add("Content-Type", "text/plain")
w.WriteHeader(http.StatusForbidden)