extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-08-18 10:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix unescape function per comments on #73 and add tests for searching for a backslash

Browse Source
This commit is contained in:
David Dworken
2023-02-20 15:46:39 -08:00
parent dddedcf9a7
commit ff24b66fce
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/lib/lib.go
View File

@@ -1174,14 +1174,14 @@ func Search(ctx *context.Context, db *gorm.DB, query string, limit int) ([]*data
}
func parseNonAtomizedToken(token string) (string, interface{}, interface{}, interface{}, error) {
wildcardedToken := "%" + stripBackslash(token) + "%"
wildcardedToken := "%" + unescape(token) + "%"
return "(command LIKE ? OR hostname LIKE ? OR current_working_directory LIKE ?)", wildcardedToken, wildcardedToken, wildcardedToken, nil
}
func parseAtomizedToken(ctx *context.Context, token string) (string, interface{}, interface{}, error) {
splitToken := splitEscaped(token, ':', 2)
field := stripBackslash(splitToken[0])
val := stripBackslash(splitToken[1])
field := unescape(splitToken[0])
val := unescape(splitToken[1])
switch field {
case "user":
return "(local_username = ?)", val, nil, nil
@@ -1297,11 +1297,15 @@ func containsUnescaped(query string, token string) bool {
return false
}
func stripBackslash(query string) string {
func unescape(query string) string {
runeQuery := []rune(query)
var newQuery []rune
for _, char := range query {
if char != '\\' {
newQuery = append(newQuery, char)
for i := 0; i < len(runeQuery); i++ {
if runeQuery[i] == '\\' {
i++
}
if i < len(runeQuery) {
newQuery = append(newQuery, runeQuery[i])
}
}
return string(newQuery)