for keyvalue in defaultkeys:
if codecs.encode(keyvalue, 'hex').decode('ascii') not in dedrmprefs['adeptkeys'].values():
newkeys.append(keyvalue)
- newnames.append(defaultnames[idx])
+ newnames.append("default_ade_key_uuid_" + defaultnames[idx])
idx += 1
+ # Check for DeACSM keys:
+ try:
+ from calibre_plugins.dedrm.config import checkForDeACSMkeys
+
+ newkey, newname = checkForDeACSMkeys()
+
+ if newkey is not None:
+ if codecs.encode(newkey, 'hex').decode('ascii') not in dedrmprefs['adeptkeys'].values():
+ print("{0} v{1}: Found new key '{2}' in DeACSM plugin".format(PLUGIN_NAME, PLUGIN_VERSION, newname))
+ newkeys.append(newkey)
+ newnames.append(newname)
+ except:
+ traceback.print_exc()
+ pass
+
if len(newkeys) > 0:
try:
for i,userkey in enumerate(newkeys):
# Store the new successful key in the defaults
print("{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION))
try:
- dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key_uuid_' + newnames[i], codecs.encode(userkey, 'hex').decode('ascii'))
+ dedrmprefs.addnamedvaluetoprefs('adeptkeys', newnames[i], codecs.encode(userkey, 'hex').decode('ascii'))
dedrmprefs.writeprefs()
print("{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
except:
for keyvalue in defaultkeys:
if codecs.encode(keyvalue,'hex') not in dedrmprefs['adeptkeys'].values():
newkeys.append(keyvalue)
- newnames.append(defaultnames[idx])
+ newnames.append("default_ade_key_uuid_" + defaultnames[idx])
idx += 1
+ # Check for DeACSM keys:
+ try:
+ from calibre_plugins.dedrm.config import checkForDeACSMkeys
+
+ newkey, newname = checkForDeACSMkeys()
+
+ if newkey is not None:
+ if codecs.encode(newkey, 'hex').decode('ascii') not in dedrmprefs['adeptkeys'].values():
+ print("{0} v{1}: Found new key '{2}' in DeACSM plugin".format(PLUGIN_NAME, PLUGIN_VERSION, newname))
+ newkeys.append(keyvalue)
+ newnames.append(newname)
+ except:
+ pass
+
if len(newkeys) > 0:
try:
for i,userkey in enumerate(newkeys):
# Store the new successful key in the defaults
print("{0} v{1}: Saving a new default key".format(PLUGIN_NAME, PLUGIN_VERSION))
try:
- dedrmprefs.addnamedvaluetoprefs('adeptkeys','default_key_uuid_' + newnames[i], codecs.encode(userkey,'hex').decode('ascii'))
+ dedrmprefs.addnamedvaluetoprefs('adeptkeys', newnames[i], codecs.encode(userkey,'hex').decode('ascii'))
dedrmprefs.writeprefs()
print("{0} v{1}: Saved a new default key after {2:.1f} seconds".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
except:
import calibre_plugins.dedrm.prefs as prefs
import calibre_plugins.dedrm.androidkindlekey as androidkindlekey
+def checkForDeACSMkeys():
+ try:
+ from calibre_plugins.deacsm.libadobeAccount import exportAccountEncryptionKeyDER, getAccountUUID
+ from calibre.ptempfile import TemporaryFile
+
+
+ acc_uuid = getAccountUUID()
+ if acc_uuid is None:
+ return None, None
+
+ name = "DeACSM_uuid_" + getAccountUUID()
+
+ # Unfortunately, the DeACSM plugin only has code to export to a file, not to return raw key bytes.
+ # Make a temporary file, have the plugin write to that, then read (& delete) that file.
+
+ with TemporaryFile(suffix='.der') as tmp_key_file:
+ export_result = exportAccountEncryptionKeyDER(tmp_key_file)
+
+ if (export_result is False):
+ return None, None
+
+ # Read key file
+ with open(tmp_key_file,'rb') as keyfile:
+ new_key_value = keyfile.read()
+
+ return new_key_value, name
+ except:
+ traceback.print_exc()
+ return None, None
+
+
class ConfigWidget(QWidget):
def __init__(self, plugin_path, alfdir):
QWidget.__init__(self)
class RenameKeyDialog(QDialog):
def __init__(self, parent=None,):
- print(repr(self), repr(parent))
QDialog.__init__(self, parent)
self.parent = parent
self.setWindowTitle("{0} {1}: Rename {0}".format(PLUGIN_NAME, PLUGIN_VERSION, parent.key_type_name))
return str(self.key_ledit.text()).strip()
-
-
-
-
-
-
class AddBandNKeyDialog(QDialog):
def __init__(self, parent=None,):
QDialog.__init__(self, parent)
self.default_key = defaultkeys[0]
self.default_name_A = defaultnames[0]
+
+ for key in self.parent.plugin_keys.values():
+ if key == codecs.encode(self.default_key,'hex').decode("utf-8"):
+ # We already have the ADE key imported into the plugin.
+ # Set it back to "" as if we had not found anything,
+ # so the next code path searches more places for potential keys.
+ print("Found key '{0}' in ADE - already present, skipping.".format(self.default_name_A))
+ self.default_key = ""
+ break
+
except:
- traceback.print_exc()
self.default_key = ""
+ self.foundInPlugin = False
+
+
+ if len(self.default_key) == 0:
+ # No (new) key found in ADE. Check the DeACSM calibre plugin instead.
+ key, name = checkForDeACSMkeys()
+
+ if key is not None:
+ self.default_key = key
+ self.default_name_A = name
+
+ for key in self.parent.plugin_keys.values():
+ if key == codecs.encode(self.default_key,'hex').decode("utf-8"):
+ # We already have the ADE key imported into the plugin.
+ # Set it back to "" as if we had not found anything,
+ # so the next code path searches more places for potential keys.
+ print("Found key '{0}' in DeACSM - already present, skipping.".format(self.default_name_A))
+ self.default_key = ""
+ break
if len(self.default_key)>0:
data_group_box_layout.addLayout(key_group)
key_group.addWidget(QLabel("Unique Key Name:", self))
self.key_ledit = QLineEdit(self.default_name_A, self)
- self.key_ledit.setToolTip("<p>Enter an identifying name for the current default Adobe Digital Editions key.")
+ self.key_ledit.setToolTip("<p>Enter an identifying name for the current Adobe key. Note that it's recommended to leave the UUID (the random-looking digits and letters) as it is.")
key_group.addWidget(self.key_ledit)
self.button_box.accepted.connect(self.accept)
- else:
+ else:
+ # No new key found - neither in ADE nor in the DeACSM plugin
+
self.button_box = QDialogButtonBox(QDialogButtonBox.Ok)
- default_key_error = QLabel("The default encryption key for Adobe Digital Editions could not be found.", self)
+ default_key_error = QLabel("No new ADE key could be found. Either ADE is not installed, or the key is already present in the plugin.", self)
default_key_error.setAlignment(Qt.AlignHCenter)
layout.addWidget(default_key_error)
# if no default, bot buttons do the same
@property
def key_value(self):
- return codecs.encode(self.default_key,'hex')
+ return codecs.encode(self.default_key,'hex').decode("utf-8")
def accept(self):
projects / DeDRM.git / commitdiff