Skip to content

More robust parsing of malformed SSH keys #9

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

Open
zorun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

More robust parsing of malformed SSH keys #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions django_sshkey/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,22 @@ def test_ws_key_fails(self):
)
self.assertRaises(ValidationError, key.full_clean)

def test_malformed_key_fails(self):
key = UserKey(
user=self.user1,
name='name1',
key='foo bar baz',
)
self.assertRaises(ValidationError, key.full_clean)

def test_malformed_key2_fails(self):
key = UserKey(
user=self.user1,
name='name1',
key='2048 01:02:03:04:05:06:07:08:09:10:11:12:13:14:15:16',
)
self.assertRaises(ValidationError, key.full_clean)


class RFC4716TestCase(BaseTestCase):
@classmethod
Expand Down
5 changes: 4 additions & 1 deletion django_sshkey/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ def __init__(self, b64key, comment=None):
dlen = struct.unpack('>I', keydata[:4])[0]
data, keydata = keydata[4:4 + dlen], keydata[4 + dlen:]
self.parts.append(data)
self.algorithm = self.parts[0].decode('ascii')
try:
self.algorithm = self.parts[0].decode('ascii')
except UnicodeDecodeError as e:
raise TypeError(str(e))

def fingerprint(self, hash=None):
import hashlib
Expand Down