tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Replace syutil references in scripts

Browse source
This commit is contained in:
Mark Haines 2015-08-24 16:30:35 +01:00
parent 78323ccdb3
commit f093873d69
5 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts-dev/check_event_hash.py
View file

@ -1,5 +1,5 @@
from synapse.crypto.event_signing import * from synapse.crypto.event_signing import *
from syutil.base64util import encode_base64 from unpaddedbase64 import encode_base64
import argparse import argparse
import hashlib import hashlib

8
scripts-dev/check_signature.py
View file

@ -1,9 +1,7 @@
from syutil.crypto.jsonsign import verify_signed_json from signedjson.sign import verify_signed_json
from syutil.crypto.signing_key import ( from signedjson.key import decode_verify_key_bytes, write_signing_keys
decode_verify_key_bytes, write_signing_keys from unpaddedbase64 import decode_base64
)
from syutil.base64util import decode_base64
import urllib2 import urllib2
import json import json

8
scripts-dev/convert_server_keys.py
View file

@ -4,10 +4,10 @@ import sys
import json import json
import time import time
import hashlib import hashlib
from syutil.base64util import encode_base64 from unpaddedbase64 import encode_base64
from syutil.crypto.signing_key import read_signing_keys from signedjson.key import read_signing_keys
from syutil.crypto.jsonsign import sign_json from signedjson.sign import sign_json
from syutil.jsonutil import encode_canonical_json from canonicaljson import encode_canonical_json
def select_v1_keys(connection): def select_v1_keys(connection):

4
scripts-dev/hash_history.py
View file

@ -6,8 +6,8 @@ from synapse.crypto.event_signing import (
add_event_pdu_content_hash, compute_pdu_event_reference_hash add_event_pdu_content_hash, compute_pdu_event_reference_hash
) )
from synapse.api.events.utils import prune_pdu from synapse.api.events.utils import prune_pdu
from syutil.base64util import encode_base64, decode_base64 from unpaddedbase64 import encode_base64, decode_base64
from syutil.jsonutil import encode_canonical_json from canonicaljson import encode_canonical_json
import sqlite3 import sqlite3
import sys import sys

15
scripts/upgrade_db_to_v0.6.0.py
View file

@ -4,7 +4,7 @@ from synapse.storage._base import SQLBaseStore
from synapse.storage.signatures import SignatureStore from synapse.storage.signatures import SignatureStore
from synapse.storage.event_federation import EventFederationStore from synapse.storage.event_federation import EventFederationStore
from syutil.base64util import encode_base64, decode_base64 from unpaddedbase64 import encode_base64, decode_base64
from synapse.crypto.event_signing import compute_event_signature from synapse.crypto.event_signing import compute_event_signature
@ -13,12 +13,10 @@ from synapse.events.utils import prune_event
from synapse.crypto.event_signing import check_event_content_hash from synapse.crypto.event_signing import check_event_content_hash
from syutil.crypto.jsonsign import ( from signedjson.sign import verify_signed_json, SignatureVerifyException
verify_signed_json, SignatureVerifyException, from signedjson.key import decode_verify_key_bytes
)
from syutil.crypto.signing_key import decode_verify_key_bytes
from syutil.jsonutil import encode_canonical_json from canonicaljson import encode_canonical_json
import argparse import argparse
# import dns.resolver # import dns.resolver
@ -26,7 +24,6 @@ import hashlib
import httplib import httplib
import json import json
import sqlite3 import sqlite3
import syutil
import urllib2 import urllib2
@ -324,8 +321,6 @@ if __name__ == "__main__":
) )
args = parser.parse_args() args = parser.parse_args()
signing_key = syutil.crypto.signing_key.read_signing_keys( signing_key = signedjson.key.read_signing_keys(args.signing_key)
args.signing_key
)
main(args.database, args.server_name, signing_key[0]) main(args.database, args.server_name, signing_key[0])