Skip to content
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

fixed bug in logging high complexity query rejections #581

Merged
merged 1 commit into from
Apr 25, 2024
+13 −17
Merged

fixed bug in logging high complexity query rejections #581

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
30 changes: 13 additions & 17 deletions cmd/api/src/queries/graph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,49 +374,45 @@ type preparedQuery struct {

func (s *GraphQuery) prepareGraphQuery(rawCypher string, disableCypherQC bool) (preparedQuery, error) {
var (
parseCtx = frontend.DefaultCypherContext()
buffer = &bytes.Buffer{}
graphQuery preparedQuery
parseCtx = frontend.DefaultCypherContext()
queryBuffer = &bytes.Buffer{}
strippedQueryBuffer = &bytes.Buffer{}
graphQuery preparedQuery
)

if queryModel, err := frontend.ParseCypher(parseCtx, rawCypher); err != nil {
return graphQuery, newQueryError(err)
} else if complexityMeasure, err := analyzer.QueryComplexity(queryModel); err != nil {
return graphQuery, newQueryError(err)
} else if err = s.strippedCypherEmitter.Write(queryModel, strippedQueryBuffer); err != nil {
return graphQuery, newQueryError(err)
} else if !disableCypherQC && complexityMeasure.Weight > MaxQueryComplexityWeightAllowed {
// log query details if it is rejected due to high complexity
highComplexityLog := log.WithLevel(log.LevelError)
highComplexityLog.Str("query", graphQuery.strippedQuery)
highComplexityLog.Msg(fmt.Sprintf("Query rejected. Query weight: %.2f. Maximum allowed weight: %d", graphQuery.complexity.Weight, MaxQueryComplexityWeightAllowed))
highComplexityLog.Str("query", strippedQueryBuffer.String())
highComplexityLog.Msg(fmt.Sprintf("Query rejected. Query weight: %.2f. Maximum allowed weight: %d", complexityMeasure.Weight, MaxQueryComplexityWeightAllowed))

return graphQuery, newQueryError(ErrCypherQueryToComplex)
} else if pgDB, isPG := s.Graph.(*pg.Driver); isPG {
if _, err := pgsql.Translate(queryModel, pgDB.KindMapper()); err != nil {
return graphQuery, newQueryError(err)
}

if err := pgsql.NewEmitter(false, pgDB.KindMapper()).Write(queryModel, buffer); err != nil {
if err := pgsql.NewEmitter(false, pgDB.KindMapper()).Write(queryModel, queryBuffer); err != nil {
return graphQuery, err
} else {
graphQuery.query = buffer.String()
graphQuery.query = queryBuffer.String()
}

return graphQuery, nil
} else {
graphQuery.strippedQuery = strippedQueryBuffer.String()
graphQuery.complexity = complexityMeasure

if err := s.cypherEmitter.Write(queryModel, buffer); err != nil {
return graphQuery, newQueryError(err)
} else {
graphQuery.query = buffer.String()
}

buffer.Reset()

if err := s.strippedCypherEmitter.Write(queryModel, buffer); err != nil {
if err = s.cypherEmitter.Write(queryModel, queryBuffer); err != nil {
return graphQuery, newQueryError(err)
} else {
graphQuery.strippedQuery = buffer.String()
graphQuery.query = queryBuffer.String()
}
}

Expand Down
Loading