Changeset 2005

Timestamp:

03/19/08 14:41:13 (8 months ago)

Author:

apatel

Message:

merged trunk:2003

Files:

• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/SharedColors.java (modified) (1 diff)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/AccessCheckBuilder.java (modified) (8 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/FrameworkNature.java (modified) (5 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java (modified) (4 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/linkage/NamedInterfaceSelection.java (modified) (1 diff)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/DomainBorder.java (modified) (2 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/DomainFigure.java (modified) (2 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/EntryPointFigure.java (modified) (4 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/PolicyComponentFigure.java (modified) (3 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/ResourceFigure.java (modified) (3 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/Shape.java (modified) (3 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/PolicyEditPart.java (modified) (3 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSESupport.java (copied) (copied from trunk/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSESupport.java)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSEclipseLevel.java (deleted)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSSettingsProjProperties.java (modified) (6 diffs)

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/SharedColors.java

@@ -30 +30 @@
-
-        /** Creates an returns a shared color manager. */
-public 
+
-        {
-                super ();

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/AccessCheckBuilder.java

@@ -17 +17 @@
-import java.io.InputStream;
-import java.util.Collection;
+import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
@@ -40 +41 @@
-import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_access_decision;
-import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_access_vector;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_handle_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_module_package_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_policydb_t;
-import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_security_class_t;
-import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_security_id_t;
@@ -101 +105 @@
-                        try
-                        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        catch (CoreException ce)
-                        {}
+                        catch (IOException ioe)
+                        {
+                                ioe.printStackTrace ();
+                        }
-                }
-                
@@ -118 +154 @@
-                implements IResourceVisitor
-        {
+                
+                private boolean m_bFoundMonolithic;
+                private boolean m_bFoundModules;
+
+                private IFile m_monolithicPolicy = null;
+                private IFile m_baseModule = null;
+                private Collection /* <IFile> */ m_modules = new HashSet ();
+                
+                /**
+                 * @return the m_bFoundModules
+                 */
+                public boolean isModular ()
+                {
+                        return m_bFoundModules;
+                }
+                
+                /**
+                 * @return the m_bFoundMonolithic
+                 */
+                public boolean isMonolithic ()
+                {
+                        return m_bFoundMonolithic;
+                }
+                
+                /**
+                 * @return the m_monolithicPolicy
+                 */
+                public IFile getMonolithicPolicy ()
+                {
+                        return m_monolithicPolicy;
+                }
+                
+                /**
+                 * @return the m_baseModule
+                 */
+                public IFile getBaseModule ()
+                {
+                        return m_baseModule;
+                }
+                
+                /**
+                 * @return the m_modules
+                 */
+                public Collection getModules ()
+                {
+                        return m_modules;
+                }
+                
-        /* (non-Javadoc)
-                 * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
@@ -123 +207 @@
-                public boolean visit (IResource resource)
-                {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-                                // match policy file
-                                String sExtn = resource.getFileExtension ();
-                                if (sExtn == null)
-                                        return false;
-                                
-                                //TODO: need to deal with modular builds!!                              
-                                String sSubName = resource.getName ();
-                                sSubName = sSubName.substring (0, sSubName.length () - sExtn.length () -1);
-                                if (!BaseProjectNature.FILE_POLICY_BASE.equals (sSubName))
-                                        return false;
-                                
-                                if (Integer.valueOf (sExtn) == null)
-                                        return false;
-
-                                FrameworkNature nat = FrameworkNature.getNature (resource.getProject ());
-
-                                // visit the actual policy
-                                SELinuxSystem sys = nat.getSystem (resource);
-
-                                SLIDEProjectNature snat = SLIDEProjectNature.getNature (resource.getProject ());
-                                File buildConfPath = snat.GetBuildConfPath (resource);
-                                BuildConfFile buildConf = new BuildConfFile (buildConfPath);
-
-                                AccessCheckVisitor visitor = new AccessCheckVisitor (buildConf, (IFile) resource, sys.getFPOLErrorHandler ());
-
-                                if (visitor != null)
-                                {
-                                        Policy policy = sys.getPolicy ();
-                                        
-                                        policy.Accept (visitor);
-                                }
-                        }
-                        catch (IOException e)
-                        {
-                                e.printStackTrace();
-                        }
-                        return false;
-                }       
@@ -180 +262 @@
-
-                
-
-
+
+
+
-                private final BuildConfFile m_buildConf;
-                private final ErrorHandler m_errorHandler;
-                
-
+
+
+
+
+
+
+
+
-                AccessCheckVisitor (BuildConfFile i_buildConf, IFile i_policyFile, ErrorHandler i_errorHandler)
-                        throws FileNotFoundException, IOException
-                {
-
-
+
-                        policy_file_t pFile = null;
-                        m_buildConf = i_buildConf;
-                
-                        if (false)
@@ -216 +304 @@
-                        }
-                        
+                        long nStartTime = System.currentTimeMillis ();
-                        m_policyDB = new policydb_t (pFile);
+                        if (DEBUG)
+                        {
+                                long nEndTime = System.currentTimeMillis ();
+                                System.out.println ("Time to load monolithic policy: " + (nEndTime - nStartTime));
+                        }
+
+                        m_policyDB.set_activepolicy ();
-                        m_sidTab = new sidtab_t();
-                }
+                
+                // load modular policy 
+                AccessCheckVisitor (BuildConfFile i_buildConf, IFile i_base, Collection /* <IFile> */ i_modules, ErrorHandler i_errorHandler)
+                        throws FileNotFoundException, IOException
+                {
+                        this (i_buildConf, i_errorHandler);
+                        
+                        String sBasePath = i_base.getRawLocation ().toOSString ();
+                        sepol_module_package_t [] modules = new sepol_module_package_t [i_modules.size ()];
+
+                        long nStartTime = System.currentTimeMillis ();
+                        
+                        sepol_module_package_t base = new sepol_module_package_t (sBasePath);
+
+                        int i = 0;
+                        for (Iterator itr = i_modules.iterator (); itr.hasNext (); )
+                        {
+                                IFile moduleFile = (IFile) itr.next ();
+                                String sModulePath = moduleFile.getRawLocation ().toOSString ();
+                                modules[i++] = new sepol_module_package_t (sModulePath);
+                        }
+
+                        if (DEBUG)
+                        {
+                                long nEndTime = System.currentTimeMillis ();
+                                System.out.println ("Time to load modules: " + (nEndTime - nStartTime));
+                        }
+                        
+                        sepol_handle_t handle = new sepol_handle_t();
+
+                        nStartTime = System.currentTimeMillis ();
+                        handle.link_packages (base, modules);
+                        
+                        if (DEBUG)
+                        {
+                                long nEndTime = System.currentTimeMillis ();
+                                System.out.println ("Time to link modules: " + (nEndTime - nStartTime));
+                        }
+                        
+                        m_sepol_policyDB = new sepol_policydb_t (handle, base.get_policy ());                   
+                        m_sepol_policyDB.set_activepolicy ();
+                        
+                        m_sidTab = new sidtab_t();
+                }
+                
-                
-                public void PostVisit (Policy i_policy)
@@ -279 +420 @@
-                                Rdef rdef = (Rdef) itr.next ();
-
-getName () + '_' + rdef.GetName () + "_t"; //$NON-NLS-1$ 
+GetTypeWithDictionaryObject(rdef.GetName());
-                                String sResContext = res.getUser () + ':' + res.getRole () + ':' + sResType;
-

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/FrameworkNature.java

@@ -60 +60 @@
-import com.tresys.framework.plugin.editor.policy.graphic.IShapeVisitor;
-import com.tresys.framework.plugin.editor.policy.graphic.model.DefaultMLSLevelUpdateVisitor;
+import com.tresys.framework.plugin.preferences.MLSESupport;
-import com.tresys.framework.plugin.preferences.MLSSettingsProjProperties;
-import com.tresys.framework.plugin.preferences.PreferenceInitializer;
@@ -91 +92 @@
-        
-        // Reference to retain the MLS Level Configuration file
-
+E
-
-        /**
@@ -626 +627 @@
-         *                                                                                configuration file 
-         */
-
+E
-        {
-                if (null == _mlsConfiguration)
@@ -637 +638 @@
-                        try
-                        {
-
+E
-                        }
-                        catch (MLSInitializationException mie)
@@ -647 +648 @@
-                                        IPath ipFull = mlsConfigurationFile.getLocation ();
-                                        File file = ipFull.toFile ();  
-
+E
-                                }
-                        }

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java

@@ -55 +55 @@
-import com.tresys.framework.compiler.linkage.Linkage;
-import com.tresys.framework.compiler.linkage.libselinuxjava_plugin;
-import com.tresys.framework.compiler.mls.MLSSupport;
-import com.tresys.framework.compiler.policy.IPolicyVisitor;
-import com.tresys.framework.compiler.policy.Policy;
@@ -66 +65 @@
-import com.tresys.framework.plugin.editor.policy.graphic.GraphicPolicyRefresh;
-import com.tresys.framework.plugin.editor.policy.graphic.model.PolicyDiagram;
+import com.tresys.framework.plugin.preferences.MLSESupport;
-import com.tresys.framework.plugin.preferences.SEFPreferencePage;
-
@@ -123 +123 @@
-        protected final File buildPath;
-
-
+E
-        protected ErrorHandler m_fsysErrorHandler;
-        protected ErrorHandler m_fpolErrorHandler;
@@ -129 +129 @@
-        protected static final boolean DEBUG = SEFramework_Plugin.getDefault ().isDebugging ("/debug/building");
-        
-
+E
-                throws IllegalArgumentException 
-        {

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/linkage/NamedInterfaceSelection.java

@@ -209 +209 @@
-                Integer nBackflow = new Integer (0);
-                String sBackflow = m_txtBackflow.getText ();
-
-
+
+
+
+
+
+
+
-                
-                getInterfaceList ().setBackflow (nBackflow);

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/DomainBorder.java

@@ -4 +4 @@
-|*| Author:     David Sugar <dsugar@tresys.com>
-|*|  
-
+
+
-\*/
-
@@ -66 +67 @@
-                
-                Insets tmpPadding = getPadding();
-tempRect.setBounds(getPaintRectangle(figure, insets))
-Rectangle rec = tempRect
+Rectangle rec = Rectangle.SINGLETON
+rec.setBounds(getPaintRectangle(figure, insets))
-                
-                Dimension textSize = FigureUtilities.getTextExtents(getLabel (), getFont());
-                
-                rec.height = Math.min (rec.height, textSize.height + tmpPadding.getHeight());
-2
+5
-                int y = rec.y + tmpPadding.top;
-

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/DomainFigure.java

@@ -4 +4 @@
-|*| Author:     David Sugar <dsugar@tresys.com>
-|*|  
-
+
+
-\*/
-
@@ -38 +39 @@
-        protected void outlineShape(Graphics graphics) 
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-}

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/EntryPointFigure.java

@@ -3 +3 @@
-|*| License: refer to COPYING file for license information.
-|*| Author:     Mary Snyder <msnyder@tresys.com>
+|*|                             Dave Sugar <dsugar@tresys.com>
-|*|  
-
+
+
-\*/
-
@@ -17 +19 @@
-import org.eclipse.swt.graphics.Image;
-
-
+
+
-{
-        
@@ -30 +33 @@
-        protected void fillShape(Graphics graphics) 
-        {
-
-
-
-
-
-
-
+
+
+
-                
-
-
-
-
-
-
-
+
-                
-                {
@@ -75 +68 @@
-        protected void outlineShape(Graphics graphics) 
-        {
-
+
+
-                
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-        }
+        
+        private int [] getPoints (Rectangle i_bounds)
+        {
+                int x = i_bounds.x + getLineWidth () / 2;
+                int y = i_bounds.y + getLineWidth () / 2;
+                int width = i_bounds.width - Math.max(1, getLineWidth ());
+                int height = i_bounds.height - Math.max(1, getLineWidth ());
+
+                int[] points = { x + width/2, y,                        // top
+                 x + i_bounds.width - 2, y + height/3,  // right-top
+                 x + ( 5 * width )/6,  y + height,              // right-bottom
+                 x + width/6, y +  height,                              // left-bottom
+                 x, y + height/3 };                                             // left-top
+
+                return points;
+//              return new PointList (points);
+        }
-}
-

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/PolicyComponentFigure.java

@@ -4 +4 @@
-|*| Author:     David Sugar <dsugar@tresys.com>
-|*|  
-
+
+
-\*/
-
@@ -28 +29 @@
-        private String m_sName;
-        private int m_nSeverity = -1;
+        private Color m_mlsHighlight = null;
-
-        private static final Image m_imgError = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
@@ -92 +94 @@
-        }
-        
+        public void setMLSHighlight (Color i_color)
+        {
+                m_mlsHighlight = i_color;
+        }
+        
+        protected Color getMLSHighlight ()
+        {
+                return m_mlsHighlight;
+        }
+        
-        public void setSeverity (int i_nSeverity)
-        {

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/figure/ResourceFigure.java

@@ -4 +4 @@
-|*| Author:     David Sugar <dsugar@tresys.com>
-|*|  
-
+
+
-\*/
-
@@ -27 +28 @@
-                Rectangle fillBounds = new Rectangle (getBounds());
-                graphics.fillOval(fillBounds);
-
--lineWidth, -lineWidth
+
+lineWidth * -2, lineWidth * -2
-                
-                FontMetrics metrics = graphics.getFontMetrics();
@@ -81 +82 @@
-                r.width--;
-                r.height--;
-
+
+
-                graphics.drawOval(r);
+                
+                r.shrink(getLineWidth (), getLineWidth ());
+                
+                if (getMLSHighlight () != null)
+                {
+                        graphics.setForegroundColor (getMLSHighlight ());
+                        graphics.drawOval (r);
+                }
-        }
-

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/Shape.java

@@ -27 +27 @@
-import com.tresys.framework.compiler.dictionary.Verb;
-import com.tresys.framework.compiler.mls.MLSLevel;
-import com.tresys.framework.compiler.mls.MLSSupport;
-import com.tresys.framework.compiler.policy.Component;
-import com.tresys.framework.compiler.policy.Domain;
@@ -36 +35 @@
-import com.tresys.framework.plugin.builder.FrameworkNature;
-import com.tresys.framework.plugin.builder.SELinuxSystem;
+import com.tresys.framework.plugin.preferences.MLSESupport;
-
-public abstract class Shape 
@@ -602 +602 @@
-        }
-        
-
+E
-        {
-                FrameworkNature nat = FrameworkNature.getNature (getSystem ().getProject ());

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/PolicyEditPart.java

@@ -39 +39 @@
-import com.tresys.framework.plugin.editor.policy.graphic.model.ResourceShape;
-import com.tresys.framework.plugin.editor.policy.graphic.model.Shape;
-clipseLevel
+Support
-import com.tresys.framework.plugin.preferences.SEFPreferencePage;
-
@@ -234 +234 @@
-                Rectangle bounds = new Rectangle(shape.getLocation(), shape.getSize());
-                
-tmpF
+drawn_f
-                
-                GraphicalEditPart part = (GraphicalEditPart) getParent ();
-(this, tmpF
-tmpF
+ (this, drawn_f
+drawn_f
-                        return;
-                
+                PolicyComponentFigure policyComponentfigure = (PolicyComponentFigure) drawn_figure;
+                
-                String sName = shape.getSubName();
-((PolicyComponentFigure) tmpFigure)
-((PolicyComponentFigure) tmpFigure)
+policyComponentfigure
+policyComponentfigure
-                
-                if (shape.getComponent () instanceof IMLSSetting)
@@ -249 +251 @@
-                        MLSLevel mls = ((IMLSSetting) shape.getComponent ()).getMLSLevel ();
-                        if (mls != null)
-
+
+
+
+
-                }
-        }

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/preferences/MLSSettingsProjProperties.java

@@ -70 +70 @@
-import com.tresys.framework.compiler.mls.MLSInitializationException;
-import com.tresys.framework.compiler.