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

Fix decoding when alphabet contains regex-like special chars #10

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Fix decoding when alphabet contains regex-like special chars #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a640e6
Fix decoding when alphabet contains regex-like special chars
JordanArmstrong Nov 28, 2023
cb2eaec
Fix spelling of variable name
JordanArmstrong Nov 29, 2023
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
39 changes: 19 additions & 20 deletions src/main/java/org/sqids/Sqids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,23 @@ public List<Long> decode(final String id) {
.append(this.alphabet, 0, offset)
.reverse()
.toString();
String slicedId = id.substring(1);

while (!slicedId.isEmpty()) {
int index = 1;
while (true) {
final char separator = alphabet.charAt(0);
final String[] chunks = slicedId.split(String.valueOf(separator), 2);
final int chunksLength = chunks.length;
if (chunksLength > 0) {
if (chunks[0].isEmpty()) {
return ret;
}
ret.add(toNumber(chunks[0], alphabet.substring(1)));
if (chunksLength > 1) {
alphabet = shuffle(alphabet);
}
int separatorIndex = id.indexOf(separator, index);
if (separatorIndex == -1) {
separatorIndex = id.length();
} else if (index == separatorIndex) {
break;
}
ret.add(toNumber(id, index, separatorIndex, alphabet.substring(1)));
index = separatorIndex + 1;
if (index < id.length()) {
alphabet = shuffle(alphabet);
} else {
break;
}
slicedId = chunksLength > 1 ? chunks[1] : "";
}
return ret;
}
Expand Down Expand Up @@ -217,15 +218,13 @@ private StringBuilder toId(long num, final String alphabet) {
return id.reverse();
}

private long toNumber(final String id, final String alphabet) {
char[] chars = alphabet.toCharArray();
int charLength = chars.length;
private long toNumber(final String id, final int fromInclusive, final int toExclusive, final String alphabet) {
int alphabetLength = alphabet.length();
long number = 0;

for (char c : id.toCharArray()) {
number = number * charLength + alphabet.indexOf(c);
for (int i = fromInclusive; i < toExclusive; i++) {
char c = id.charAt(i);
number = number * alphabetLength + alphabet.indexOf(c);
}

return number;
}

Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/sqids/AlphabetTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ public void shortAlphabet() {
Assertions.assertEquals(sqids.decode(sqids.encode(numbers)), numbers);
}

@Test
public void specialCharsAlphabet() {
Sqids sqids = Sqids.builder()
.alphabet(".\\?")
.build();
List<Long> numbers = Arrays.asList(1L, 2L, 3L);
Assertions.assertEquals(sqids.decode(sqids.encode(numbers)), numbers);
}

@Test
public void multibyteCharacters() {
Assertions.assertThrows(IllegalArgumentException.class, () -> Sqids.builder()
Expand Down