Changeset 2105

Timestamp:

05/09/08 09:15:55 (7 months ago)

Author:

dsugar

Message:

little things noticed while testing networking backend support

Files:

• branches/networking/resources/link/selinux.flnk (added)
• branches/networking/resources/link/sysnetwork.flnk (added)
• branches/networking/resources/link/tcp_client.flnk (added)
• branches/networking/resources/link/tcp_server.flnk (added)
• branches/networking/src/com/tresys/framework/compiler/linkage/net/FNETParser.jj (modified) (2 diffs)
• branches/networking/src/com/tresys/framework/compiler/policy/PolicyParser.jj (modified) (3 diffs)
• branches/networking/src/com/tresys/framework/compiler/translator/NetworkIPSec.java (modified) (2 diffs)
• branches/networking/src/com/tresys/framework/compiler/translator/NetworkSecmark.java (modified) (1 diff)

branches/networking/src/com/tresys/framework/compiler/linkage/net/FNETParser.jj

@@ -241 +241 @@
-        Token resName;
-        Token netType;
-
-
-
-
+ = null
+ = null
+ = null
+ = null
-        
-        NetResource resource;
@@ -260 +260 @@
-        
-        (<LPAREN>
-
+
+
-        <RPAREN>
-        {
-
-
+
+
+
+
+
-        }
-        <LPAREN>
-
+
+
-        <RPAREN>
-        {
-
-
+
+
+
+
+
-        }
-        )?

branches/networking/src/com/tresys/framework/compiler/policy/PolicyParser.jj

@@ -304 +304 @@
-        |< BASERESOURCE : "baseresource" >
-        |< USERDOMAIN : "userdomain">
+        |< ABILITY : "ability" >
-        |< FROM : "from" >
-        |< BOOLEAN : "boolean" > : BOOL_BLOCK
@@ -387 +388 @@
-                |BaseDomainDef()
-                |BaseResourceDef()
+                |AbilityDef()
-                |IfElseBlock()
-                |BooleanDef()
@@ -1552 +1554 @@
-}
-
+void AbilityDef ():
+{
+        Token ability;
+        Token tokPath = null;   
+}
+{
+        <ABILITY>
+        ability = <ID>
+        (<FROM> tokPath = <QUOTEDSTRING>)?
+        <SEMICOLON>
+        {
+                Linkage linkage = policy.getLinkage();
+                if(tokPath != null) {
+                        String path;
+                        if(tokPath.image.charAt(1) == '/')
+                                path = tokPath.image.substring(1, tokPath.image.length()-1);
+                        else
+                                path = linkage.LNFILESPATH + "/" + tokPath.image.substring(1, tokPath.image.length()-1);
+                        try {
+                                FLNKParser parser = new FLNKParser();
+                                parser.Parse(new FileReader(path), new CLIErrorHandler(path));
+                                Vector set = new Vector();
+                                set.addAll(linkage.GetAvailiableAbilities().values());
+                                set.addAll(parser.getAllAbilities());
+                                linkage.SetAbilites(set);
+                        } catch(FileNotFoundException fnfe) {
+                                errorGenerate (tokPath, "File not found: " + path);
+                        }
+                }
+/*
+                if(linkage.GetAvailiableAbilities().containsKey(ability.image))
+                        policy.Add((Ability) linkage.GetAvailiableAbilities().get(ability.image));
+                else
+                        errorGenerate(ability, "Ability not defined in flnk files");
+*/
+        }
+}
+
-void BaseResourceDef():
-{

branches/networking/src/com/tresys/framework/compiler/translator/NetworkIPSec.java

@@ -188 +188 @@
-                                                        
-                                                        {
+                                                                Object type = netRes.get (NetResource.KEY_ENC_TYPE);
+                                                                Object key = netRes.get (NetResource.KEY_ENC_KEY);
+                                                                if (type != null && key != null)
+                                                                        m_netBuffer.print (" -E " + type.toString () + " " + key.toString ());
+                                                        }
+                                                        {
-                                                                Object type = netRes.get (NetResource.KEY_AUTH_TYPE);
-                                                                Object key = netRes.get (NetResource.KEY_AUTH_KEY);
@@ -193 +199 @@
-                                                                        m_netBuffer.print (" -A " + type.toString () + " " + key.toString ());
-                                                        }
-
-
-
-
-
-
+
+
-                                                }
-                                        }

branches/networking/src/com/tresys/framework/compiler/translator/NetworkSecmark.java

@@ -104 +104 @@
-                                        }
-                                        
-e
+
-                                        m_netBuffer.print (typeBuf.toString ());
-