Commit 25dc17da authored by Antoine Millet's avatar Antoine Millet
Browse files

Revert "Optimization of wildcards in ruleset" 

This reverts commit 135b6249.
parent 135b6249

cloudcontrol/server/server.py

+1 −8
Original line number Diff line number Diff line
@@ -308,14 +308,9 @@ class CCServer(object): 
            match = RE_FAST_RULE_MATCHING.match(rule.match)

            if match and match.group(1) != requester:

                continue

            elif rule.match == 'id':

                continue  # Optimization to handle wildcard matcher

            elif requester not in self.db.raw_query(rule.match):

                continue

            if rule.action == rule.ACCEPT:

                if rule.tql == 'id':  # Optimization to handle wildcard tql

                    allowed_result |= tql_response

                else:

                allowed_result |= tql_response & self.db.raw_query(rule.tql)

            elif rule.action == rule.DENY:

                # Defer deny action to the end of process:
@@ -344,8 +339,6 @@ class CCServer(object): 
            match = RE_FAST_RULE_MATCHING.match(rule.match)

            if match and match.group(1) != requester:

                continue

            elif rule.match == 'id':

                continue  # Optimization to handle wildcard matcher

            elif requester not in self.db.raw_query(rule.match):

                continue

            if rule.action == rule.ACCEPT: