Changeset 1961

Timestamp:

02/27/08 10:43:24 (9 months ago)

Author:

dsugar

Message:

some rough code to test the checking of accesses
some null pointer checks

Files:

• branches/mls/framework-plugin/src/com/tresys/framework/compiler/mls/MLSSupport.java (modified) (1 diff)
• branches/mls/framework-plugin/src/com/tresys/framework/plugin/builder/FrameworkNature.java (modified) (5 diffs)
• branches/mls/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java (modified) (2 diffs)
• branches/mls/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/DomainEditPart.java (modified) (1 diff)
• branches/mls/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/ShapeEditPart.java (modified) (1 diff)

branches/mls/framework-plugin/src/com/tresys/framework/compiler/mls/MLSSupport.java

@@ -329 +329 @@
-        public MLSLevel getLevel (String i_sLabel)
-        {
+                if (i_sLabel == null)
+                        return null;
+                
-                return (MLSLevel) _levels.get (i_sLabel);
-        }

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

@@ -15 +15 @@
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
@@ -21 +22 @@
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
@@ -35 +37 @@
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
@@ -49 +52 @@
-import com.tresys.framework.compiler.Utility;
-import com.tresys.framework.compiler.dictionary.Dictionary;
+import com.tresys.framework.compiler.dictionary.Rdef;
-import com.tresys.framework.compiler.linkage.flnkage.FLNKParser;
+import com.tresys.framework.compiler.linkage.libselinuxjava.policy_file_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.policydb_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_access_vector_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_decision;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_security_class_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sepol_security_id_t;
+import com.tresys.framework.compiler.linkage.libselinuxjava.sidtab_t;
-import com.tresys.framework.compiler.mls.MLSInitializationException;
-import com.tresys.framework.compiler.mls.MLSLevel;
-import com.tresys.framework.compiler.mls.MLSSupport;
+import com.tresys.framework.compiler.policy.Access;
+import com.tresys.framework.compiler.policy.IDomain;
+import com.tresys.framework.compiler.policy.Policy;
+import com.tresys.framework.compiler.policy.Resource;
-import com.tresys.framework.plugin.SEFramework_Plugin;
-import com.tresys.framework.plugin.builder.FrameworkBuilder;
@@ -752 +767 @@
-                        IResource res = delta.getResource ();
-
-!(res instanceof IFolder)
+res instanceof IWorkspaceRoot
-                                return true;
-                        
-.getName ().equals(m_srcDir)
+ instanceof IProject
-                                return true;
-                        
-
+
+
+
+
+
+
+
+
+
+
+
-                                return false;
+                        }
+
+                        if (nat == null)
+                                return false;
+
+//                      if (!(res instanceof IFolder))
+//                              return true;
+        
+                        if (res instanceof IFolder)
+                        {
+                                if (res.getName ().equals(m_srcDir))
+                                        return true;
+                        
+                                if (res.getName().startsWith(SystemProjectNature.DIR_SYSTEM_PREFIX))
+                                {
+                                        SELinuxSystem existingSystem = nat.getSystem(res);
+                                        switch (delta.getKind())
+                                        {
+                                                case IResourceDelta.REMOVED:
+                                                        if (existingSystem != null)
+                                                                nat.removeSystem (existingSystem);
+                                                        break;
+                                                        
+                                                case IResourceDelta.ADDED:
+                                                        if (existingSystem == null)
+                                                        {
+                                                                SELinuxSystem sys = new SELinuxSystem ((IFolder) res);
+                                                                nat.addSystem(sys);
+                                                        }
+                                                        break;
+                                        }
+                                        
+                                        return true;
+                                }
+                        }
+                        else if (res instanceof IFile)
+                        {
+                                if (delta.getKind () == IResourceDelta.REMOVED)
+                                        return false;
+                                
+                                String sExtension = res.getFileExtension (); 
+                                if (sExtension == null)
+                                        return false;
+                                
+                                String sName = res.getName ().substring (0, res.getName ().length () - sExtension.length () -1);
+                                if (sName.equals ("policy") && Integer.valueOf (sExtension) != null)
+                                {
+                                        checkAccesses ((IFile) res);
+                                        
+                                }
+                                
+                        }
+                        
+                        return false;
+                }
+
+                //TODO - this functions but is very unstable at this point - I just want to get it committed in a rough working state
+                private void checkAccesses (IFile i_policy)
+                {
+                        boolean bRunCheckAccess = false;
+                        if (!bRunCheckAccess)
+                                return;
-                        
-                        try
-                        {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                {
-
+
+
+
+
+
+
+
-                                        {
-
-
-
-
-
-
-
-
+
+
-                                                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                }
-                                        }
-                                                break;
-                                }
-                        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

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

@@ -95 +95 @@
-        
-        public SELinuxSystem(IFolder folder) 
-
+IllegalArgument
-        {
-                if (DEBUG)
@@ -106 +106 @@
-                }
-                else 
-
+IllegalArgument
-
-                AnalysisContainer.getContainer ().addListener (m_folder, this);

branches/mls/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/DomainEditPart.java

@@ -136 +136 @@
-                                IMLSSetting ims = (IMLSSetting)is.getComponent ();
-                                MLSLevel level = mlss.getLevel (ims.getMLSLabel ());
-
+
+
+
-                        }                       
-                        m_connectionAnchor = new ConnectionAnchorFigure (domFig);

branches/mls/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/parts/ShapeEditPart.java

@@ -139 +139 @@
-                                IMLSSetting ims = (IMLSSetting)is.getComponent ();
-                                MLSLevel level = mlss.getLevel (ims.getMLSLabel ());
-
+
+
-                        }                       
-                }