mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

parser: Refactor accept nodes to be common to a shared node type

Browse Source 
The shared node type will be used in the future to add new capabilities

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
John Johansen
2014-09-03 14:29:35 -07:00
committed by Steve Beattie
parent ee7bf1dc28
commit e86f850d59
1 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
parser/libapparmor_re/expr-tree.h
View File

@@ -216,6 +216,7 @@ public:
void compute_lastpos() { lastpos.insert(this); } void compute_lastpos() { lastpos.insert(this); }
virtual void follow(Cases &cases) = 0; virtual void follow(Cases &cases) = 0;
virtual int is_accept(void) = 0; virtual int is_accept(void) = 0;
virtual int is_postprocess(void) = 0;
}; };
/* common base class for all the different classes that contain /* common base class for all the different classes that contain
@@ -225,6 +226,7 @@ class CNode: public ImportantNode {
public: public:
CNode(): ImportantNode() { } CNode(): ImportantNode() { }
int is_accept(void) { return false; } int is_accept(void) { return false; }
int is_postprocess(void) { return false; }
}; };
/* Match one specific character (/c/). */ /* Match one specific character (/c/). */
@@ -369,35 +371,6 @@ public:
ostream &dump(ostream &os) { return os << "."; } ostream &dump(ostream &os) { return os << "."; }
}; };
/**
* Indicate that a regular expression matches. An AcceptNode itself
* doesn't match anything, so it will never generate any transitions.
*/
class AcceptNode: public ImportantNode {
public:
AcceptNode() { }
int is_accept(void) { return true; }
void release(void)
{
/* don't delete AcceptNode via release as they are shared, and
* will be deleted when the table the are stored in is deleted
*/
}
void follow(Cases &cases __attribute__ ((unused)))
{
/* Nothing to follow. */
}
/* requires accept nodes to be common by pointer */
int eq(Node *other)
{
if (dynamic_cast<AcceptNode *>(other))
return (this == other);
return 0;
}
};
/* Match a node zero or more times. (This is a unary operator.) */ /* Match a node zero or more times. (This is a unary operator.) */
class StarNode: public OneChildNode { class StarNode: public OneChildNode {
public: public:
@@ -536,6 +509,55 @@ public:
void normalize(int dir); void normalize(int dir);
}; };
class SharedNode: public ImportantNode {
public:
SharedNode() { }
void release(void)
{
/* don't delete SharedNodes via release as they are shared, and
* will be deleted when the table they are stored in is deleted
*/
}
void follow(Cases &cases __attribute__ ((unused)))
{
/* Nothing to follow. */
}
/* requires shared nodes to be common by pointer */
int eq(Node *other) { return (this == other); }
};
/**
* Indicate that a regular expression matches. An AcceptNode itself
* doesn't match anything, so it will never generate any transitions.
*/
class AcceptNode: public SharedNode {
public:
AcceptNode() { }
int is_accept(void) { return true; }
int is_postprocess(void) { return false; }
};
class MatchFlag: public AcceptNode {
public:
MatchFlag(uint32_t flag, uint32_t audit): flag(flag), audit(audit) { }
ostream &dump(ostream &os) { return os << "< 0x" << hex << flag << '>'; }
uint32_t flag;
uint32_t audit;
};
class ExactMatchFlag: public MatchFlag {
public:
ExactMatchFlag(uint32_t flag, uint32_t audit): MatchFlag(flag, audit) {}
};
class DenyMatchFlag: public MatchFlag {
public:
DenyMatchFlag(uint32_t flag, uint32_t quiet): MatchFlag(flag, quiet) {}
};
/* Traverse the syntax tree depth-first in an iterator-like manner. */ /* Traverse the syntax tree depth-first in an iterator-like manner. */
class depth_first_traversal { class depth_first_traversal {
stack<Node *>pos; stack<Node *>pos;
@@ -588,25 +610,6 @@ unsigned long hash_NodeSet(NodeSet *ns);
void flip_tree(Node *node); void flip_tree(Node *node);
class MatchFlag: public AcceptNode {
public:
MatchFlag(uint32_t flag, uint32_t audit): flag(flag), audit(audit) { }
ostream &dump(ostream &os) { return os << "< 0x" << hex << flag << '>'; }
uint32_t flag;
uint32_t audit;
};
class ExactMatchFlag: public MatchFlag {
public:
ExactMatchFlag(uint32_t flag, uint32_t audit): MatchFlag(flag, audit) {}
};
class DenyMatchFlag: public MatchFlag {
public:
DenyMatchFlag(uint32_t flag, uint32_t quiet): MatchFlag(flag, quiet) {}
};
/* /*
* hashedNodes - for efficient set comparison * hashedNodes - for efficient set comparison