Changeset 2239

Timestamp:

06/13/08 10:01:20 (3 months ago)

Author:

dsugar

Message:

bunch of cleanup of network resource stuff

Files:

• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetworkConfig.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java (modified) (2 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java (modified) (8 diffs)

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

@@ -250 +250 @@
-        public void accessAdded (AccessNetwork i_access)
-        {
-//              m_accesses.add (i_access);
-        
-///             System.out.println ("Add network access " + i_access);
-                
-                NetworkResource netResource = (NetworkResource) i_access.getResource ();
-

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

@@ -95 +95 @@
-        public static final String DISPLAY_NAME_NETWORK_PROTOCOL = Messages.network_protocol;
-
-        public static final String NetworkResource_ipv4_address_pattern = "^(((25[0-5])|(2[0-4][0-9])|([01]?[0-9][0-9]?))\\.){3}((25[0-5])|(2[0-4][0-9])|([01]?[0-9][0-9]?))$";
-        public static final String NetworkResource_ipv6_address_pattern = "^(^(([0-9a-fA-F]{1,4}(((:[0-9a-fA-F]{1,4}){5}::[0-9a-fA-F]{1,4})|((:[0-9a-fA-F]{1,4}){4}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,1})|((:[0-9a-fA-F]{1,4}){3}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,2})|((:[0-9a-fA-F]{1,4}){2}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,3})|(:[0-9a-fA-F]{1,4}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,4})|(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,5})|(:[0-9a-fA-F]{1,4}){7}))$|^(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,6})$)|^::$)|^((([0-9a-fA-F]{1,4}(((:[0-9a-fA-F]{1,4}){3}::([0-9a-fA-F]{1,4}){1})|((:[0-9a-fA-F]{1,4}){2}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,1})|((:[0-9a-fA-F]{1,4}){1}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,2})|(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,3})|((:[0-9a-fA-F]{1,4}){0,5})))|([:]{2}[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,4})):|::)((25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{0,2})\\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{0,2})$$";
-        public static final String NetworkResource_ip_address_pattern = "\\w+.\\w+((.\\w+)+)";
-
-        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";
@@ -820 +814 @@
-                int[] ports = null;
-
-!Ports.trim ().equals ("")
+Ports.trim ().length () > 0
-                {
-                        Pattern portsPattern = Pattern.compile (" +");

trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java

@@ -60 +60 @@
-        private static final String FIELD_PROTOCOL = "protocol";
-        
+        private static final String NetworkResource_ipv4_address_pattern = "^(((25[0-5])|(2[0-4][0-9])|([01]?[0-9][0-9]?))\\.){3}((25[0-5])|(2[0-4][0-9])|([01]?[0-9][0-9]?))$";
+        private static final String NetworkResource_ipv6_address_pattern = "^(^(([0-9a-fA-F]{1,4}(((:[0-9a-fA-F]{1,4}){5}::[0-9a-fA-F]{1,4})|((:[0-9a-fA-F]{1,4}){4}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,1})|((:[0-9a-fA-F]{1,4}){3}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,2})|((:[0-9a-fA-F]{1,4}){2}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,3})|(:[0-9a-fA-F]{1,4}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,4})|(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,5})|(:[0-9a-fA-F]{1,4}){7}))$|^(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,6})$)|^::$)|^((([0-9a-fA-F]{1,4}(((:[0-9a-fA-F]{1,4}){3}::([0-9a-fA-F]{1,4}){1})|((:[0-9a-fA-F]{1,4}){2}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,1})|((:[0-9a-fA-F]{1,4}){1}::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,2})|(::[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,3})|((:[0-9a-fA-F]{1,4}){0,5})))|([:]{2}[0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,4})):|::)((25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{0,2})\\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]{0,2})$$";
+        private static final String NetworkResource_dns_name_pattern = "[a-zA-Z0-9_-]+.[a-zA-Z0-9_-]+((.[a-zA-Z0-9_-]+)+)";
+
+        private static final String NetworkResource_ip_ports_pattern = "([0-9]+( +[0-9]+)*)?";
+        
+
+        private static final Pattern pat_ipv4 = Pattern.compile (NetworkResource_ipv4_address_pattern);
+        private static final Pattern pat_ipv6 = Pattern.compile (NetworkResource_ipv6_address_pattern);
+        private static final Pattern pat_dns = Pattern.compile (NetworkResource_dns_name_pattern);
+        private static final Pattern pat_ip_ports = Pattern.compile (NetworkResource_ip_ports_pattern); 
+        private static final Pattern pat_numeric = Pattern.compile ("[0-9]+");
+        
-        private ComboViewer m_combo;
-        protected Label m_description;
@@ -203 +216 @@
-                                String value = (String)selection.getFirstElement ();
-                                modifyValue (value);
-
+
+
-                        }
-
@@ -222 +236 @@
-
-                        modifyValue (s);
-
+
+
-                }
-
@@ -239 +254 @@
-
-                        modifyValue (s);
-
+
+
-                }               
-        }
@@ -255 +271 @@
-
-                        modifyValue (s);
-
+
+
-                }
-        }
@@ -271 +288 @@
-                        
-                        modifyValue (s);
-
+
+
-                }
-        }
@@ -534 +552 @@
-        
-        
-        protected void checkInput()
-        {
-                StructuredSelection sel = (StructuredSelection)m_combo.getSelection ();
-                Rdef networkType = (Rdef)sel.getFirstElement ();
-
-                if (networkType != null &&
-                        (networkType.GetSysResourceState (SystemResourceTypes.ipsec) == SysResourceState.Yes || networkType.GetSysResourceState (SystemResourceTypes.ipsec) == SysResourceState.Optional))
-                {
-                        // required value
-                        if ( localIPAddress.length () == 0 )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_address, false);
-                                return;
-                        }
-                        
-                        // this is optional value check only if it has any valid characters.
-                        if( localIPPorts.trim ().length () > 0 &&
-                                (!Pattern.matches (NetworkResourceShape.NetworkResource_ip_ports_pattern, localIPPorts.trim ()))
-                                )
-                        {
-                                updateStatus(Messages.NetworkResourcePropertyPage_bad_local_ip_ports, false);
-                                return;
-                        }
-
-                        {
-                                // all the required value check is complete
-                                // lets make sure that the value matches the requirement
-                                boolean match = Pattern.matches(NetworkResourceShape.NetworkResource_ip_address_pattern, localIPAddress.trim ());
-                                boolean ip4 = Pattern.matches (NetworkResourceShape.NetworkResource_ipv4_address_pattern, localIPAddress.trim ());
-                                boolean ip6 = Pattern.matches(NetworkResourceShape.NetworkResource_ipv6_address_pattern, localIPAddress.trim ()); 
-                                
-                                if( ! (ip4 || ip6 || match) )
-                                {
-                                        updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_address, false);
-                                        return;
-                                }
-                        }
-                }
-                else if (networkType != null &&
-                        (networkType.GetSysResourceState (SystemResourceTypes.secmark) == SysResourceState.Yes || networkType.GetSysResourceState (SystemResourceTypes.secmark) == SysResourceState.Optional))
-                {
-                        
-                        if( localDevice.trim ().length () == 0 )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_local_device, false);
-                                return;
-                        }
-                        // local information
-                        if ( localIPAddress.trim ().length () == 0 )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_address, false);
-                                return;
-                        }
-                        if ( localMask.trim ().length () > 0 
-                                                && !Pattern.matches (NetworkResourceShape.NetworkResource_ipv4_address_pattern, localMask.trim ())
-                                                && !Pattern.matches(NetworkResourceShape.NetworkResource_ipv6_address_pattern, localMask.trim ())
-                                                )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_mask, false);
-                                return;
-                        }
-                        if( localIPPorts.trim ().length () > 0 &&
-                                (!Pattern.matches (NetworkResourceShape.NetworkResource_ip_ports_pattern, localIPPorts.trim ()))
-                                )
-                        {
-                                updateStatus(Messages.NetworkResourcePropertyPage_bad_local_ip_ports, false);
-                                return;
-                        }
-                        
-                        {
-                                boolean match = Pattern.matches(NetworkResourceShape.NetworkResource_ip_address_pattern, localIPAddress.trim ());
-                                boolean ip4 = Pattern.matches (NetworkResourceShape.NetworkResource_ipv4_address_pattern, localIPAddress.trim ());
-                                boolean ip6 = Pattern.matches(NetworkResourceShape.NetworkResource_ipv6_address_pattern, localIPAddress.trim ()); 
-                                
-                                if( ! (ip4 || ip6 || match) )
-                                {
-                                        updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_address, false);
-                                        return;
-                                }
-                        }
-                        
-                        
-                        // remote information all of them are optional
-                        if( remoteDevice.trim ().length () > 0  && remoteIPAddress.trim ().length () == 0)
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_remote_ip_address, false);
-                                return;
-                        }
-                        if ( remoteIPAddress.trim ().length () > 0  && remoteDevice.trim ().length () == 0 )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_remote_device, false);
-                                return;
-                        }
-                        if ( remoteIPAddress.trim ().length () > 0 )
-                        {
-                                boolean match = Pattern.matches(NetworkResourceShape.NetworkResource_ip_address_pattern, remoteIPAddress.trim ());
-                                boolean ip4 = Pattern.matches (NetworkResourceShape.NetworkResource_ipv4_address_pattern, remoteIPAddress.trim ());
-                                boolean ip6 = Pattern.matches(NetworkResourceShape.NetworkResource_ipv6_address_pattern, remoteIPAddress.trim ()); 
-                                
-                                if( ! (ip4 || ip6 || match) )
-                                {
-                                        updateStatus (Messages.NetworkResourcePropertyPage_bad_remote_ip_address, false);
-                                        return;
-                                }
-                        }
-                        if ( remoteMask.trim ().length () > 0 
-                                                && !Pattern.matches (NetworkResourceShape.NetworkResource_ipv4_address_pattern, remoteMask.trim ())
-                                                && !Pattern.matches(NetworkResourceShape.NetworkResource_ipv6_address_pattern, remoteMask.trim ())
-                                                )
-                        {
-                                updateStatus (Messages.NetworkResourcePropertyPage_bad_remote_ip_mask, false);
-                                return;
-                        }
-                        if( remoteIPPorts.trim ().length () > 0 &&
-                                (!Pattern.matches (NetworkResourceShape.NetworkResource_ip_ports_pattern, remoteIPPorts.trim ()))
-                                )
-                        {
-                                updateStatus(Messages.NetworkResourcePropertyPage_bad_local_ip_ports, false);
-                                return;
-                        }
-                        
-                }
-                
-                // no error go ahead and allow user to complete
-                updateStatus (null, true);
-        }
-
-        /**
-         * I had to copy stuff from the parent.
@@ -668 +559 @@
-        public void DialogChanged()
-        {               
-
-
-
-
-
-
+
+
+
+
+
-                        return;
-                }
-                
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-