projects
/
pggit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0f764f
)
Fix git key sync
author
Magnus Hagander
<magnus@hagander.net>
Thu, 7 Feb 2019 21:29:37 +0000
(22:29 +0100)
committer
Magnus Hagander
<magnus@hagander.net>
Thu, 7 Feb 2019 21:29:37 +0000
(22:29 +0100)
keysync.py
patch
|
blob
|
blame
|
history
diff --git
a/keysync.py
b/keysync.py
index ffe55dcf26a360e294e9e37be95ebdcad4f3075f..62eb0e1804b1cce52fb129c52d6fd107c27db060 100644
(file)
--- a/
keysync.py
+++ b/
keysync.py
@@
-48,7
+48,7
@@
class KeySynchronizer(object):
decryptor = AES.new(base64.b64decode(c.get('upstream', 'key')),
AES.MODE_CBC,
base64.b64decode(ivs, "-_"))
- s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(
'
')
+ s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(
b' ').decode('utf8
')
j = json.loads(s)
for u in j:
curs.execute("INSERT INTO git_users (userid, sshkey) VALUES (%(userid)s, %(key)s) ON CONFLICT (userid) DO UPDATE SET sshkey=excluded.sshkey", {