[28395] Laufwerksbuchstabe in URI-Pfad kanonisieren (#957)

Author: Daksic28

bundles/ch.elexis.core.services/src/ch/elexis/core/services/internal/VirtualFilesystemHandle.java

@@ -490,8 +490,10 @@ public IVirtualFilesystemHandle subDir(String subDir) throws IOException {
 		}
 
 		URI _uri = null;
-		if (uri.getAuthority() != null && uri.getAuthority().length() > 0 && uri.getAuthority().charAt(1) == ':') {
-			// workaround - URIUtil "swallows" C: authority
+		if (uri.getAuthority() != null && uri.getAuthority().length() > 1 && uri.getAuthority().charAt(1) == ':') {
+			// workaround - URIUtil "swallows" C: authority. Only reachable for legacy
+			// file://C:/ uris, IVirtualFilesystemService#stringToURI does not create
+			// them anymore
 			String _cur = uri.toString();
 			if (!_cur.endsWith("/")) {
 				_cur += "/";
@@ -517,8 +519,10 @@ public IVirtualFilesystemHandle subFile(String subFile) throws IOException {
 			throw new IllegalArgumentException("must not start with /");
 		}
 		URI _uri = null;
-		if (uri.getAuthority() != null && uri.getAuthority().length() > 0 && uri.getAuthority().charAt(1) == ':') {
-			// workaround - URIUtil "swallows" C: authority
+		if (uri.getAuthority() != null && uri.getAuthority().length() > 1 && uri.getAuthority().charAt(1) == ':') {
+			// workaround - URIUtil "swallows" C: authority. Only reachable for legacy
+			// file://C:/ uris, IVirtualFilesystemService#stringToURI does not create
+			// them anymore
 			try {
 				_uri = IVirtualFilesystemService.stringToURI(uri.toString() + subFile);
 			} catch (MalformedURLException | URISyntaxException e) {

bundles/ch.elexis.core.ui.e4/src/ch/elexis/core/ui/e4/jface/preference/URIFieldEditor.java

@@ -43,7 +43,6 @@ public URIFieldEditor(String name, String labelText, Composite parent) {
 		setErrorMessage(JFaceResources.getString("DirectoryFieldEditor.errorMessage"));//$NON-NLS-1$
 		setChangeButtonText(JFaceResources.getString("openBrowse"));//$NON-NLS-1$
 		createControl(parent);
-		getTextControl().setEchoChar('*');
 		getTextControl().setEnabled(false);
 	}
 
@@ -54,6 +53,37 @@ protected void doLoad() {
 			getTextControl().setText(value);
 			oldValue = value;
 		}
+		updateEchoChar();
+	}
+
+	@Override
+	protected void doLoadDefault() {
+		super.doLoadDefault();
+		updateEchoChar();
+	}
+
+	@Override
+	public void setStringValue(String value) {
+		super.setStringValue(value);
+		updateEchoChar();
+	}
+
+	private void updateEchoChar() {
+		if (getTextControl() != null && !getTextControl().isDisposed()) {
+			getTextControl().setEchoChar(containsPassword(getStringValue()) ? '*' : '\0');
+		}
+	}
+
+	private boolean containsPassword(String value) {
+		if (StringUtils.isBlank(value)) {
+			return false;
+		}
+		try {
+			String userInfo = new URI(value).getUserInfo();
+			return userInfo != null && userInfo.indexOf(':') > 0;
+		} catch (URISyntaxException e) {
+			return false;
+		}
 	}
 
 	@Override