Disroot
/
gpg-lacre
9
15
Fork 4
Code Issues 29 Pull Requests 1 Releases 2 Wiki Activity

Fix minor cron.py issues #64

Merged
pfm merged 13 commits from fix-cron-script into master 2022-05-06 19:25:13 +02:00
Conversation 2 Commits 13 Files Changed 7 +12 -4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 55fa0d0601 - Show all commits

16
GnuPG/__init__.py
View File

@ -71,11 +71,19 @@ def public_keys( keyhome ):
email = None
return keys
# confirms a key has a given email address
def to_bytes(s) -> bytes:
if isinstance(s, str):
return bytes(s, sys.getdefaultencoding())
else:
return s
# Confirms a key has a given email address by importing it into a temporary
# keyring. If this operation succeeds and produces a message mentioning the
# expected email, a key is confirmed.
def confirm_key( content, email ):
tmpkeyhome = ''
if isinstance(content, str):
content = bytes(content, sys.getdefaultencoding())
content = to_bytes(content)
expected_email = to_bytes(email.lower())
while True:
tmpkeyhome = '/tmp/' + ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(12))
@ -92,7 +100,7 @@ def confirm_key( content, email ):
for line in result.split(b"\n"):
if b'imported' in line and b'<' in line and b'>' in line:
if line.split(b'<')[1].split(b'>')[0].lower() == email.lower():
if line.split(b'<')[1].split(b'>')[0].lower() == expected_email:
confirmed = True
break
else: