Changeset 1770

Timestamp:

12/12/07 11:56:42 (1 year ago)

Author:

dsugar

Message:

Changes to support loading of the permission map file and lookup weights.
Ability to specify the permission map file to load in addition to default.

Files:

• trunk/framework-plugin/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/compiler/dictionary/PermVector.java (modified) (2 diffs)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/BasePolicy.java (modified) (5 diffs)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/IPermissionMap.java (added)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/Linkage.java (modified) (3 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java (modified) (7 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/builder/WeightLookup.java (added)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/dictionary/DictionaryCompletionProcessor.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/text/PolicyHoverController.java (modified) (12 diffs)
• trunk/oss-feature/feature.xml (modified) (2 diffs)

trunk/framework-plugin/META-INF/MANIFEST.MF

@@ -18 +18 @@
- org.eclipse.help,
- com.tresys.cdsframework.libselinuxjava,
-
-
+
+
+
-Eclipse-AutoStart: true
-Bundle-Vendor: %providerName

trunk/framework-plugin/src/com/tresys/framework/compiler/dictionary/PermVector.java

@@ -124 +124 @@
-                boolean valid = true;
-
-BasePolicy
+getBasePolicy ()
-                        objectClass.Error("The object class \"" + objectClass.image
-                                + "\" was not found in the base policy");
@@ -133 +133 @@
-                while(itr.hasNext()) {
-                        String perm = (String) itr.next();
-BasePolicy
+getBasePolicy ()
-                                objectClass.Error("The permission \"" + perm
-                                        + "\" was not found in the object class \""

trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/BasePolicy.java

@@ -13 +13 @@
-import com.tresys.framework.compiler.dictionary.AccessTarget;
-import com.tresys.framework.compiler.dictionary.PermVector;
+import com.tresys.setools.apol.apolConstants;
-import com.tresys.slide.linkage.SELinuxObjClass;
+import com.tresys.slide.linkage.SELinuxPermission;
-import com.tresys.slide.linkage.Weight;
-
@@ -23 +25 @@
- * and file context.
- */
-
+
+
+
+
-
-        /**
@@ -36 +41 @@
-         *             If memory allocation fails
-         */
-
+
+
-                super(flaskPath);
+        }
+
+        
+        public void setPermMapInterface (IPermissionMap i_permMap)
+        {
+                m_permMap = i_permMap;
-        }
-
@@ -48 +60 @@
-         *                              from the policy else default Weight Object.
-         */
-
+
+
-                Weight weight = new Weight();
-
-                /*for (AccessTarget at : defn.AccessTargets.values())*/
-                Iterator iter = defn.getAccessTargets().values().iterator();
-
+
+
-                        AccessTarget at = (AccessTarget) iter.next();
-                        /*for (PermVector pv : at.GetPermVectors().values())*/
-                        Iterator iter2 = at.GetPermVectors().values().iterator();
-
+
+
-                                PermVector pv = (PermVector) iter2.next();
-
-
-
+
+
-                                        continue;
+                                
+                                String sClass = currClass.getName ();
-
-                                /*for (String perm : pv.Permissions)*/
-                                Iterator iter3 = pv.getPermissions().iterator();
-
+
+
-                                        String perm = (String) iter3.next();
-
-
-
+
+
+
+
-                                        if(permWeight == null)
-                                                continue;
@@ -79 +98 @@
-                                        if(permWeight.Both > weight.Both)
-                                                weight.Both = permWeight.Both;
+*/
+                                        
+                                        int nDirection = m_permMap.getDirection (sClass, sPermission);
+                                        int nWeight = m_permMap.getWeight (sClass, sPermission);
+                                        
+                                        if (nDirection == apolConstants.APOL_PERMMAP_READ)
+                                                weight.Read = Math.max (weight.Read, nWeight);
+                                        else if (nDirection == apolConstants.APOL_PERMMAP_WRITE)
+                                                weight.Write = Math.max (weight.Write, nWeight);
+                                        else if (nDirection == apolConstants.APOL_PERMMAP_BOTH)
+                                                weight.Both = Math.max (weight.Both, nWeight);
+                                        
-                                }
-                        }

trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/Linkage.java

@@ -45 +45 @@
-        private final HashMap /*<String, Ability> */capabilities;
-
-ublic
+rivate final
-
-        /**
@@ -54 +54 @@
-         * @throws Exception    If memory allocation fails
-         */
-
+
+
-                BasePolicy = new BasePolicy(flaskPath);
-                availableBaseDomains = new HashMap/*<String, BaseDomain>*/();
@@ -60 +61 @@
-                capabilities = new HashMap();
-        }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-

trunk/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java

@@ -48 +48 @@
-import com.tresys.framework.plugin.preferences.SEFPreferencePage;
-
+import com.tresys.setools.analysis.IAnalysisListener;
+import com.tresys.setools.analysis.PolicyContainer;
+import com.tresys.setools.apol.apol_policy_t;
+import com.tresys.slide.plugin.nature.AnalysisContainer;
-import com.tresys.slide.plugin.nature.PolicyXMLContainer;
-import com.tresys.slide.plugin.nature.SLIDEProjectNature;
@@ -55 +59 @@
-public class SELinuxSystem 
-        extends PlatformObject 
-
+, IAnalysisListener
-{
-        
@@ -102 +106 @@
-                else 
-                        throw new Exception("System folder must be of the format: selinux-policy-(system name)");
+
+                AnalysisContainer.getContainer ().addListener (m_folder, this);
-        }
-        
@@ -415 +421 @@
-                        IFolder flaskFolder = getFolder().getFolder("policy" + File.separatorChar + "flask");
-                        String flaskPath = flaskFolder.getLocation().toString();
-                        String permWeightPath = null;
-
-                        if (!SEFramework_Plugin.getDefault ().getPreferenceStore ().getString (
-                                SEFPreferencePage.PERM_WEIGHT_PATH).equals (""))
-                        {
-                                permWeightPath = SEFramework_Plugin.getDefault ().getPreferenceStore ().getString (SEFPreferencePage.PERM_WEIGHT_PATH);
-                        }
-
-                        m_linkage = new Linkage (flaskPath);
-                        if (permWeightPath != null)
-                        {
-                                m_linkage.SetPermMapFile (permWeightPath);
-                        }
-
-                        m_linkage.LNFILESPATH = getProject ().getLocation ().toOSString ();
-
@@ -437 +431 @@
-                        m_linkage.SetAbilites (nat.getAbilities ());
-
+                        PolicyContainer container = AnalysisContainer.getContainer ().getContainer (m_folder);
+                        if (container !=  null)
+                        {
+                                String permWeightPath = SEFramework_Plugin.getDefault ().getPreferenceStore ().getString (SEFPreferencePage.PERM_WEIGHT_PATH);
+                                if (permWeightPath != null && permWeightPath.length () > 0)
+                                        container.setPermissionMapFile (permWeightPath);
+                                container.setLoadPermissionMap (true);
+                                m_linkage.getBasePolicy ().setPermMapInterface (new WeightLookup (container));
+                                
+                        }
-                }
-                
@@ -667 +671 @@
-        }
-
+        /**
+         * @deprecated use the builder now - passing in argument SLIDEProjectNature.m_sBUILD_TYPE_KEY = SLIDEProjectNature.m_sBUILD_RPM
+                HashMap args = new HashMap ();
+                args.put(SLIDEProjectNature.m_sBUILD_TYPE_KEY, SLIDEProjectNature.m_sBUILD_RPM);
+                proj.build(IncrementalProjectBuilder.FULL_BUILD, nat.getBuilderID(), args, monitor);
+         */
-        public void MakeRPM() 
-        {
@@ -716 +726 @@
-                });             
-        }
+
+        public void analsysUpdated (apol_policy_t i_analysis)
+        {
+                if (m_linkage == null)
+                        return;
+                
+                PolicyContainer container = AnalysisContainer.getContainer ().getContainer (m_folder);
+                if (container != null)
+                {
+                        String permWeightPath = SEFramework_Plugin.getDefault ().getPreferenceStore ().getString (SEFPreferencePage.PERM_WEIGHT_PATH);
+                        if (permWeightPath != null && permWeightPath.length () > 0)
+                                container.setPermissionMapFile (permWeightPath);
+                        container.setLoadPermissionMap (true);
+
+                        m_linkage.getBasePolicy ().setPermMapInterface (new WeightLookup (container));
+                }
+        }
-}

trunk/framework-plugin/src/com/tresys/framework/plugin/editor/dictionary/DictionaryCompletionProcessor.java

@@ -214 +214 @@
-                                        return new String [] {};
-                                
+                                Collection list = null;
+                                
-                                if (!preWord && (access.equals("resource") || access.equals("self")
-                                                || access.equals("other") || access.equals("start")
-                                                || access.equals("end")) || access.equals("}")) 
-                                {
-return link.BasePolicy.GetObjectClasses
+list = link.getBasePolicy ().GetObjectClassesCollection 
-                                }
-
-
+
+
+
+
+
+
+
-                        }
-                }

trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/text/PolicyHoverController.java

@@ -30 +30 @@
-import com.tresys.framework.compiler.dictionary.Verb;
-import com.tresys.framework.compiler.linkage.Linkage;
+import com.tresys.framework.compiler.linkage.flnkage.BaseAccessDefn;
+import com.tresys.framework.compiler.policy.AccessBaseResource;
-import com.tresys.framework.compiler.policy.BaseResource;
-import com.tresys.framework.compiler.policy.ComponentWithDictObjects;
@@ -147 +149 @@
-                                }
-
-
+
+
-                                        int /*Verb*/ verb = Verb.valueOf(currWord);
-                                        int i = hoverRegion.getOffset() - 1;
@@ -154 +157 @@
-                                        while (i > 0
-                                                        && (Character.isLetterOrDigit(currArea.charAt(i)) || currArea
-
+
+
-                                                i--;
-                                        }
-
-
+
+
-                                                i--;
-                                        }
@@ -165 +170 @@
-                                                        && (Character.isLetterOrDigit(currArea.charAt(i))
-                                                                        || currArea.charAt(i) == '_' || currArea
-
+
+
-                                                i--;
-                                        }
@@ -172 +178 @@
-                                        ComponentWithDictObjects comp = null;
-
-
-               currArea)) 
+currArea)) 
+
-                                                if (theDocProvider.getPolicy().GetDomains()
-
+
+
-                                                        comp = (ComponentWithDictObjects) theDocProvider.getPolicy()
-                                                                        .GetDomains().get(currArea);
-                                                }
-                                        }
-
-
-
-
+
+
+
+
+
+
+
+
-                                        }
-
-                                        return GetVerbHover(comp, verb);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                        return getDomainHover((IDomain)theDocProvider.getPolicy()
-                                                        .GetDomains().get(currWord));
-                                }
-
-               currWord)) 
+currWord)) 
+
-                                        return getResourceHover((Resource)theDocProvider.getPolicy()
-                                                        .GetResources().get(currWord));
-                                }
-
-               currWord)) 
+currWord)) 
+
-                                        return getEntryPointHover((EntrypointResource)theDocProvider.getPolicy()
-                                                        .GetEntrypoints().get(currWord));
-                                }
-
-               .containsKey(currWord)) 
+.containsKey(currWord)) 
+
-                                        return getBaseResourceHover((BaseResource)theDocProvider.getPolicy()
-                                                        .GetBaseResources().get(currWord));
-                                }
-                        }
-
+
+
+
-                        return null;
-
+
+
+
-                        return null;
-                }
@@ -366 +384 @@
-                                                SELinuxSystem sys = FrameworkNature.getNature(file.getProject ()).getSystem(file);
-                                                Linkage linkage = sys.getLinkage();
-BasePolicy
+getBasePolicy()
-
-                                                if (weight != null) 
@@ -383 +401 @@
-        }
-
+        protected String GetBaseResourceHover (BaseResource i_res, int /*Verb*/ i_verb)
+        {
+                String toBeDisplayed = new String ();
+                if (i_res == null) 
+                {
+                        return null;
+                }
+                toBeDisplayed += "Verb: " + Verb.toString(i_verb);
+                
+                Collection accesses = i_res.GetAccesses (i_verb);
+                for (Iterator itr = accesses.iterator (); itr.hasNext (); )
+                {
+                        AccessBaseResource access = (AccessBaseResource) itr.next ();
+
+                        for (Iterator itr2 = access.GetAccessDefns ().iterator (); itr2.hasNext (); )
+                        {
+                                BaseAccessDefn defaultDef = (BaseAccessDefn) itr2.next ();
+                                NameValuePair pairBackflow = defaultDef.GetNameValuePair ("backflow");
+                                if (pairBackflow != null)
+                                        toBeDisplayed += "\nBackflow: " + pairBackflow.GetValue ().toString ();
+
+                        }
+                }
+                
+                return toBeDisplayed;
+                
+        }
+        
-        protected String GetVerbHover(ComponentWithDictObjects comp, int /*Verb*/ verb) 
-        {
-""
+new String ()
-                Iterator iter,iter2;
-                if (comp == null) 
@@ -394 +440 @@
-
-                IResource file = theDocProvider.getCurrentFile();
-
+
-                /*for (Rdef rdef : comp.GetDictionaryObjects().values()) */
-                iter = comp.GetDictionaryObjects().values().iterator();
@@ -402 +448 @@
-                        if (rdef.GetAccessDefnGroup(verb) != null) 
-                        {
+                                Integer nBackflow = null;
-                                toBeDisplayed += '\n' + "Rdef: " + rdef.GetName() + '\n'
-                                                + "     Default AccessDefs:";
@@ -410 +457 @@
-                                {
-                                        AccessDefn defaultDef = (AccessDefn)iter2.next();
+                                        NameValuePair pairBackflow = defaultDef.GetNameValuePair ("backflow");
+                                        if (pairBackflow != null)
+                                        {
+                                                nBackflow = (Integer) pairBackflow.GetValue ();
+                                        }
-                                        toBeDisplayed += " " + defaultDef.getName();
-                                }
@@ -422 +474 @@
-                                        SELinuxSystem sys = FrameworkNature.getNature(file.getProject()).getSystem(file);
-                                        Linkage linkage = sys.getLinkage();
-BasePolicy
+getBasePolicy()
-                                        weight = weight.Combine (linkageWeight);
-                                }
-                                if (weight != null
-
-
-
-
+
+
-                                {
-                                        toBeDisplayed += '\n';
@@ -438 +488 @@
-                                        if (weight.Both > 0)
-                                                toBeDisplayed += " ReadWrite: " + weight.Both;
+
+                                        if (nBackflow != null)
+                                        {
+                                                if (verb == Verb.read && weight.Write > 0)
+                                                        nBackflow = new Integer (weight.Write);
+                                                else if (verb == Verb.write && weight.Read > 0)
+                                                        nBackflow = new Integer (weight.Read);
+                                        }
+                                        
+                                        if (nBackflow != null)
+                                                toBeDisplayed += "\nBackflow: " + nBackflow;
+                                        
+                                        
-                                }
-                        } 

trunk/oss-feature/feature.xml

@@ -3 +3 @@
-      id="com.tresys.cdsframework"
-      label="CDS Framework"
-0
+1
-      provider-name="Tresys Technology"
-      os="linux"
@@ -92 +92 @@
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.help"/>
-
-
+
+
+
-   </requires>
-