Changeset 2116

Timestamp:

05/13/08 15:15:31 (6 months ago)

Author:

npatrick

Message:

Completed New Network Resource Wizard.
Added properties to NetworkResource?.

Files:

• branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/Messages.java (modified) (3 diffs)
• branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java (modified) (8 diffs)
• branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/messages.properties (modified) (3 diffs)
• branches/networking/src/com/tresys/framework/plugin/wizards/shape/Messages.java (modified) (1 diff)
• branches/networking/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java (modified) (27 diffs)
• branches/networking/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyWizard.java (modified) (1 diff)
• branches/networking/src/com/tresys/framework/plugin/wizards/shape/messages.properties (modified) (1 diff)

branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/Messages.java

@@ -31 +31 @@
-        public static String domain;
-        public static String resource;
+        public static String network_resource;
-
-        public static String base_domain;
@@ -54 +55 @@
-        public static String prop_abilities;
-        public static String prop_base;
+        public static String prop_network_resource;
-        public static String default_prop;
-        
@@ -72 +74 @@
-        
-        public static String mls_level;
+        
+        public static String network_type;
+        public static String network_local_device;
+        public static String network_local_ip_address;
+        public static String network_local_mask;
+        public static String network_local_ip_ports;
+        public static String network_local_encryption_type;
+        public static String network_remote_device;
+        public static String network_remote_ip_address;
+        public static String network_remote_mask;
+        public static String network_remote_ip_ports;
+        public static String network_protocol;
-}

branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java

@@ -55 +55 @@
-
-        public static final String RDEF_PROP = "Resource.RDEF"; //$NON-NLS-1$
+        public static final String PROP_NETWORK_RESOURCE = Messages.prop_network_resource;
+        
+        public static final String NETWORK_TYPE_PROP = "NetworkResource.NetworkType";                           //$NON-NLS-1$
+        public static final String DISPLAY_NAME_NETWORK_TYPE = Messages.network_type;
+        
+        public static final String NETWORK_LOCAL_DEVICE = "NetworkResource.LocalDevice";
+        public static final String DISPLAY_NAME_NETWORK_LOCAL_DEVICE = Messages.network_local_device;
+        
+        public static final String NETWORK_LOCAL_IP_ADDRESS = "NetworkResource.LocalIPAddress";
+        public static final String DISPLAY_NAME_NETWORK_LOCAL_IP_ADDRESS = Messages.network_local_ip_address;
+
+        public static final String NETWORK_LOCAL_MASK = "NetworkResource.LocalMask";
+        public static final String DISPLAY_NAME_NETWORK_LOCAL_MASK = Messages.network_local_mask;
+
+        public static final String NETWORK_LOCAL_IP_PORTS = "NetworkResource.LocalIPPorts";
+        public static final String DISPLAY_NAME_NETWORK_LOCAL_IP_PORTS = Messages.network_local_ip_ports;
+
+        public static final String NETWORK_LOCAL_ENCRYPTION_TYPE = "NetworkResource.LocalEncryptionType";
+        public static final String DISPLAY_NAME_NETWORK_LOCAL_ENCRYPTION_TYPE = Messages.network_local_encryption_type;
+
+        public static final String NETWORK_REMOTE_DEVICE = "NetworkResource.RemoteDevice";
+        public static final String DISPLAY_NAME_NETWORK_REMOTE_DEVICE = Messages.network_remote_device;
+
+        public static final String NETWORK_REMOTE_IP_ADDRESS = "NetworkResource.RemoteIPAddress";
+        public static final String DISPLAY_NAME_NETWORK_REMOTE_IP_ADDRESS = Messages.network_remote_ip_address;
+
+        public static final String NETWORK_REMOTE_MASK = "NetworkResource.RemoteMask";
+        public static final String DISPLAY_NAME_NETWORK_REMOTE_MASK = Messages.network_remote_mask;
+
+        public static final String NETWORK_REMOTE_IP_PORTS = "NetworkResource.RemoteIPPorts";
+        public static final String DISPLAY_NAME_NETWORK_REMOTE_IP_PORTS = Messages.network_remote_ip_ports;
+
+        public static final String NETWORK_PROTOCOL = "NetworkResource.Protocol";
+        public static final String DISPLAY_NAME_NETWORK_PROTOCOL = Messages.network_protocol;
-
-        private IPropertyDescriptor[] m_descriptors = null;
-        private Vector m_rdefs = null;
+        
+        private String network_type;
+        private String local_device;
+        private String local_ip_address;
+        private String local_mask;
+        private String local_ip_ports;
+        private String local_encryption_type;
+        private String remote_device;
+        private String remote_ip_address;
+        private String remote_mask;
+        private String remote_ip_ports;
+        private String protocol;
-
-        public NetworkResourceShape (SELinuxSystem i_system)
@@ -117 +163 @@
-        public String getType ()
-        {
-
+ 
-        }
-
@@ -127 +173 @@
-        public Wizard getWizard ()
-        {
-
+ 
-        }
-
@@ -177 +223 @@
-                        }
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        // Set validator to be used by cell editor. When value not valid,
-                        // message will be returned
@@ -195 +249 @@
-                        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        NetworkResource comp = (NetworkResource) getComponent ();
-
+
-                        {
-                                Iterator itr = rdefs.iterator ();
@@ -234 +337 @@
-                                .size ()];
-                        pathDescriptors = (PathPropertyDescriptor[]) pathDescriptor.toArray (pathDescriptors);
-
-
-
+
+
+
+
+
+
-                        System.arraycopy (parentDescriptors, 0, m_descriptors, 0, parentDescriptors.length);
+                        
-                        System
-                                .arraycopy (myDescriptors, 0, m_descriptors, parentDescriptors.length, myDescriptors.length);
-
-
+
+
+
-                }
-
@@ -261 +369 @@
-                }
-
+                if (NETWORK_TYPE_PROP.equals (propertyId))
+                        return this.network_type;
+                
+                if (NETWORK_LOCAL_DEVICE.equals (propertyId))
+                        return this.local_device;
+                
+                if (NETWORK_LOCAL_IP_ADDRESS.equals (propertyId))
+                        return this.local_ip_address;
+                
+                if (NETWORK_LOCAL_MASK.equals (propertyId))
+                        return this.local_mask;
+                
+                if (NETWORK_LOCAL_IP_PORTS.equals (propertyId))
+                        return this.local_ip_ports;
+                
+                if (NETWORK_LOCAL_ENCRYPTION_TYPE.equals (propertyId))
+                        return this.local_encryption_type;
+                
+                if (NETWORK_REMOTE_DEVICE.equals (propertyId))
+                        return this.remote_device;
+                
+                if (NETWORK_REMOTE_IP_ADDRESS.equals (propertyId))
+                        return this.remote_ip_address;
+                
+                if (NETWORK_REMOTE_MASK.equals (propertyId))
+                        return this.remote_mask;
+                
+                if (NETWORK_REMOTE_IP_PORTS.equals (propertyId))
+                        return this.remote_ip_ports;
+                
+                if (NETWORK_PROTOCOL.equals (propertyId))
+                        return this.protocol;
+                
-                return super.getPropertyValue (propertyId);
-        }
@@ -283 +424 @@
-                                .setPath ((NetworkResource) getComponent (), (String) value);
-                }
+                
+                else if (NETWORK_TYPE_PROP.equals (propertyId))
+                {
+                        this.network_type = (String)value;
+                }
+                else if (NETWORK_LOCAL_DEVICE.equals (propertyId))
+                        this.local_device = (String)value;
+                else if (NETWORK_LOCAL_IP_ADDRESS.equals (propertyId))
+                        this.local_ip_address = (String)value;
+                else if (NETWORK_LOCAL_MASK.equals (propertyId))
+                        this.local_mask = (String)value;
+                else if (NETWORK_LOCAL_IP_PORTS.equals (propertyId))
+                        this.local_ip_ports = (String)value;
+                else if (NETWORK_LOCAL_ENCRYPTION_TYPE.equals (propertyId))
+                        this.local_encryption_type = (String)value;
+                else if (NETWORK_REMOTE_DEVICE.equals (propertyId))
+                        this.remote_device = (String)value;
+                else if (NETWORK_REMOTE_IP_ADDRESS.equals (propertyId))
+                        this.remote_ip_address = (String)value;
+                else if (NETWORK_REMOTE_MASK.equals (propertyId))
+                        this.remote_mask = (String)value;
+                else if (NETWORK_REMOTE_IP_PORTS.equals (propertyId))
+                        this.remote_ip_ports = (String)value;
+                else if (NETWORK_PROTOCOL.equals (propertyId))
+                        this.protocol = (String)value;
-                else
-                        super.setPropertyValue (propertyId, value);
+        }
+
+        public static Set GetNetworkEncryptionTypes ()
+        {
+                HashSet encryptionTypes = new HashSet ();
+                encryptionTypes.add ("3des-cbc");
+                encryptionTypes.add ("blowfish-cbc");
+
+                return encryptionTypes;
+        }
+
+        public static Set GetNetworkProtcols ()
+        {
+                HashSet protocols = new HashSet ();
+                protocols.add ("tcp");
+                protocols.add ("udp");
+
+                return protocols;
-        }
-

branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/messages.properties

@@ -17 +17 @@
-resource=Resource
-resource_defn=Resource Definition
+network_resource=Network Resource
-
-name=Name
@@ -40 +41 @@
-prop_base=Base
-default_prop=Default
+prop_network_resource=Network Resources
-
-category_boolean=Booleans
@@ -57 +59 @@
-
-mls_level=MLS Level
+
+network_type=Network Type
+network_local_device=Local Network Device
+network_local_ip_address=Local IP Address
+network_local_mask=Local Mask
+network_local_ip_ports=Local IP Ports
+network_local_encryption_type=Encryption Type
+network_remote_device=Remote Network Device
+network_remote_ip_address=Remote IP Address
+network_remote_mask=Remote Mask
+network_remote_ip_ports=Remote IP Ports
+network_protocol=Protocol

branches/networking/src/com/tresys/framework/plugin/wizards/shape/Messages.java

@@ -53 +53 @@
-        public static String NetworkResourcePropertyPage_ip_mask;
-        public static String NetworkResourcePropertyPage_ip_ports;
+        public static String NetworkResourcePropertyPage_Protocol;
-        public static String NetworkResourcePropertyPage_bad_ip_ports;
-        public static String NetworkResourcePropertyPage_bad_ip_mask;

branches/networking/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java

@@ -1 +1 @@
-package com.tresys.framework.plugin.wizards.shape;
-
+import java.lang.reflect.*;
-import java.util.regex.*;
-import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -23 +24 @@
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Canvas;
-
-import com.tresys.framework.compiler.dictionary.INameValue;
@@ -33 +36 @@
-        extends WizardPage
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        private ComboViewer m_combo;
-        private NetworkResourceShape m_shape;
@@ -41 +56 @@
-        private Group localDetails = null;
-        private Group remoteDetails = null;
+        private Composite detailsCanvas = null;
+        
+        public String localDevice = new String();
+        public String localIPAddress = new String();
+        public String localMask = new String();
+        public String localIPPorts = new String();
+        public String localEncryptionType = new String();
+        
+        public String remoteDevice = new String();
+        public String remoteIPAddress = new String();
+        public String remoteMask = new String();
+        public String remoteIPPorts = new String();
+        
+        public String protocol = new String();
-
-        public NetworkResourceShapePropertyPage (NetworkResourceShape i_shape)
@@ -51 +80 @@
-        public void createControl(Composite parent)
-        {
+                Shell shell = this.getShell ();
+                shell.setSize (500,440);
+
-                m_composite = new Composite (parent, SWT.NONE);
-                
@@ -58 +90 @@
-                GridLayout layout = new GridLayout();
-                layout.numColumns = 2;
-0
+7
-                m_composite.setLayout(layout);
-                
@@ -137 +169 @@
-        }       
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-                private String errorMessage;
-                
-
-
-
+NetworkResourceShapePropertyPage Page, String IPVar, 
+
+Page, IPVar
-                        this.errorMessage = ErrorMessage;
-                }
@@ -151 +244 @@
-                        String s = ((Text) e.widget).getText();
-
+                        modifyValue (s);
+                        
-                        if (!Pattern.matches (Messages.NetworkResource_ipv4_address_pattern, s) &&
-                                !Pattern.matches(Messages.NetworkResource_ipv6_address_pattern, s))
@@ -156 +251 @@
-                        
-                        else
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                public void modifyText(ModifyEvent e)
-                {
-                        String s = ((Text) e.widget).getText ();
+                        
+                        modifyValue (s);
-                        
-                        if (!Pattern.matches (Messages.NetworkResource_ip_ports_pattern, s))
@@ -181 +283 @@
-
-        
-Group
+Composite
-        {
-                if (group != null)
-                {
-                        for (Widget control: group.getChildren ())
-
-
+
+
+
+
+
+
+
-                        group.dispose ();
-                }
@@ -197 +304 @@
-        public void DialogChanged()
-        {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                this.localDetails = null;
@@ -213 +328 @@
-                {
-
-m_composite
+detailsCanvas
-                        localDetails.setText (Messages.NetworkResourcePropertyPage_Local_Information);
-                        GridData layoutData = new GridData (GridData.FILL_HORIZONTAL | GridData.GRAB_VERTICAL);
@@ -230 +345 @@
-
-                                ComboViewer combo = new ComboViewer (localDetails, SWT.DROP_DOWN | SWT.READ_ONLY);
-//m_
-//m_combo.addSelectionChangedListener (new ChangeListener (
-
-GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL
+
+combo.addSelectionChangedListener (new ChangeComboValueListener (this, FIELD_LOCAL_ENCRYPTION_TYPE
+
+/*GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL*/
-                                combo.getCombo ().setLayoutData(sysData);
-//m_combo.setInput (NetworkResourceShape.GetNetworkTypes ());                          
+combo.setInput (NetworkResourceShape.GetNetworkEncryptionTypes ());
-                        }
-                        
@@ -244 +359 @@
-
-                                Text ip = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_IP_ADDRESS, 
-                                GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                ip.setLayoutData(sysData);
-
+
+
-
-                        //For IP Mask
@@ -255 +371 @@
-
-                                Text mask = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_MASK, 
-                                GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                mask.setLayoutData(sysData);
-
+
+
-
-                        //For IP Ports
@@ -266 +383 @@
-
-                                Text ports = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_IP_PORTS
-                                GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                ports.setLayoutData(sysData);
@@ -274 +391 @@
-                else if (networkType != null && networkType.equals("secmark"))
-                {
-m_composite
+detailsCanvas
-                        localDetails.setText (Messages.NetworkResourcePropertyPage_Local_Information);
-                        {
@@ -282 +399 @@
-                                gridLayout.numColumns = 2;
-                                this.localDetails.setLayout (gridLayout);
+
+                                //For Local Network Device
+                                {
+                                        Label label = new Label (localDetails, SWT.NULL);
+                                        label.setText (Messages.NetworkResourcePropertyPage_Local_Device);
+
+                                        Text device = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
+                                        device.addModifyListener (new ModifyTextValueListener(this, FIELD_LOCAL_DEVICE));
+                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
+                                        device.setLayoutData(sysData);
+                                }
-                                
-                                //For IP Address
@@ -289 +417 @@
-
-                                        Text ip = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_IP_ADDRESS, 
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        ip.setLayoutData(sysData);
+                                        ip.setText (this.localIPAddress);
-                                }
-
@@ -300 +429 @@
-
-                                        Text mask = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_MASK, 
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        mask.setLayoutData(sysData);
+                                        mask.setText (this.localMask);
-                                }
-
@@ -311 +441 @@
-
-                                        Text ports = new Text(localDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_LOCAL_IP_PORTS
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        ports.setLayoutData(sysData);
@@ -318 +448 @@
-                        }
-                        
-m_composite
+detailsCanvas
-                        remoteDetails.setText (Messages.NetworkResourcePropertyPage_Remote_Information);
-                        {
@@ -327 +457 @@
-                                this.remoteDetails.setLayout (gridLayout);
-                                
+                                //For Remote Network Device
+                                {
+                                        Label label = new Label (remoteDetails, SWT.NULL);
+                                        label.setText (Messages.NetworkResourcePropertyPage_Remote_Device);
+
+                                        Text device = new Text(remoteDetails, SWT.BORDER | SWT.SINGLE);
+                                        device.addModifyListener (new ModifyTextValueListener(this, FIELD_REMOTE_DEVICE));
+                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
+                                        device.setLayoutData(sysData);
+                                }
+
-                                //For IP Address
-                                {
@@ -333 +474 @@
-
-                                        Text ip = new Text(remoteDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_REMOTE_IP_ADDRESS, 
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        ip.setLayoutData(sysData);
+                                        ip.setText (this.remoteIPAddress);
-                                }
-
@@ -344 +486 @@
-
-                                        Text mask = new Text(remoteDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_REMOTE_MASK, 
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        mask.setLayoutData(sysData);
+                                        mask.setText (this.remoteMask);
-                                }
-
@@ -355 +498 @@
-
-                                        Text ports = new Text(remoteDetails, SWT.BORDER | SWT.SINGLE);
-
+this, FIELD_REMOTE_IP_PORTS
-                                        GridData sysData = new GridData(GridData.FILL_HORIZONTAL| GridData.GRAB_HORIZONTAL);
-                                        ports.setLayoutData(sysData);
-                                }
-
-
-
+
+
+
+
+
+
+
+
+
+