Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
336bff11
Unverified
Commit
336bff11
authored
2 years ago
by
David Robertson
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Burn `check_signature` dev script. (#12351)
parent
993d90f8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
changelog.d/12349.misc
+1
-1
1 addition, 1 deletion
changelog.d/12349.misc
changelog.d/12351.misc
+1
-0
1 addition, 0 deletions
changelog.d/12351.misc
mypy.ini
+0
-1
0 additions, 1 deletion
mypy.ini
scripts-dev/check_signature.py
+0
-72
0 additions, 72 deletions
scripts-dev/check_signature.py
with
2 additions
and
74 deletions
changelog.d/12349.misc
+
1
−
1
View file @
336bff11
Remove unused and broken dev script `list_url_patterns.py`.
\ No newline at end of file
Remove broken and unused development scripts.
This diff is collapsed.
Click to expand it.
changelog.d/12351.misc
0 → 100644
+
1
−
0
View file @
336bff11
Remove broken and unused development scripts.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
mypy.ini
+
0
−
1
View file @
336bff11
...
...
@@ -24,7 +24,6 @@ files =
exclude
=
(?x)
^(
|scripts-dev/build_debian_packages.py
|scripts-dev/check_signature.py
|scripts-dev/definitions.py
|scripts-dev/federation_client.py
|scripts-dev/hash_history.py
...
...
This diff is collapsed.
Click to expand it.
scripts-dev/check_signature.py
deleted
100644 → 0
+
0
−
72
View file @
993d90f8
import
argparse
import
json
import
logging
import
sys
import
dns.resolver
import
urllib2
from
signedjson.key
import
decode_verify_key_bytes
,
write_signing_keys
from
signedjson.sign
import
verify_signed_json
from
unpaddedbase64
import
decode_base64
def
get_targets
(
server_name
):
if
"
:
"
in
server_name
:
target
,
port
=
server_name
.
split
(
"
:
"
)
yield
(
target
,
int
(
port
))
return
try
:
answers
=
dns
.
resolver
.
query
(
"
_matrix._tcp.
"
+
server_name
,
"
SRV
"
)
for
srv
in
answers
:
yield
(
srv
.
target
,
srv
.
port
)
except
dns
.
resolver
.
NXDOMAIN
:
yield
(
server_name
,
8448
)
def
get_server_keys
(
server_name
,
target
,
port
):
url
=
"
https://%s:%i/_matrix/key/v1
"
%
(
target
,
port
)
keys
=
json
.
load
(
urllib2
.
urlopen
(
url
))
verify_keys
=
{}
for
key_id
,
key_base64
in
keys
[
"
verify_keys
"
].
items
():
verify_key
=
decode_verify_key_bytes
(
key_id
,
decode_base64
(
key_base64
))
verify_signed_json
(
keys
,
server_name
,
verify_key
)
verify_keys
[
key_id
]
=
verify_key
return
verify_keys
def
main
():
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
"
signature_name
"
)
parser
.
add_argument
(
"
input_json
"
,
nargs
=
"
?
"
,
type
=
argparse
.
FileType
(
"
r
"
),
default
=
sys
.
stdin
)
args
=
parser
.
parse_args
()
logging
.
basicConfig
()
server_name
=
args
.
signature_name
keys
=
{}
for
target
,
port
in
get_targets
(
server_name
):
try
:
keys
=
get_server_keys
(
server_name
,
target
,
port
)
print
(
"
Using keys from https://%s:%s/_matrix/key/v1
"
%
(
target
,
port
))
write_signing_keys
(
sys
.
stdout
,
keys
.
values
())
break
except
Exception
:
logging
.
exception
(
"
Error talking to %s:%s
"
,
target
,
port
)
json_to_check
=
json
.
load
(
args
.
input_json
)
print
(
"
Checking JSON:
"
)
for
key_id
in
json_to_check
[
"
signatures
"
][
args
.
signature_name
]:
try
:
key
=
keys
[
key_id
]
verify_signed_json
(
json_to_check
,
args
.
signature_name
,
key
)
print
(
"
PASS %s
"
%
(
key_id
,))
except
Exception
:
logging
.
exception
(
"
Check for key %s failed
"
%
(
key_id
,))
print
(
"
FAIL %s
"
%
(
key_id
,))
if
__name__
==
"
__main__
"
:
main
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment