Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RHPAM-4723: Creating a branch via BC UI can lead to XSS #3815

Merged
merged 1 commit into from Jul 13, 2023
Merged

RHPAM-4723: Creating a branch via BC UI can lead to XSS #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...main/java/org/kie/workbench/common/services/backend/validation/ValidationServiceImpl.java
View file
Open in desktop
Expand Up @@ -39,6 +39,8 @@
import org.uberfire.backend.vfs.Path;
import org.uberfire.ext.editor.commons.backend.validation.ValidationUtils;

import static org.guvnor.structure.backend.InputEscapeUtils.escapeHtmlInput;

/**
* Implementation of validation Service for file names
*/
Expand Down Expand Up @@ -107,7 +109,7 @@ public boolean isFileNameValid(String fileName) {
@Override
public boolean isBranchNameValid(final String branchName) {
final Matcher branchNameMatcher = branchNameValidator.matcher(branchName);
return branchNameMatcher.matches();
return branchNameMatcher.matches() && branchName.equals(escapeHtmlInput(branchName));
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion .../java/org/kie/workbench/common/services/backend/validation/ValidationServiceImplTest.java
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ public void testValidateBranchName() {
assertTrue(validationService.isBranchNameValid("test!"));
assertTrue(validationService.isBranchNameValid("test-"));
assertTrue(validationService.isBranchNameValid("test_"));
assertTrue(validationService.isBranchNameValid("test&"));
assertFalse(validationService.isBranchNameValid("test&"));
assertTrue(validationService.isBranchNameValid("test%"));

assertFalse(validationService.isBranchNameValid("@test"));
Expand Down Expand Up @@ -223,5 +223,6 @@ public void testValidateBranchName() {
assertTrue(validationService.isBranchNameValid("te-st"));
assertTrue(validationService.isBranchNameValid("test-"));

assertFalse(validationService.isBranchNameValid("<img/src/onerror=alert(document.cookie)>"));
}
}