Fix #14: Decoding fails when two encoded characters appear one after another by tholu · Pull Request #21 · js-cookie/java-cookie

tholu · 2019-02-28T12:24:53Z

@FagnerMartinsBrack I accidentally did some small refactoring (simplifications) together with the fix, the actual fix for is in Cookies:316-323.

Please review and merge, thanks!

Resolves #14.

…ne after another

FagnerMartinsBrack · 2019-02-28T22:13:50Z

The integration test with js-cookie fails when I checkout 9e305c9:

Are you getting the same error?

tholu · 2019-03-01T08:42:59Z

@FagnerMartinsBrack Thanks for checking that, I can reproduce it and need to look into it.

JevinMenezes · 2021-03-10T18:58:41Z

It's been a while here for this PR, wish it could be closed any time soon.

FagnerMartinsBrack · 2021-03-10T22:28:18Z

@JevinMenezes If the OP is not continuing to work on this for more than a year then I believe it can be closed.

tholu · 2021-03-10T22:32:04Z

@JevinMenezes @FagnerMartinsBrack Thanks for the reminder! I'll try to finish it soon.

… in integration test

JevinMenezes · 2021-05-14T11:10:49Z

+	@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 );
+	}


This test case is failing.., (its also failing in Travis CI builds - https://travis-ci.org/github/js-cookie/java-cookie/builds/764105675)

@tholu check this failing test case

@JevinMenezes Yes, I explicitly added the test case here: 88b8327

Thanks for the reminder! Did not have time yet to fix the issue, will try to get this done over the weekend.

…ependencies

tholu · 2021-10-26T10:43:02Z

@JevinMenezes I fixed the test, but Travis is not running anymore?

JevinMenezes · 2021-10-30T17:38:22Z

@FagnerMartinsBrack Travis builds for this repository have stopped in travis-ci.org and this repo needs to be migrated to travis-ci.com. Can we migrate java-cookie repo to travis-ci.com ?

FagnerMartinsBrack · 2021-10-30T22:34:28Z

@JevinMenezes yes what do you want me to do?

JevinMenezes · 2021-10-31T07:15:07Z

Just wanted to ask whether I can approve & request this for organization js-cookie,

@FagnerMartinsBrack
(I believed organization owner could approve this)

FagnerMartinsBrack · 2021-10-31T08:41:28Z

If it needs to be migrated or it doesn't work then go for it. can you do it yourselfot do you need some permissions?

On Sun, 31 Oct 2021 at 18:15, Jevin Menezes ***@***.***> wrote: Just wanted to ask whether I can approve & request this for organization js-cookie, [image: Capture] <https://user-images.githubusercontent.com/13982269/139572546-1221c590-a2b0-43e7-82c5-5b11a5ff5f62.PNG> @FagnerMartinsBrack <https://github.com/FagnerMartinsBrack> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#21 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAGMCEOJOSUOF3ORVDG6YALUJTUINANCNFSM4G22ZRKA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- <https://about.me/fagnerbrack?promo=email_sig&utm_source=email_sig&utm_medium=email_sig&utm_campaign=external_links> Fagner Brack [image: https://]about.me/fagnerbrack <https://about.me/fagnerbrack?promo=email_sig&utm_source=email_sig&utm_medium=email_sig&utm_campaign=external_links>

FagnerMartinsBrack · 2021-10-31T10:45:07Z

@JevinMenezes I received the email and just approved it, let me know if you need anything else

JevinMenezes · 2021-10-31T12:25:30Z

@FagnerMartinsBrack thanks, seems like an admin privilege user can migrate the java-cookie repo and I'm unable to select the repo for migrating to travis-ci.com, would you be able to do it, thanks again ,

FagnerMartinsBrack · 2021-10-31T12:43:27Z

Done @JevinMenezes

tholu · 2021-11-09T08:47:15Z

@JevinMenezes Can this be merged now? I'll have to fix conflicts in #23 afterwards.

JevinMenezes · 2021-11-04T14:12:24Z

-		// Decode characters with 3 bytes first, then with 1 byte to fix https://github.com/js-cookie/java-cookie/issues/14
-		return decode( decode( encoded, 3 ), 1 );
-	}
-
-	private String decode( String encoded, Integer bytesPerCharacter ) {
+		// Use URLDecoder to fix https://github.com/js-cookie/java-cookie/issues/14
 		String decoded = encoded;
-		Pattern pattern = Pattern.compile( "(%[0-9A-Z]{2}){" + bytesPerCharacter + "}" );
-		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 ) {


@tholu I see that decode implementation with 3 bytes first and then with 1 byte is for fixing #14 , further the issue also mentions #14 (comment) . Will this change in implementation solve #14 (comment) ?

@tholu seems like my review wasn't submitted a few days ago, apologies for the same. Could you please update on this #21 (comment), I can update the PR post your reply, thanks.

Fix js-cookie#14: Decoding fails when two encoded characters appear o…

9e305c9

…ne after another

This was referenced Feb 28, 2019

Fix decoding two encoded chars after each other #18

Closed

JSON generates cookie that it cannot read #17

Open

Fix #17: JSON generates cookie that it cannot read #23

Open

New release #24

Open

Thomas Lutz added 3 commits March 23, 2021 15:27

Merge branch 'master' into fix/issue-14-decoding-two-encoded-chars

75f82b0

Bump dependencies to make integration tests work (newest Selenium)

68dbd8f

Add unit test for 2 bytes character en/decoding, consider debug value…

88b8327

… in integration test

JevinMenezes reviewed May 14, 2021

View reviewed changes

Use URLDecoder to fix decoding, bump joda-time and jackson-databind d…

60305be

…ependencies

JevinMenezes added 2 commits November 4, 2021 19:22

Update for travis-ci trigger

7c248ef

Update .travis.yml

6471c69

JevinMenezes reviewed Nov 9, 2021

View reviewed changes

Conversation

tholu commented Feb 28, 2019

Uh oh!

FagnerMartinsBrack commented Feb 28, 2019

Uh oh!

tholu commented Mar 1, 2019

Uh oh!

JevinMenezes commented Mar 10, 2021

Uh oh!

FagnerMartinsBrack commented Mar 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tholu commented Mar 10, 2021

Uh oh!

JevinMenezes May 14, 2021

Choose a reason for hiding this comment

Uh oh!

tholu May 14, 2021

Choose a reason for hiding this comment

Uh oh!

tholu commented Oct 26, 2021

Uh oh!

JevinMenezes commented Oct 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FagnerMartinsBrack commented Oct 30, 2021

Uh oh!

JevinMenezes commented Oct 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FagnerMartinsBrack commented Oct 31, 2021 via email

Uh oh!

FagnerMartinsBrack commented Oct 31, 2021

Uh oh!

JevinMenezes commented Oct 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FagnerMartinsBrack commented Oct 31, 2021

Uh oh!

tholu commented Nov 9, 2021

Uh oh!

JevinMenezes Nov 4, 2021

Choose a reason for hiding this comment

Uh oh!

JevinMenezes Nov 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

FagnerMartinsBrack commented Mar 10, 2021 •

edited

Loading

JevinMenezes commented Oct 30, 2021 •

edited

Loading

JevinMenezes commented Oct 31, 2021 •

edited

Loading

JevinMenezes commented Oct 31, 2021 •

edited

Loading

JevinMenezes Nov 9, 2021 •

edited

Loading