Skip to content

Fixes #4547 - ELFlash ArrayIndexOutOfBoundsException on invalid Cookie value #4668

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
merged 1 commit into from
Feb 17, 2020
Merged

Fixes #4547 - ELFlash ArrayIndexOutOfBoundsException on invalid Cookie value #4668

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: 5 additions & 0 deletions impl/src/main/java/com/sun/faces/util/ByteArrayGuardAESCTR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ public String decrypt(String value) throws InvalidKeyException {

try {
byte[] iv = new byte[16];

if (bytes.length < iv.length) {
throw new InvalidKeyException("Invalid characters in decrypted value");
}

System.arraycopy(bytes, 0, iv, 0, iv.length);
IvParameterSpec ivspec = new IvParameterSpec(iv);

Expand Down
15 changes: 14 additions & 1 deletion impl/src/test/java/com/sun/faces/util/ByteArrayGuardAESCTRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

package com.sun.faces.util;

import java.security.InvalidKeyException;
import javax.xml.bind.DatatypeConverter;
import org.junit.Test;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;


public class ByteArrayGuardAESCTRTest {
Expand All @@ -39,5 +41,16 @@ public void testSmallerSizeBytes() throws Exception {

}

@Test(expected = InvalidKeyException.class)
public void testDecryptValueWithoutIvBytes() throws InvalidKeyException {
ByteArrayGuardAESCTR sut = new ByteArrayGuardAESCTR();

String value = "noIV";
byte[] bytes = DatatypeConverter.parseBase64Binary(value);
assertTrue(bytes.length < 16);

sut.decrypt(value);
}

}