feat: backend ssh public key validation

* replaced regexp in SSH key validators with call to backend validation method * this unifies the process and offers a more strict validation
xflord · Nov 2, 2023 · 82524fc · 82524fc
1 parent 585f94f
commit 82524fc
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 250 deletions.
diff --git a/perun-wui-core/src/main/java/cz/metacentrum/perun/wui/json/managers/UsersManager.java b/perun-wui-core/src/main/java/cz/metacentrum/perun/wui/json/managers/UsersManager.java
@@ -252,6 +252,19 @@ public static Request validatePreferredEmailChange(int userId, String token, Jso
 
 	}
 
+	/**
+	 * Validate ssh public key, throws exception if validation fails
+	 *
+	 * @param sshKey ssh public key to verify
+	 * @return Request unique request
+	 */
+	public static Request validateSSHKey(String sshKey, JsonEvents events) {
+		JsonClient client = new JsonClient(events);
+		client.put("sshKey", sshKey);
+
+		return client.call(USERS_MANAGER + "validateSSHKey");
+	}
+
 	/**
 	 * Change password in selected namespace
 	 *

diff --git a/...wui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/ListBox.java b/...wui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/ListBox.java
@@ -9,6 +9,7 @@
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import cz.metacentrum.perun.wui.json.Events;
+import cz.metacentrum.perun.wui.model.PerunException;
 import cz.metacentrum.perun.wui.registrar.client.resources.PerunRegistrarResources;
 import cz.metacentrum.perun.wui.registrar.widgets.items.validators.ListBoxValidator;
 import cz.metacentrum.perun.wui.registrar.widgets.items.validators.SshKeysListBoxValidator;
@@ -19,7 +20,9 @@
 import org.gwtbootstrap3.client.ui.html.Paragraph;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Represents ListBox form item.
@@ -30,6 +33,7 @@ public class ListBox extends WidgetBox {
 
 	private final ListBoxValidator validator;
 	List<ExtendedTextBox> inputList;
+	Map<ExtendedTextBox, BlurHandler> handlers;
 
 	public ListBox(PerunForm form, ApplicationFormItemData item, String lang) {
 		super(form, item, lang);
@@ -78,6 +82,7 @@ public boolean validateLocal() {
 	@Override
 	protected Widget initWidget() {
 		inputList = new ArrayList<>();
+		handlers = new HashMap<>();
 		return super.initWidget();
 	}
 
@@ -95,13 +100,48 @@ protected void setValidationTriggers() {
 		if (isOnlyPreview()) {
 			return;
 		}
-		for (ExtendedTextBox input : inputList) {
-			input.addBlurHandler(new BlurHandler() {
+		if ("urn:perun:user:attribute-def:def:sshPublicKey".equals(this.getItemData().getFormItem().getPerunDestinationAttribute())) {
+			final Events<Boolean> nothingEvent = new Events<Boolean>() {
 				@Override
-				public void onBlur(BlurEvent event) {
-					validateLocal();
+				public void onFinished(Boolean result) {
+
+				}
+
+				@Override
+				public void onError(PerunException error) {
+
 				}
-			});
+
+				@Override
+				public void onLoadingStart() {
+
+				}
+			};
+
+			for (ExtendedTextBox input : inputList) {
+
+				if (!handlers.containsKey(input)) {
+					BlurHandler handler = new BlurHandler() {
+						@Override
+						public void onBlur(BlurEvent event) {
+							validate(nothingEvent);
+						}
+					};
+					input.addBlurHandler(handler);
+					handlers.put(input, handler);
+				}
+
+			}
+
+		} else {
+			for (ExtendedTextBox input : inputList) {
+				input.addBlurHandler(new BlurHandler() {
+					@Override
+					public void onBlur(BlurEvent event) {
+						validateLocal();
+					}
+				});
+			}
 		}
 	}
 
@@ -154,8 +194,19 @@ protected void generateItemWithRemoveButton(VerticalPanel vp) {
 		PerunButton removeButton = new PerunButton("", new ClickHandler() {
 			public void onClick(ClickEvent event) {
 				inputList.remove(input);
+				handlers.remove(input);
 				vp.remove(hp);
-				validateLocal();
+				validate(new Events<Boolean>() {
+					@Override
+					public void onFinished(Boolean result) {
+					}
+					@Override
+					public void onError(PerunException error) {
+					}
+					@Override
+					public void onLoadingStart() {
+					}
+				});
 			}
 		});
 		setupRemoveButton(removeButton);

diff --git a/...ui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/TextArea.java b/...ui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/TextArea.java
@@ -4,10 +4,10 @@
 import com.google.gwt.event.dom.client.BlurHandler;
 import com.google.gwt.user.client.ui.Widget;
 import cz.metacentrum.perun.wui.json.Events;
+import cz.metacentrum.perun.wui.model.PerunException;
 import cz.metacentrum.perun.wui.model.beans.ApplicationFormItemData;
 import cz.metacentrum.perun.wui.registrar.widgets.PerunForm;
 import cz.metacentrum.perun.wui.registrar.widgets.items.validators.PerunFormItemValidator;
-import cz.metacentrum.perun.wui.registrar.widgets.items.validators.SshKeysTextAreaValidator;
 import cz.metacentrum.perun.wui.registrar.widgets.items.validators.TextAreaValidator;
 import cz.metacentrum.perun.wui.widgets.boxes.ExtendedTextArea;
 import org.gwtbootstrap3.client.ui.html.Paragraph;
@@ -27,12 +27,7 @@ public class TextArea extends PerunFormItemEditable {
 	public TextArea(PerunForm form, ApplicationFormItemData item, String lang) {
 		super(form, item, lang);
 
-		if ("urn:perun:user:attribute-def:def:sshPublicKey".equals(item.getFormItem().getPerunDestinationAttribute())) {
-			this.validator = new SshKeysTextAreaValidator();
-		} else {
-			this.validator = new TextAreaValidator();
-		}
-
+		this.validator = new TextAreaValidator();
 	}
 
 	protected Widget initWidget() {
@@ -87,12 +82,38 @@ public void setValidationTriggers() {
 		if (isOnlyPreview()) {
 			return;
 		}
-		getBox().addBlurHandler(new BlurHandler() {
-			@Override
-			public void onBlur(BlurEvent event) {
-				validateLocal();
-			}
-		});
+		if ("urn:perun:user:attribute-def:def:sshPublicKey".equals(this.getItemData().getFormItem().getPerunDestinationAttribute())) {
+			final Events<Boolean> nothingEvent = new Events<Boolean>() {
+				@Override
+				public void onFinished(Boolean result) {
+
+				}
+
+				@Override
+				public void onError(PerunException error) {
+
+				}
+
+				@Override
+				public void onLoadingStart() {
+
+				}
+			};
+
+			getBox().addBlurHandler(new BlurHandler() {
+				@Override
+				public void onBlur(BlurEvent event) {
+					validate(nothingEvent);
+				}
+			});
+		} else {
+			getBox().addBlurHandler(new BlurHandler() {
+				@Override
+				public void onBlur(BlurEvent event) {
+					validateLocal();
+				}
+			});
+		}
 	}
 
 	@Override

diff --git a/...i-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/TextField.java b/...i-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/widgets/items/TextField.java
@@ -4,6 +4,7 @@
 import com.google.gwt.event.dom.client.BlurHandler;
 import com.google.gwt.user.client.ui.Widget;
 import cz.metacentrum.perun.wui.json.Events;
+import cz.metacentrum.perun.wui.model.PerunException;
 import cz.metacentrum.perun.wui.model.beans.ApplicationFormItemData;
 import cz.metacentrum.perun.wui.registrar.widgets.PerunForm;
 import cz.metacentrum.perun.wui.registrar.widgets.items.validators.PerunFormItemValidator;
@@ -29,11 +30,7 @@ public class TextField extends PerunFormItemEditable {
 
 	public TextField(PerunForm form, ApplicationFormItemData item, String lang) {
 		super(form, item, lang);
-		if ("urn:perun:user:attribute-def:def:sshPublicKey".equals(item.getFormItem().getPerunDestinationAttribute())) {
-			this.validator = new SshKeysTextFieldValidator();
-		} else {
-			this.validator = new TextFieldValidator();
-		}
+		this.validator = new TextFieldValidator();
 	}
 
 	@Override
@@ -104,12 +101,38 @@ public void setValidationTriggers() {
 		if (isOnlyPreview()) {
 			return;
 		}
-		getBox().addBlurHandler(new BlurHandler() {
-			@Override
-			public void onBlur(BlurEvent event) {
-				validateLocal();
-			}
-		});
+		if ("urn:perun:user:attribute-def:def:sshPublicKey".equals(this.getItemData().getFormItem().getPerunDestinationAttribute())) {
+			final Events<Boolean> nothingEvent = new Events<Boolean>() {
+				@Override
+				public void onFinished(Boolean result) {
+
+				}
+
+				@Override
+				public void onError(PerunException error) {
+
+				}
+
+				@Override
+				public void onLoadingStart() {
+
+				}
+			};
+
+			getBox().addBlurHandler(new BlurHandler() {
+				@Override
+				public void onBlur(BlurEvent event) {
+					validate(nothingEvent);
+				}
+			});
+		} else {
+			getBox().addBlurHandler(new BlurHandler() {
+				@Override
+				public void onBlur(BlurEvent event) {
+					validateLocal();
+				}
+			});
+		}
 	}
 
 	@Override

diff --git a/...a/cz/metacentrum/perun/wui/registrar/widgets/items/validators/PerunFormItemValidator.java b/...a/cz/metacentrum/perun/wui/registrar/widgets/items/validators/PerunFormItemValidator.java
@@ -20,6 +20,7 @@ enum Result {
 		INVALID_FORMAT_EMAIL,
 		LOGIN_NOT_AVAILABLE,
 		CHECKING_LOGIN,
+		CHECKING_SSH,
 		CANT_CHECK_LOGIN,
 		EMPTY_PASSWORD,
 		PASSWORD_TOO_SHORT,