Skip to content

fix(security): T2.x hardening: drop javafaker in SecureStringUtils (closes 16 SnakeYAML CVEs) (issue #98) #99

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

Merged
natechadwick merged 1 commit into from
Aug 29, 2026
Merged

fix(security): T2.x hardening: drop javafaker in SecureStringUtils (closes 16 SnakeYAML CVEs) (issue #98) #99

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions modules/perc-security-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
<artifactId>jasypt</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
Expand Down
35 changes: 29 additions & 6 deletions modules/perc-security-utils/src/main/java/com/percussion/security/SecureStringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.percussion.security;

import com.github.javafaker.Faker;
import com.ibm.icu.text.Normalizer2;
import com.percussion.error.PSExceptionUtils;
import java.io.IOException;
Expand Down Expand Up @@ -1509,13 +1508,37 @@ public static String sanitizeStringForHTML(String str) {
return Encode.forHtml(str);
}

/** Alphanumeric alphabet for {@link #generateRandomPassword()}. */
private static final char[] PASSWORD_ALPHABET =
("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789").toCharArray();

/** Special characters that may replace positions in a generated password. */
private static final char[] PASSWORD_SPECIALS = new char[] {'@', '$', '%', '^', '&', '*'};

/**
* Generates a random password of 6-20 alphanumeric characters with 0-5 of the positions
* overwritten by a special character ({@code @ $ % ^ & *}). All randomness is sourced from {@link
* SecureRandom} via {@link #getSecureRandom()}.
*
* <p>Previously this method used {@code com.github.javafaker.Faker.lorem().characters(...)} for
* the alphanumeric base, which transitively pulled in {@code org.yaml:snakeyaml:1.23-android} (16
* CVEs). Replaced with a direct {@link SecureRandom} draw in this slice (issue #98).
*/
public static String generateRandomPassword() {
Faker f = Faker.instance(getSecureRandom());
SecureRandom random = getSecureRandom();

// Length 6-20 inclusive (was f.lorem().characters(6, 20, ...)).
int length = 6 + random.nextInt(15);
char[] password = new char[length];
for (int i = 0; i < length; i++) {
password[i] = PASSWORD_ALPHABET[random.nextInt(PASSWORD_ALPHABET.length)];
}

char[] password = f.lorem().characters(6, 20, true, true).toCharArray();
char[] special = new char[] {'@', '$', '%', '^', '&', '*'};
for (int i = 0; i < f.random().nextInt(6); i++) {
password[f.random().nextInt(password.length)] = special[f.random().nextInt(special.length)];
// 0-5 positions get overwritten with a special char (was f.random().nextInt(6)).
int specials = random.nextInt(6);
for (int i = 0; i < specials; i++) {
password[random.nextInt(password.length)] =
PASSWORD_SPECIALS[random.nextInt(PASSWORD_SPECIALS.length)];
}
return new String(password);
}
Expand Down
Loading