Changeset 2215

Timestamp:

06/07/08 11:46:12 (6 months ago)

Author:

dsugar

Message:

bunch of cleanup
fix problem with editing properties making it into the fnet file

Files:

• trunk/framework-plugin/src/com/tresys/framework/compiler/FNetGenerator.java (modified) (2 diffs)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/Endpoint.java (modified) (2 diffs, 1 prop)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/FNETParser.jj (modified) (6 diffs, 1 prop)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetConnection.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetItem.java (modified) (2 diffs, 1 prop)
• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetworkConfig.java (modified) (3 diffs, 1 prop)
• trunk/framework-plugin/src/com/tresys/framework/compiler/policy/SystemResourceValidator.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/compiler/systemResources/NetworkInfo.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/compiler/systemResources/SystemResourcesParser.jj (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/builder/ENetworkConfig.java (modified) (4 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/builder/SELinuxSystem.java (modified) (2 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java (modified) (6 diffs)

trunk/framework-plugin/src/com/tresys/framework/compiler/FNetGenerator.java

@@ -112 +112 @@
-                
-                mData.append ("networkresource ");
-
+ 
-
-                if (type != null)
@@ -146 +146 @@
-
-        }
-        
-        public String toString ()
-        {
-                return mSystems.append (mData).toString ();
-        }
-
-}

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

@@ -5 +5 @@
-|*| Author: Dave Sugar <dsugar@tresys.com>
-|*| 
-:2008-05-12 13:08:06 -0400 (Mon, 12 May 2008) 
-:2113 
+
+
-\*/
-
@@ -65 +65 @@
-                return m_netInfo;
-        }
-                
-        
-        public NetSystem getSystem ()

trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/FNETParser.jj

@@ -16 +16 @@
-|*| License: refer to COPYING file for license information.
-|*| Authors: Dave Sugar <dsugar@tresys.com>
-
-
+: 
+: 
-\*/
-
@@ -295 +295 @@
-        Token connection;
-        Token esp;
-
-
+
-        Token port = null;
-        Integer nESP = null;
@@ -303 +302 @@
-        <CONNECTION> system = <ID> <SEPERATOR> domain = <ID>
-        <LBRACE>
-ip = <IP> (<SLASH> (mask = <IP>) )? (port = <NUMBER>
+(ip = <IP> (port = <NUMBER>)?
-        <RBRACE>
-        {
@@ -319 +318 @@
-                        }
-                                
-Mask
-mask
-Mask = mask
-
-ip.image, sMask
+IP
+ip
+IP = ip
+       
+sIP, null
-                        source = new Endpoint (netSys, domain, info); 
-                }
@@ -329 +328 @@
-                // reinit - used later
-                port = null;
-mask
+ip
-        }
-        system = <ID> <SEPERATOR> domain = <ID>
-        <LBRACE>
-ip = <IP> (<SLASH> (mask = <IP>) )? (port = <NUMBER>
+(ip = <IP> (port = <NUMBER>)?
-        <RBRACE>
-        {
@@ -349 +348 @@
-                        }
-                        
-Mask
-mask
-Mask = mask
+IP
+ip
+IP = ip
-                        
-ip.image, sMask
+sIP, null
-                        target = new Endpoint (netSys, domain, info); 
-                }

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

@@ -58 +58 @@
-
-        /* (non-Javadoc)
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        public boolean equals (Object obj)
+        {
+                if (super.equals (obj))
+                        return true;
+                
+                if (!(obj instanceof NetConnection))
+                        return false;
+                
+                NetConnection other = (NetConnection) obj;
+                if (!getSource ().equals (other.getSource ()))
+                        return false;
+                
+                if (!getTarget ().equals (other.getTarget ()))
+                        return false;
+                
+                if (!getResource ().equals (other.getResource ()))
+                        return false;
+                
+                return true;
+        }
+        
+        /**
+         * Return a hashcode for the component. Currently implemented as a 
+         * call to the String hashCode() method.
+         * 
+         * @return integer hashCode of this instance assuring two objects that
+         *                 are == will return same hashcode.
+         */
+        public int hashCode() 
+        {
+                return this.toString().hashCode();
+        }
+
+        /* (non-Javadoc)
-         * @see java.lang.Object#toString()
-         */

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

@@ -5 +5 @@
-|*| Author: Dave Sugar <dsugar@tresys.com>
-|*| 
-
-
+:2008-05-12 13:08:06 -0400 (Mon, 12 May 2008) 
+:2113 
-\*/
-
@@ -51 +51 @@
-                        return false;
-                
-
-
+//
+//
-                
-                return true;

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

@@ -67 +67 @@
-                {
-                        m_netresources.put (sName, i_item);
-
-
+
+
+
+
-                }
-        }
@@ -241 +243 @@
-//              m_accesses.add (i_access);
-        
-
+///
-                
-                NetworkResource netResource = (NetworkResource) i_access.getResource ();
@@ -276 +278 @@
-                {
-                        Collection oldConnections = getConnections (netRes);
-Vector
+HashSet
-
-                        for (Iterator itr = endpoints.iterator (); itr.hasNext (); )

trunk/framework-plugin/src/com/tresys/framework/compiler/policy/SystemResourceValidator.java

@@ -193 +193 @@
-                                                m_errHandler.Error ("The Rdef \"" + dobject.GetName()
-                                                                + "\" associated with component \"" + i_component.getName()
-resource
+information
-                                                                ErrorHandler.ERROR_MISSING_NETWORK, i_component.getName ());
-                                        }

trunk/framework-plugin/src/com/tresys/framework/compiler/systemResources/NetworkInfo.java

@@ -93 +93 @@
-
-                NetworkInfo other = (NetworkInfo) obj;
-
-
-
+
+
-                {
-                        return false;
-                }
-                
-
-
-
+
+
+
+
+
+
+
+
-                {
-                        return false;

trunk/framework-plugin/src/com/tresys/framework/compiler/systemResources/SystemResourcesParser.jj

@@ -389 +389 @@
-                                return;
-                        
+                        if (ipAddr == null)
+                                return;
+                                
-                        localInfo = new NetworkInfo (null, ipAddr, null, aports); 
-                        NetworkResource network = new LabeledNetworkResource (localInfo, dobj);

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

@@ -15 +15 @@
-import java.beans.PropertyChangeListener;
-import java.util.Collection;
+import java.util.HashSet;
-import java.util.Iterator;
-
@@ -20 +21 @@
-import com.tresys.framework.compiler.dictionary.SysResourceState;
-import com.tresys.framework.compiler.linkage.net.Endpoint;
+import com.tresys.framework.compiler.linkage.net.NetConnection;
-import com.tresys.framework.compiler.linkage.net.NetResource;
-import com.tresys.framework.compiler.linkage.net.NetSystem;
@@ -27 +29 @@
-import com.tresys.framework.compiler.policy.AccessNetwork;
-import com.tresys.framework.compiler.policy.NetworkResource;
+import com.tresys.framework.compiler.systemResources.NetworkInfo;
-import com.tresys.framework.compiler.systemResources.SystemResourceTypes;
-import com.tresys.framework.plugin.editor.policy.graphic.model.AccessConnection;
@@ -153 +156 @@
-                        
-                }
+                else if (NetworkResourceShape.NETWORK_INFO_LOCAL.equals (sProperty))
+                {
+                        NetworkInfo oldInfo = (NetworkInfo) e.getOldValue ();
+                        NetworkInfo newInfo = (NetworkInfo) e.getNewValue ();
+                        
+                        NetworkResourceShape source = (NetworkResourceShape) e.getSource ();
+
+                        Collection endPoints = (Collection) m_endpoints.get (source.getName ());
+                        {
+                                HashSet newPoints = new HashSet ();
+                                for (Iterator itr1 = endPoints.iterator (); itr1.hasNext (); )
+                                {
+                                        Endpoint pt = (Endpoint) itr1.next ();
+                                        if (!pt.getSystem ().getName ().equals (source.getSystem ().getName ()))
+                                                continue;
+                                        
+                                        if (pt.getNetworkInfo ().equals (oldInfo))
+                                        {
+                                                NetworkInfo netInfo = new NetworkInfo (newInfo);
+                                                Endpoint newPoint = new Endpoint (pt.getSystem (), pt.getToken (), netInfo);
+                                                newPoints.add (newPoint);
+                                                itr1.remove ();
+                                        }
+                                }
+                                endPoints.addAll (newPoints);
+                        }
+                        
+
+                        Collection cons = (Collection) m_connections.get (source.getName ());
+                        {
+                                HashSet newConnections = new HashSet ();
+                                for (Iterator itr1 = cons.iterator (); itr1.hasNext (); )
+                                {
+                                        NetConnection con = (NetConnection) itr1.next ();
+                                        if (!con.getResource ().equals (source.getNetResource ()))
+                                                continue;
+                                        
+                                        NetConnection newConnection = null;
+                                        if (con.getSource ().getNetworkInfo ().equals (oldInfo))
+                                        {
+                                                Endpoint oldSource = con.getSource ();
+                                                Endpoint srcPoint = new Endpoint (oldSource.getSystem (), oldSource.getToken (), newInfo);
+                                                newConnection = new NetConnection (srcPoint, con.getTarget (), source.getNetResource (), con.getESPNumber ());
+                                        }
+                                        else if (con.getTarget ().getNetworkInfo ().equals (oldInfo))
+                                        {
+                                                Endpoint oldTarget = con.getTarget ();
+                                                Endpoint targetPoint = new Endpoint (oldTarget.getSystem (), oldTarget.getToken (), newInfo);
+                                                newConnection = new NetConnection (con.getSource(), targetPoint, source.getNetResource (), con.getESPNumber ());
+                                        }
+                                        if (newConnection != null)
+                                        {
+                                                itr1.remove ();
+                                                newConnections.add (newConnection);
+                                        }
+                                }
+                                cons.addAll (newConnections);
+                        }
+                }
+                else if (NetworkResourceShape.NETWORK_INFO_REMOTE.equals (sProperty))
+                {
+                        // we really don't care - only local info is used in the fnet file                      
+                }
-        }
-}

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

@@ -96 +96 @@
-        /** The saved reference to the Policy */
-        private Policy m_policy;
+        private long m_policyModStamp = IResource.NULL_STAMP;
-
-        private static boolean libSELinuxLoaded = false;
@@ -187 +188 @@
-        public Policy getPolicy() 
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                }
-

trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java

@@ -3 +3 @@
-|*| License: refer to COPYING file for license information.
-|*| Author:     Norman Patrick <npatrick@tresys.com>
+|*|                             Dave Sugar <dsugar@tresys.com>
-|*|  
-|*| $Rev$
@@ -98 +99 @@
-        public static final String NetworkResource_ip_ports_pattern = "([0-9]+( [0-9]+)*)?";
-
+        public static final String NETWORK_INFO_LOCAL = "NetworkResourceInfo.local";
+        public static final String NETWORK_INFO_REMOTE = "NetworkResourceInfo.remote";
+        
-        private IPropertyDescriptor[] m_descriptors = null;
-        private Vector m_rdefs = null;
@@ -386 +390 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public void setNetworkRdef (Rdef i_rdef)
-        {
@@ -598 +745 @@
-                 */
-
-Rdef rdef = GetRdef
+NetworkResource resource = (NetworkResource) getComponent
-
-                if (NETWORK_TYPE_PROP.equals (propertyId))
@@ -614 +761 @@
-                else if (NETWORK_PROTOCOL_INDEX.equals (propertyId))
-                        this.SetNetworkProtocolIndex (value);
-rdef != null
-{
-       NetworkResource resource = (NetworkResource) getComponent ();
-SystemResource sysResource = null
-       if (rdef != null
-       sysResource = resource.GetSystemResource (rdef
-
-
-       NetworkInfo localInfo = null;
-       NetworkInfo remoteInfo = null;
-
-
-sysResource =
+NETWORK_LOCAL_DEVICE.equals (propertyId)
+       setLocalDevice ((String) value);
+else if (NETWORK_LOCAL_IP_ADDRESS.equals (propertyId))
+setLocalIP ((String) value)
+else if (NETWORK_LOCAL_MASK.equals (propertyId)
+setLocalMask ((String) value
+
+
+else if (NETWORK_LOCAL_ENCRYPTION_TYPE_INDEX.equals (propertyId))
+{
+
+
+nconfig !
-                        {
-
-