Do not display passwords of GeoResources and Services in UI

plugins/org.locationtech.udig.catalog.mysql/src/org/locationtech/udig/catalog/MySQLServiceImpl.java

@@ -248,8 +248,7 @@ public URI getSource() {
         }
 
         public String getTitle() {
-            return "MySQL " + getIdentifier(); //$NON-NLS-1$
-            //return "MySQL " + getIdentifier().getHost() + URLUtils.urlToFile(getIdentifier()).getAbsolutePath(); //$NON-NLS-1$
+            return "MySQL " + getDisplayID(); //$NON-NLS-1$
         }
 
     }

plugins/org.locationtech.udig.catalog.tests/src/org/locationtech/udig/catalog/IGeoResourceTest.java

@@ -0,0 +1,45 @@
+package org.locationtech.udig.catalog;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.junit.Test;
+
+public class IGeoResourceTest {
+    @Test
+    public void testGetDisplayIDWithUserInfoHasNoPassword() throws Exception {
+        final URL urlWithUserInfo = new URL("http://testuser:testpasswd@localhost:1523");
+        IGeoResource geoResourceMock = new IGeoResource() {
+
+            @Override
+            public Status getStatus() {
+                return null;
+            }
+
+            @Override
+            public Throwable getMessage() {
+                return null;
+            }
+
+            @Override
+            public URL getIdentifier() {
+                return urlWithUserInfo;
+            }
+
+            @Override
+            protected IGeoResourceInfo createInfo(IProgressMonitor monitor) throws IOException {
+                return null;
+            }
+        };
+
+        String displayID = geoResourceMock.getDisplayID();
+
+        assertNotNull(displayID);
+        assertTrue(!displayID.contains("testpasswd"));
+        assertTrue(displayID.contains("testuser:**"));
+    }
+}

plugins/org.locationtech.udig.catalog.ui/src/org/locationtech/udig/catalog/ui/property/ResourcePropertyPage.java

@@ -65,7 +65,7 @@ protected Control createContents(Composite parent) {
         label.setText("ID:");
 
         Text text = new Text( page, SWT.SINGLE | SWT.BORDER );
-        text.setText( resource.getID().toString() );
+        text.setText( resource.getDisplayID() );
         text.setEditable(false);
         text.setLayoutData("width 100:300:,wrap");
 

plugins/org.locationtech.udig.catalog/src/org/locationtech/udig/catalog/IGeoResource.java

@@ -370,6 +370,23 @@ public ID getID() {
         return new ID(getIdentifier());
     }
 
+    /**
+     * hide user password from the layer ID if it exists and returns
+     * ID as String.
+     * 
+     * @param layer
+     * @return
+     */
+    public String getDisplayID() {
+        String userInfo = getIdentifier().getUserInfo();
+        if (userInfo != null) {
+            userInfo = userInfo.substring(0, userInfo.indexOf(":")+1);
+            userInfo = userInfo.concat("******");
+            return new ID(getIdentifier().toString().replace(getIdentifier().getUserInfo(), userInfo), null).toString();
+        }
+        return getID().toString();
+    }
+
     /**
      * Disposes of any resources or listeners required. Default implementation does nothing.
      * 

plugins/org.locationtech.udig.catalog/src/org/locationtech/udig/catalog/IService.java

@@ -339,35 +339,52 @@ public IServiceInfo getInfo( IProgressMonitor monitor ) throws IOException {
                         throw new IllegalStateException("Lookup of getInfo not available from the display thread"); //$NON-NLS-1$
                     }
                     info = createInfo(monitor);
-                    
+
                     if( info == null ){
                         info = INFO_UNAVAILABLE;
                     }
                     else {
                         // broadcast the change - code taken from ArcServiceImpl
-                        
+
                         // this delta describes what has changed
                         /*
                         IResolveDelta delta = new ResolveDelta(this, IResolveDelta.Kind.CHANGED);
-                        
+
                         // fire the change
                         CatalogImpl localCatalog = (CatalogImpl) CatalogPlugin.getDefault().getLocalCatalog();
                         localCatalog.fire(new ResolveChangeEvent(this, IResolveChangeEvent.Type.POST_CHANGE, delta));
-                        */
+                         */
                     }
                 }
             }
         }
         if (info == INFO_UNAVAILABLE) {
             return null; // info was not available
         }
-       return info;        
+        return info;        
     }
 
     public ID getID() {
         return new ID(getIdentifier());
     }
 
+    /**
+     * hide user password from the layer ID if it exists and returns
+     * ID as String.
+     * 
+     * @param layer
+     * @return
+     */
+    public String getDisplayID() {
+        String userInfo = getIdentifier().getUserInfo();
+        if (userInfo != null) {
+            userInfo = userInfo.substring(0, userInfo.indexOf(":")+1);
+            userInfo = userInfo.concat("******");
+            return new ID(getIdentifier().toString().replace(getIdentifier().getUserInfo(), userInfo), null).toString();
+        }
+        return getID().toString();
+    }
+
     /**
      * Map of parameters used to create this entry. There is no guarantee that these params created
      * a usable service (@see getStatus() ). These params may have been modified within the factory

plugins/org.locationtech.udig.project.ui/src/org/locationtech/udig/project/ui/internal/property/pages/LayerSummary.java

@@ -56,7 +56,7 @@ protected Control createContents( Composite parent ) {
         nameData.setModifier(new NameModifier());
         data.add(nameData);
         newName=oldName=nameData.getInfo();
-        data.add(new SummaryData(Messages.LayerSummary_id,layer.getID()));
+        data.add(new SummaryData(Messages.LayerSummary_id, layer.getGeoResource().getDisplayID()));
         data.add(new SummaryData(Messages.LayerSummary_bounds, bounds==null?Messages.LayerSummary_unknownBounds:parseBounds(bounds)));
         data.add(new SummaryData(Messages.LayerSummary_selection,layer.getFilter()));
         data.add(new SummaryData(Messages.LayerSummary_status, layer.getStatusMessage()));