Query attribute parsing problem

lkarlslund · Sep 22, 2022 · 2256292 · 2256292
1 parent 9551338
commit 2256292
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/modules/query/ldapparser.go b/modules/query/ldapparser.go
@@ -204,7 +204,7 @@ valueloop:
 				return nil, nil, fmt.Errorf("No attributes matched pattern '%v'", attributename)
 			}
 		}
-	} else if attributename[0] == '_' {
+	} else {
 		// Magic attributes, uuuuuh ....
 		switch attributename {
 		case "_id":
@@ -247,15 +247,15 @@ valueloop:
 				direction = engine.In
 			}
 			return s, pwnquery{direction, edge, target}, nil
+		default:
+			attribute := engine.A(attributename)
+			if attribute == engine.NonExistingAttribute {
+				return nil, nil, fmt.Errorf("Unknown attribute %v", attributename)
+			}
+			attributes = []engine.Attribute{attribute}
 		}
 	}
 
-	attribute := engine.A(attributename)
-	if attribute == engine.NonExistingAttribute {
-		return nil, nil, fmt.Errorf("Unknown attribute %v", attributename)
-	}
-	attributes = []engine.Attribute{attribute}
-
 	attribute2 := engine.NonExistingAttribute
 	if attributename2 != "" {
 		attribute2 = engine.A(attributename2)