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

Improve %%VALUE%% pattern #238

Merged
merged 4 commits into from
Aug 10, 2018
Merged

Improve %%VALUE%% pattern #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08a8e25
Add whitelist tests for pattern %%VALUE%%
storojs72 Aug 9, 2018
d306872
Add blacklist tests for pattern %%VALUE%%
storojs72 Aug 9, 2018
dfdeb0b
Improve %%VALUE%% pattern
storojs72 Aug 9, 2018
dcbc30d
Requested changes (add helper function and test queries)
storojs72 Aug 9, 2018
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
57 changes: 57 additions & 0 deletions acra-censor/acra-censor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ func testWhitelistValuePattern(t *testing.T) {
"SELECT a, b, c FROM y WHERE a = 'someValue'",
"SELECT a, b FROM z WHERE a = 'someValue'",
"SELECT a, b FROM t WHERE NonID = 'someValue'",
"SELECT a, b, c, d FROM t WHERE a = 1 OR b = 1.0 OR c = TRUE OR d = NULL",
"SELECT a, b FROM t WHERE a = 1 and b = 2.0",
}
for _, query := range acceptableQueries {
err = censor.HandleQuery(query)
Expand All @@ -384,6 +386,32 @@ func testWhitelistValuePattern(t *testing.T) {
t.Fatal(err, "Blacklist pattern passed query. \nPattern: ", pattern, "\nQuery: ", query)
}
}

whitelist.Reset()
pattern = "SELECT * from t where ID = %%VALUE%%"
err = whitelist.AddPatterns([]string{pattern})
if err != nil {
t.Fatal(err)
}

acceptableQueries = []string{
"SELECT a, b FROM t WHERE ID = 'someValue_testValue_1234567890'",
"SELECT a, b FROM t WHERE ID = 'someValue'",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to test different type of values instead same with different length/value. can we check boolean/integer/float/nullable values too? `where a=1 or b=1.0 or c=TRUE or d=NULL

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plus we should check that it works with >1 conditions - where a=1 and b=2, not only with one.

"SELECT a, b, c, d FROM t WHERE ID = 'someValue'",
}

for _, query := range acceptableQueries {
err = censor.HandleQuery(query)
if err != nil {
t.Fatal(err, "Whitelist pattern blocked query. \nPattern:", pattern, "\nQuery:", query)
}
}
for _, query := range blockableQueries {
err = censor.HandleQuery(query)
if err != handlers.ErrWhitelistPatternMismatch {
t.Fatal(err, "Whitelist pattern passed query. \nPattern:", pattern, "\nQuery:", query)
}
}
}
func testWhitelistStarPattern(t *testing.T) {
var err error
Expand Down Expand Up @@ -808,6 +836,8 @@ func testBlacklistValuePattern(t *testing.T) {
"SELECT a, b, c FROM y WHERE a = 'someValue'",
"SELECT a, b FROM z WHERE a = 'someValue'",
"SELECT a, b FROM t WHERE NonID = 'someValue'",
"SELECT a, b, c, d FROM t WHERE a = 1 OR b = 1.0 OR c = TRUE OR d = NULL",
"SELECT a, b FROM t WHERE a = 1 and b = 2.0",
}
blockableQueries := []string{
"SELECT a, b FROM t WHERE ID = 'someValue_testValue_1234567890'",
Expand All @@ -816,9 +846,36 @@ func testBlacklistValuePattern(t *testing.T) {
for _, query := range acceptableQueries {
err = censor.HandleQuery(query)
if err != nil {
t.Fatal(err, "Blacklist pattern blocked query. \nPattern:", blacklistPattern, "\nQuery:", query)
}
}
for _, query := range blockableQueries {
err = censor.HandleQuery(query)
if err != handlers.ErrBlacklistPatternMatch {
t.Fatal(err, "Blacklist pattern passed query. \nPattern:", blacklistPattern, "\nQuery:", query)
}
}

blacklist.Reset()
blacklistPattern = "SELECT * from t where ID = %%VALUE%%"
err = blacklist.AddPatterns([]string{blacklistPattern})
if err != nil {
t.Fatal(err)
}

blockableQueries = []string{
"SELECT a, b FROM t WHERE ID = 1",
"SELECT a, b FROM t WHERE ID = 1.0",
"SELECT a, b, c, d FROM t WHERE ID = 'someValue'",
"SELECT a, b, c FROM t WHERE ID = TRUE",
}

for _, query := range acceptableQueries {
err = censor.HandleQuery(query)
if err != nil {
t.Fatal(err, "Blacklist pattern blocked query. \nPattern:", blacklistPattern, "\nQuery:", query)
}
}
for _, query := range blockableQueries {
err = censor.HandleQuery(query)
if err != handlers.ErrBlacklistPatternMatch {
Expand Down
58 changes: 48 additions & 10 deletions acra-censor/handlers/handlers_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,27 +174,65 @@ func handleSelectWherePattern(queryNodes, patternNodes []sqlparser.SQLNode) bool

// handle SELECT a, b FROM t1 WHERE userID=%%VALUE%% pattern
func handleValuePattern(queryNodes, patternNodes []sqlparser.SQLNode) bool {
patternNodeOffset := 0
queryNodeOffset := 0

matchDetected := false
if len(patternNodes) != len(queryNodes) {
return false
}
for index, patternNode := range patternNodes {
if index == 0 || reflect.DeepEqual(patternNode, queryNodes[index]) {
for index := 1; index < len(patternNodes); index++ {
//This means that checked query nodes are equal to pattern and no more nodes remained, so query matches pattern (no matter if pattern has remained nodes)
if index+queryNodeOffset >= len(queryNodes) {
break
}
//This means that checked query nodes are equal to pattern but some more nodes remained, so query doesn't match pattern
if index+patternNodeOffset >= len(patternNodes) {
return false
}
//Start check matching
if reflect.DeepEqual(patternNodes[index+patternNodeOffset], queryNodes[index+queryNodeOffset]) {
continue
}
if patternNodeComparison, ok := patternNode.(*sqlparser.ComparisonExpr); ok && patternNodeComparison != nil {
if queryNodeComparison, ok := queryNodes[index].(*sqlparser.ComparisonExpr); ok && queryNodeComparison != nil {
if reflect.DeepEqual(queryNodeComparison.Left, patternNodeComparison.Left) {
if strings.EqualFold(sqlparser.String(patternNodeComparison.Right), ValueConfigPlaceholderReplacer) {
matchDetected = true
//handle '*' case
if patternSelectExprs, ok := patternNodes[index+patternNodeOffset].(sqlparser.SelectExprs); ok {
if _, ok := queryNodes[index+queryNodeOffset].(sqlparser.SelectExprs); ok {
if starFound(patternSelectExprs) {
for i := index; i < len(queryNodes); i++ {
if _, ok := queryNodes[i].(sqlparser.TableExprs); ok {
break
}
queryNodeOffset++
}
for i := index; i < len(patternNodes); i++ {
if _, ok := patternNodes[i].(sqlparser.TableExprs); ok {
break
}
patternNodeOffset++
}
continue
}
}
}
if patternNodeComparison, ok := patternNodes[index + patternNodeOffset].(*sqlparser.ComparisonExpr); ok && patternNodeComparison != nil {
if queryNodeComparison, ok := queryNodes[index + queryNodeOffset].(*sqlparser.ComparisonExpr); ok && queryNodeComparison != nil {
if IsEqualComparisonNode(patternNodeComparison, queryNodeComparison) {
matchDetected = true
}
}
}
}
return matchDetected
}

func IsEqualComparisonNode(patternNode, queryNode *sqlparser.ComparisonExpr) bool {
if reflect.DeepEqual(patternNode.Left, queryNode.Left) &&
strings.EqualFold(patternNode.Operator, queryNode.Operator) &&
reflect.DeepEqual(patternNode.Escape, queryNode.Escape) {
if strings.EqualFold(sqlparser.String(patternNode.Right), ValueConfigPlaceholderReplacer) {
return true
}
}
return false
}

// handleStarPattern handles SELECT * FROM table %%WHERE%% pattern
func handleStarPattern(queryNodes, patternNodes []sqlparser.SQLNode) bool {
patternWhereDetected := false
Expand Down