forked from CESNET/perun-wui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
8 changed files
with
265 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| package cz.metacentrum.perun.wui.registrar.widgets.items.validators; | ||
|
|
||
| import com.google.gwt.regexp.shared.MatchResult; | ||
| import com.google.gwt.regexp.shared.RegExp; | ||
| import com.google.gwt.core.client.JavaScriptObject; | ||
| import cz.metacentrum.perun.wui.json.Events; | ||
| import cz.metacentrum.perun.wui.json.JsonEvents; | ||
| import cz.metacentrum.perun.wui.json.managers.UsersManager; | ||
| import cz.metacentrum.perun.wui.model.PerunException; | ||
| import cz.metacentrum.perun.wui.registrar.widgets.items.ListBox; | ||
| import cz.metacentrum.perun.wui.widgets.boxes.ExtendedTextBox; | ||
| import org.gwtbootstrap3.client.ui.constants.ValidationState; | ||
|
|
@@ -13,11 +16,7 @@ | |
| */ | ||
| public class SshKeysListBoxValidator extends ListBoxValidator { | ||
|
|
||
| RegExp regExp = RegExp.compile("^(" + | ||
| "(ssh-(rsa|dss|ed25519)([email protected])?)|" + | ||
| "(sk-(ssh-ed25519|ecdsa-sha2-nistp256)(-cert-v01)[email protected])|" + | ||
| "(ecdsa-sha2-nistp(256|384|521)([email protected])?))" + | ||
| " (([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?)( [^,\n]+)?$"); | ||
| String wrongValues = ""; | ||
|
|
||
| @Override | ||
| public boolean validateLocal(ListBox listBox) { | ||
|
|
@@ -26,34 +25,61 @@ public boolean validateLocal(ListBox listBox) { | |
| listBox.setRawStatus(getTransl().cantBeEmpty(), ValidationState.ERROR); | ||
| return false; | ||
| } | ||
| listBox.setStatus(ValidationState.SUCCESS); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void validate(ListBox listBox, Events<Boolean> events) { | ||
| events.onLoadingStart(); | ||
|
|
||
| if (listBox.getValue() != null && !listBox.getValue().isEmpty()) { | ||
| if (!validateLocal(listBox)) { | ||
| events.onFinished(false); | ||
| return; | ||
| } | ||
|
|
||
| String wrongValues = ""; | ||
| int index = 1; | ||
| for (ExtendedTextBox extendedTextBox : listBox.getListValue()) { | ||
| String sshKey = extendedTextBox.getValue(); | ||
| if (listBox.getValue() == null || listBox.getValue().isEmpty()) { | ||
| events.onFinished(true); | ||
| return; | ||
| } | ||
|
|
||
| if (sshKey.contains(",")) { | ||
| setResult(Result.INVALID_FORMAT); | ||
| listBox.setStatus(getTransl().sshKeySeparatorNotAllowed(), ValidationState.ERROR); | ||
| return false; | ||
| } | ||
|
|
||
| MatchResult matcher = regExp.exec(sshKey); | ||
| if (matcher == null) { | ||
| wrongValues += "<br>" + index + ". " + (sshKey.length() > 25 ? sshKey.substring(0, 23) + "..." : sshKey); | ||
| } | ||
| index++; | ||
| } | ||
| if (!wrongValues.isEmpty()) { | ||
| wrongValues = ""; | ||
| int index = 1; | ||
| for (ExtendedTextBox extendedTextBox : listBox.getListValue()) { | ||
| String sshKey = extendedTextBox.getValue(); | ||
|
|
||
| if (sshKey.contains(",")) { | ||
| setResult(Result.INVALID_FORMAT); | ||
| listBox.setRawStatus(getTransl().incorrectFormatItemList() + " <b>" + wrongValues + "</b>", ValidationState.ERROR); | ||
| return false; | ||
| listBox.setStatus(getTransl().sshKeySeparatorNotAllowed(), ValidationState.ERROR); | ||
| events.onFinished(false); | ||
| } | ||
| } | ||
|
|
||
| listBox.setStatus(ValidationState.SUCCESS); | ||
| return true; | ||
| int currIndex = index; | ||
| UsersManager.validateSSHKey(sshKey, new JsonEvents() { | ||
| @Override | ||
| public void onFinished(JavaScriptObject result) { | ||
| if (wrongValues.isEmpty()) { | ||
| events.onFinished(true); | ||
| listBox.setStatus(ValidationState.SUCCESS); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(PerunException error) { | ||
| wrongValues += "<br>" + currIndex + ". " + (sshKey.length() > 25 ? sshKey.substring(0, 23) + "..." : sshKey); | ||
| setResult(Result.INVALID_FORMAT); | ||
| listBox.setRawStatus(getTransl().incorrectFormatItemList() + " <b>" + wrongValues + "</b>", ValidationState.ERROR); | ||
| events.onFinished(false); | ||
| } | ||
|
|
||
| @Override | ||
| public void onLoadingStart() { | ||
| setResult(Result.CHECKING_SSH); | ||
| listBox.unsetStatus(); | ||
| } | ||
| }); | ||
| index++; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| package cz.metacentrum.perun.wui.registrar.widgets.items.validators; | ||
|
|
||
| import com.google.gwt.regexp.shared.MatchResult; | ||
| import com.google.gwt.regexp.shared.RegExp; | ||
| import com.google.gwt.core.client.JavaScriptObject; | ||
| import cz.metacentrum.perun.wui.json.Events; | ||
| import cz.metacentrum.perun.wui.json.JsonEvents; | ||
| import cz.metacentrum.perun.wui.json.managers.UsersManager; | ||
| import cz.metacentrum.perun.wui.model.PerunException; | ||
| import cz.metacentrum.perun.wui.registrar.widgets.items.TextArea; | ||
| import org.gwtbootstrap3.client.ui.constants.ValidationState; | ||
|
|
||
|
|
@@ -13,12 +16,7 @@ | |
| * @author Pavel Zlámal <[email protected]> | ||
| */ | ||
| public class SshKeysTextAreaValidator extends TextAreaValidator { | ||
|
|
||
| RegExp regExp = RegExp.compile("^(" + | ||
| "(ssh-(rsa|dss|ed25519)([email protected])?)|" + | ||
| "(sk-(ssh-ed25519|ecdsa-sha2-nistp256)(-cert-v01)[email protected])|" + | ||
| "(ecdsa-sha2-nistp(256|384|521)([email protected])?))" + | ||
| " (([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?)( [^,\n]+)?$"); | ||
| String wrongValues = ""; | ||
|
|
||
| @Override | ||
| public boolean validateLocal(TextArea textArea) { | ||
|
|
@@ -74,26 +72,57 @@ public boolean validateLocal(TextArea textArea) { | |
| } | ||
| } | ||
| */ | ||
| } | ||
|
|
||
| textArea.setStatus(ValidationState.SUCCESS); | ||
| return true; | ||
|
|
||
| // normalize value just in case | ||
| sshKeys = sshKeys.replaceAll("(,)+", ","); | ||
| List<String> keys = Arrays.stream(sshKeys.split(",")).collect(Collectors.toList()); | ||
| } | ||
| @Override | ||
| public void validate(TextArea textArea, Events<Boolean> events) { | ||
| events.onLoadingStart(); | ||
|
|
||
| if (!validateLocal(textArea)) { | ||
| events.onFinished(false); | ||
| return; | ||
| } | ||
|
|
||
| if (textArea.getValue() == null || textArea.getValue().isEmpty()) { | ||
| events.onFinished(true); | ||
| return; | ||
| } | ||
|
|
||
| for (String key : keys) { | ||
| MatchResult matcher = regExp.exec(key); | ||
| if (matcher == null) { | ||
| String sshKeys = textArea.getValue(); | ||
| // normalize value just in case | ||
| sshKeys = sshKeys.replaceAll("(,)+", ","); | ||
| List<String> keys = Arrays.stream(sshKeys.split(",")).collect(Collectors.toList()); | ||
| wrongValues = ""; | ||
|
|
||
| for (String key : keys) { | ||
| UsersManager.validateSSHKey(key, new JsonEvents() { | ||
| @Override | ||
| public void onFinished(JavaScriptObject result) { | ||
| if (wrongValues.isEmpty()) { | ||
| textArea.setStatus(ValidationState.SUCCESS); | ||
| events.onFinished(true); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(PerunException error) { | ||
| wrongValues += key; | ||
| int length = Math.min(key.length(), 30); | ||
| textArea.setRawStatus(getTransl().sshKeyFormat(key.substring(0, length)+((length == 30) ? "..." : "")), ValidationState.ERROR); | ||
| setResult(Result.INVALID_FORMAT); | ||
| return false; | ||
| events.onFinished(false); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onLoadingStart() { | ||
| setResult(Result.CHECKING_SSH); | ||
| textArea.unsetStatus(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| textArea.setStatus(ValidationState.SUCCESS); | ||
| return true; | ||
|
|
||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.