Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI by fixing the type errors for PyNaCl #484

Merged
merged 8 commits into from Jan 19, 2022
Merged

Fix CI by fixing the type errors for PyNaCl #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8fa2c4
Fix imports of nacl
reivilibre Jan 17, 2022
95d43ba
Remove the ignore for PyNaCl since it is no longer needed
reivilibre Jan 17, 2022
19a1c18
Feed `SigningKey` bytes rather than strings
reivilibre Jan 17, 2022
fa1541c
Use the signedjson SigningKey type to type the bolted-on fields
reivilibre Jan 17, 2022
beadaff
Newsfile
reivilibre Jan 17, 2022
f146523
Rename 485.misc to 484.misc
reivilibre Jan 17, 2022
ce2a5c4
Antilint
reivilibre Jan 17, 2022
73d7811
Encode into ascii
reivilibre Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/484.misc
View file
Open in desktop
@@ -0,0 +1 @@
Fix type errors caused by an update to PyNaCl.
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Expand Up @@ -61,7 +61,6 @@ mypy_path = "stubs"
[[tool.mypy.overrides]]
module = [
"idna",
"nacl.*",
"netaddr",
"prometheus_client",
"sentry_sdk",
Expand Down
11 changes: 9 additions & 2 deletions sydent/config/crypto.py
View file
Open in desktop
Expand Up @@ -14,8 +14,10 @@

from configparser import ConfigParser

import nacl
import nacl.encoding
import nacl.signing
import signedjson.key
import signedjson.types

from sydent.config._base import BaseConfig

Expand All @@ -32,6 +34,11 @@ def parse_config(self, cfg: "ConfigParser") -> bool:

save_key = False

# N.B. `signedjson` expects `nacl.signing.SigningKey` instances which
# have been monkeypatched to include new `alg` and `version` attributes.
# This is captured by the `signedjson.types.SigningKey` protocol.
self.signing_key: signedjson.types.SigningKey

if signing_key_str == "":
print(
"INFO: This server does not yet have an ed25519 signing key. "
Expand All @@ -46,7 +53,7 @@ def parse_config(self, cfg: "ConfigParser") -> bool:
print("INFO: Updating signing key format: brace yourselves")

self.signing_key = nacl.signing.SigningKey(
signing_key_str, encoder=nacl.encoding.HexEncoder
signing_key_str.encode("ascii"), encoder=nacl.encoding.HexEncoder
)
self.signing_key.version = "0"
self.signing_key.alg = signedjson.key.NACL_ED25519
Expand Down