Skip to content

feat: provide simpler way to rescue key deserialization error #50

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

Merged
grzuy merged 1 commit into from
Oct 25, 2019
Merged

feat: provide simpler way to rescue key deserialization error #50

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
17 changes: 13 additions & 4 deletions lib/cose/key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
require "openssl"

module COSE
class UnknownKeyType < StandardError; end
class Error < StandardError; end
class KeyDeserializationError < Error; end
class MalformedKeyError < KeyDeserializationError; end
class UnknownKeyType < KeyDeserializationError; end

module Key
def self.serialize(pkey)
Expand All @@ -27,7 +30,7 @@ def self.from_pkey(pkey)
end

def self.deserialize(data)
map = CBOR.decode(data)
map = cbor_decode(data)

case map[Base::LABEL_KTY]
when COSE::Key::OKP::KTY_OKP
Expand All @@ -39,10 +42,16 @@ def self.deserialize(data)
when COSE::Key::Symmetric::KTY_SYMMETRIC
COSE::Key::Symmetric.from_map(map)
when nil
raise UnknownKeyType, "Missing required key type kty label"
raise COSE::UnknownKeyType, "Missing required key type kty label"
else
raise UnknownKeyType, "Unsupported or unknown key type #{map[Base::LABEL_KTY]}"
raise COSE::UnknownKeyType, "Unsupported or unknown key type #{map[Base::LABEL_KTY]}"
end
end

def self.cbor_decode(data)
CBOR.decode(data)
rescue CBOR::MalformedFormatError, EOFError, FloatDomainError, RegexpError, TypeError, URI::InvalidURIError
raise COSE::MalformedKeyError, "Malformed CBOR key input"
end
end
end