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

Feature/fix 20 #21

Merged
merged 7 commits into from
Sep 7, 2024
Merged

Feature/fix 20 #21

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92a5793
Fix issue when relative paths to public keys are configured in gitconfig
mirisbowring Jul 1, 2024
d30c7ed
Fixed index starting point since ssh-key spec is always first and the…
mirisbowring Jul 1, 2024
433326c
Fix false reference in split parts to get email (comment) from public…
mirisbowring Jul 2, 2024
b4cc94b
Revert email "fix" since original behaviour is desired
mirisbowring Jul 5, 2024
eba8262
Move SSH-Key check after identifier verification
mirisbowring Sep 3, 2024
968d296
Using "rb" mode instead of "r" mode to read the key
mirisbowring Sep 6, 2024
293708f
Don't encode the pubkey twice while reading
mirisbowring Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions bark_core/signatures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ def verify_signature(self, email: str, signature: bytes, subject: bytes) -> bool
@classmethod
def _load_blob(cls, identifier: str) -> bytes:
try:
# expanduser to catch relative paths like ~/.ssh/key.pub
identifier = os.path.expanduser(identifier)
with open(identifier, "rb") as f:
pubkey = f.read()
return pubkey
Expand Down Expand Up @@ -386,6 +388,14 @@ def get_authorized_pubkeys(
def get_pubkey_from_git() -> Optional[Pubkey]:
identifier = cmd("git", "config", "user.signingKey", check=False)[0]
if identifier:
gpg_format = cmd("git", "config", "gpg.format", check=False)[0]
# check if signingKey is ssh
if gpg_format and gpg_format == "ssh":
email = cmd("git", "config", "user.email", check=False)[0]
identifier = os.path.expanduser(identifier) # expand path if relative
with open(identifier, 'rb') as file: # read public key
pubkey = file.read()
return SshKey(f"{email} ".encode() + pubkey)
return Pubkey.from_identifier(identifier)
return None

Expand Down
Loading