diff --git a/.travis.yml b/.travis.yml index 4b15092..5f75071 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,3 +12,4 @@ jdk: - openjdk12 - openjdk13 - openjdk14 + diff --git a/package-lock.json b/package-lock.json index 68eb935..b064f78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,34 @@ { "name": "java-cookie", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "version": "1.0.0", + "license": "MIT", + "devDependencies": { + "bower": "1.8.12" + } + }, + "node_modules/bower": { + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz", + "integrity": "sha512-u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==", + "dev": true, + "bin": { + "bower": "bin/bower" + }, + "engines": { + "node": ">=0.10.0" + } + } + }, "dependencies": { "bower": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.8.tgz", - "integrity": "sha512-1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==", + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.12.tgz", + "integrity": "sha512-u1xy9SrwwoPlgjuHNjhV+YUPVdqyBj2ALBxuzeIUKXaPI2i2xypGgxqXkuHcITGdi5yBj5JuXgyMvgiWiS1S3Q==", "dev": true } } diff --git a/package.json b/package.json index 81a3c55..544201c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/js-cookie/java-cookie.git" }, "devDependencies": { - "bower": "1.8.8" + "bower": "1.8.12" }, "scripts": { "test": "cd bower_components/js-cookie && ../../node/node \"../../node/node_modules/npm/bin/npm-cli.js\" install" diff --git a/pom.xml b/pom.xml index cfeb657..c2f8cfd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 UTF-8 - 2.45.0 + 3.141.59 20.0.1.Final java-cookie-scm 1.8 @@ -86,17 +86,17 @@ joda-time joda-time - 2.10.6 + 2.10.12 com.fasterxml.jackson.core jackson-databind - 2.11.2 + 2.13.0 junit junit - 4.13.1 + 4.13.2 test @@ -150,13 +150,13 @@ org.apache.httpcomponents httpclient - 4.5.12 + 4.5.13 test org.apache.httpcomponents fluent-hc - 4.5.12 + 4.5.13 test @@ -208,7 +208,7 @@ com.github.eirslett frontend-maven-plugin - 1.10.0 + 1.11.2 install node and npm @@ -216,8 +216,7 @@ install-node-and-npm - v12.18.2 - + v15.6.0 diff --git a/src/main/java/com/github/jscookie/javacookie/Cookies.java b/src/main/java/com/github/jscookie/javacookie/Cookies.java index 1e4955d..ff1930d 100644 --- a/src/main/java/com/github/jscookie/javacookie/Cookies.java +++ b/src/main/java/com/github/jscookie/javacookie/Cookies.java @@ -1,23 +1,21 @@ package com.github.jscookie.javacookie; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.CharArrayWriter; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.ResourceBundle; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; public final class Cookies implements CookiesDefinition { private static String UTF_8 = "UTF-8"; @@ -307,17 +305,16 @@ private String encode( String decoded, Set exceptions ) { String character = new String( Character.toChars( codePoint ) ); CharArrayWriter hexSequence = new CharArrayWriter(); byte[] bytes = character.getBytes( UTF_8 ); - for ( int bytesIndex = 0; bytesIndex < bytes.length; bytesIndex++ ) { - char left = Character.forDigit( bytes[ bytesIndex ] >> 4 & 0xF, 16 ); - char right = Character.forDigit( bytes[ bytesIndex ] & 0xF, 16 ); + for (byte aByte : bytes) { + char left = Character.forDigit(aByte >> 4 & 0xF, 16); + char right = Character.forDigit(aByte & 0xF, 16); hexSequence - .append( '%' ) - .append( left ) - .append( right ); + .append('%') + .append(left) + .append(right); } - String target = character.toString(); String sequence = hexSequence.toString().toUpperCase(); - encoded = encoded.replace( target, sequence ); + encoded = encoded.replace(character, sequence ); } catch ( UnsupportedEncodingException e ) { e.printStackTrace(); } @@ -325,24 +322,13 @@ private String encode( String decoded, Set exceptions ) { return encoded; } - private String decode( String encoded ) { + private String decode(String encoded) { + // Use URLDecoder to fix https://github.com/js-cookie/java-cookie/issues/14 String decoded = encoded; - Pattern pattern = Pattern.compile( "(%[0-9A-Z]{2})+" ); - Matcher matcher = pattern.matcher( encoded ); - while ( matcher.find() ) { - String encodedChar = matcher.group(); - String[] encodedBytes = encodedChar.split( "%" ); - byte[] bytes = new byte[ encodedBytes.length - 1 ]; - for ( int i = 1; i < encodedBytes.length; i++ ) { - String encodedByte = encodedBytes[ i ]; - bytes[ i - 1 ] = ( byte )Integer.parseInt( encodedByte, 16 ); - } - try { - String decodedChar = new String( bytes, UTF_8 ); - decoded = decoded.replace( encodedChar, decodedChar ); - } catch ( UnsupportedEncodingException e ) { + try { + decoded = URLDecoder.decode(encoded, UTF_8); + } catch ( UnsupportedEncodingException e) { e.printStackTrace(); - } } return decoded; } @@ -403,14 +389,13 @@ private String decodeValue( String encodedValue, String decodedName ) { private Map getCookies( String cookieHeader ) { Map result = new HashMap(); String[] cookies = cookieHeader.split( "; " ); - for ( int i = 0; i < cookies.length; i++ ) { - String cookie = cookies[ i ]; - String encodedName = cookie.split( "=" )[ 0 ]; - String decodedName = decode( encodedName ); - - String encodedValue = cookie.substring( cookie.indexOf( '=' ) + 1, cookie.length() ); - String decodedValue = decodeValue( encodedValue, decodedName ); - result.put( decodedName, decodedValue ); + for (String cookie : cookies) { + String encodedName = cookie.split("=")[0]; + String decodedName = decode(encodedName); + + String encodedValue = cookie.substring(cookie.indexOf('=') + 1); + String decodedValue = decodeValue(encodedValue, decodedName); + result.put(decodedName, decodedValue); } return result; } diff --git a/src/test/java/com/github/jscookie/javacookie/test/integration/encoding/CookiesEncodingIT.java b/src/test/java/com/github/jscookie/javacookie/test/integration/encoding/CookiesEncodingIT.java index 9ae05f8..5c91d2d 100644 --- a/src/test/java/com/github/jscookie/javacookie/test/integration/encoding/CookiesEncodingIT.java +++ b/src/test/java/com/github/jscookie/javacookie/test/integration/encoding/CookiesEncodingIT.java @@ -44,9 +44,11 @@ public static Archive createDeployment() { "web.xml" ); - System.out.println( " ----- LOGGING THE FILES ADDED TO JBOSS" ); - System.out.println( war.toString( true ) ); - System.out.println( " ----- END OF LOGGING THE FILES ADDED TO JBOSS" ); + if(debug.is(true)) { + System.out.println(" ----- LOGGING THE FILES ADDED TO JBOSS"); + System.out.println(war.toString(true)); + System.out.println(" ----- END OF LOGGING THE FILES ADDED TO JBOSS"); + } return war; } diff --git a/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesDecodingTest.java b/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesDecodingTest.java index ef5150c..2391a13 100644 --- a/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesDecodingTest.java +++ b/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesDecodingTest.java @@ -27,6 +27,14 @@ public void character_not_allowed_in_name_and_value() { Assert.assertEquals( expected, actual ); } + @Test + public void character_with_2_bytes() { + Mockito.when( request.getHeader( "cookie" ) ).thenReturn( "c=%C3%A3" ); + String actual = cookies.get( "c" ); + String expected = "ã"; + Assert.assertEquals( expected, actual ); + } + @Test public void character_with_3_bytes() { Mockito.when( request.getHeader( "cookie" ) ).thenReturn( "c=%E4%BA%AC" ); @@ -34,4 +42,12 @@ public void character_with_3_bytes() { String expected = "京"; Assert.assertEquals( expected, actual ); } + + @Test + public void two_encoded_characters() { + Mockito.when(request.getHeader("cookie")).thenReturn("c=New%20York%2C%20NY"); + String actual = cookies.get("c"); + String expected = "New York, NY"; + Assert.assertEquals(expected, actual); + } } diff --git a/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesEncodingTest.java b/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesEncodingTest.java index bb6681d..86e4011 100644 --- a/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesEncodingTest.java +++ b/src/test/java/com/github/jscookie/javacookie/test/unit/CookiesEncodingTest.java @@ -36,6 +36,12 @@ public void characters_allowed_in_name_and_value() { ); } + @Test + public void character_with_2_bytes_in_value() { + cookies.set( "c", "ã" ); + Mockito.verify( response ).addHeader( "Set-Cookie", "c=%C3%A3; Path=/" ); + } + @Test public void character_with_3_bytes_in_value() { cookies.set( "c", "京" );