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

Support multiple ADE keys on MacOS #570

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

gcarvelli
Copy link

@gcarvelli gcarvelli commented Jul 15, 2024

This PR is better viewed with whitespace ignored.

Summary

This PR adds support for multiple Adobe Digital Editions decryption keys on MacOS. I found myself with two decryption keys because I:

  1. Installed ADE on a new computer
  2. Claimed an ascm ebook
  3. Signed into my Adobe account
  4. Claimed another ascm ebook

I believe this issue is describing the same problem I had.

Testing

This can be tested by adding a new <adept:credentials> block to your ~/Library/Application Support/Adobe/Digital Editions/activation.dat. I do not know how to generate those keys, however.

Let me know if I can do anything else to make this better or to make testing it easier!

@gcarvelli gcarvelli marked this pull request as ready for review July 15, 2024 00:11
@squio
Copy link

squio commented Oct 4, 2024

LGTM 👍 (would have positively reviewed if I had the rights)

@noDRM
Copy link
Owner

noDRM commented Nov 10, 2024

Thanks for the PR. I don't have a MacOS setup to test this.

However, looking at the code, I'm not sure if the code works as intended. When there's multiple authorizations in that XML file, each one of them can have their own username or authorization method.

Your code seems to account for multiple authorizations to be present, but I'm not sure whether the key names / authorization methods will be correctly matched to each key since it's still just using tree.find on the whole XML tree?

Can you check that again to make sure the method and username are correct when there's multiple different ones?

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