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.

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 issues #12 and #13, build & ChromeBrowser problems #14

Merged
merged 1 commit into from
Jul 16, 2023
Merged

Fix issues #12 and #13, build & ChromeBrowser problems #14

merged 1 commit into from
Jul 16, 2023

Conversation

samlindsaylevine
Copy link
Contributor

@samlindsaylevine samlindsaylevine commented Jun 26, 2023

Fixes to build process and to ChromeBrowser for current Windows versions of Chrome.

Updated Maven "fat" target to "jar-with-dependencies". Updated Maven source/target JDK version to 1.9.
Updated ChromeBrowser to look for files ending in "Cookies" in any subdirectory, to handle modern Windows Chrome that puts it in Default/Network. Updated ChromeBrowser to skip un-decryptable cookies in Windows, rather than fail with an exception, to match Mac and Linux behavior.

This PR addresses and should resolve issue #12 and issue #13 .

I have successfully rebuilt the fat JAR and updated the file that is checked into the root of the repository with the output from /CookieMonster/target/CookieMonster-jar-with-dependencies.jar, and also verified that new ChromeBrowser().getCookies() returns the expected, non-empty result with my latest version of Chrome on Windows.

…ons of Chrome.

Updated Maven "fat" target to "jar-with-dependencies".
Updated Maven source/target JDK version to 1.9.
Updated ChromeBrowser to look for files ending in "Cookies" in any subdirectory, to handle modern Windows Chrome that puts it in Default/Network.
Updated ChromeBrowser to skip un-decryptable cookies in Windows, rather than fail with an exception, to match Mac and Linux behavior.
@@ -291,7 +294,7 @@ protected DecryptedCookie decrypt(EncryptedCookie encryptedCookie) {
decryptedBytes = cipher.doFinal(ciphertextTag);
}
catch (Exception e) {
throw new IllegalStateException("Error decrypting", e);
decryptedBytes = null;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This matches the exception-handling behavior for Linux & Mac (the cookie is skipped).

@samlindsaylevine
Copy link
Contributor Author

I wanted to thank you again, Ben, for your continued work in this repository; I appreciate this functionality being available to a few of my personal projects.

@vadimlevitzky
Copy link

I just cloned the project and issues 12, 13 still apear in the code, Do I need some other branch, then master?

@samlindsaylevine
Copy link
Contributor Author

I just cloned the project and issues 12, 13 still apear in the code, Do I need some other branch, then master?

This pull request was just opened yesterday and has not been merged. It is a pull request from the chrome_and_maven_fixes branch of my fork of the repository, targeting the master branch of this repository. Since the pull request is still open and has not been merged, my commit does not yet appear in this repository at all; only in my fork.

If you would like to, you are more than welcome to clone my fork, check out the appropriate branch, and verify that the issues have been resolved by my changes.

@benjholla benjholla merged commit 0f3fd73 into benjholla:master Jul 16, 2023
@benjholla
Copy link
Owner

Thanks! Sorry for being slow on the merge...

@samlindsaylevine
Copy link
Contributor Author

No need to apologize and thank you again!

@samlindsaylevine samlindsaylevine deleted the chrome_and_maven_fixes branch July 16, 2023 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants