Changeset 1484

Timestamp:

02/16/07 15:54:21 (2 years ago)

Author:

bwilliams

Message:

Fix to allow basedomains to not break encapulation rules in policy

Files:

• trunk/framework-plugin/src/com/tresys/framework/compiler/translator/Translator.java (modified) (3 diffs)

trunk/framework-plugin/src/com/tresys/framework/compiler/translator/Translator.java

@@ -159 +159 @@
-                        if(dom instanceof Domain) {
-                                makeDomain((Domain) dom, stream);
-                                TranslateAccesses((Domain)dom, stream);
-                        } else if(dom instanceof UserDomain) {
-                                makeUserDomain((UserDomain) dom, stream);
-                        }
+                        if(dom instanceof BaseDomain) {
+                                stream.print("optional_policy(`\n" + 
+                                                         "\tgen_require(`\n" + 
+                                                         "\t\ttype " + ((BaseDomain) dom).getType() + ";\n" + 
+                                                         "\t\trole " + ((BaseDomain) dom).GetRole() + ";\n" + 
+                                                         "\t')\n");
+                        }
+                        TranslateAccesses(dom, stream);
-                        TranslateEntries(dom, stream);
+                        if(dom instanceof BaseDomain) {
+                                stream.print("\n')\n");
+                        }
-                }
-
@@ -243 +253 @@
-        
-        
-
+I
-                Iterator iter = dom.GetAccesses().iterator();
-                while(iter.hasNext()) {
@@ -1169 +1179 @@
-        private void PropogateRole(IDomain endDomain, String role) {
-                List entries = endDomain.GetEntries();
-
-
+
+
+
+
+
+
-                if(newRole) {
-                        Iterator itr = entries.iterator();