Commit 06a7b51
Changed files (3)
lib
saml
kit
lib/saml/kit/locales/en.yml
@@ -27,6 +27,7 @@ en:
invalid_version: "must be 2.0."
unregistered: "must originate from registered identity provider."
Signature:
+ certificate: "Not valid before %{not_before}. Not valid after %{not_after}."
digest_value: "is invalid."
empty: "is missing."
SPSSODescriptor:
lib/saml/kit/signature.rb
@@ -57,8 +57,8 @@ module Saml
def validate_certificate(now = Time.now.utc)
if certificate.present? && !certificate.active?(now)
- error_message = "Not valid before #{certificate.not_before}. Not valid after #{certificate.not_after}."
- errors.add(:certificate, error_message)
+ message = error_message(:certificate, not_before: certificate.not_before, not_after: certificate.not_after)
+ errors.add(:certificate, message)
end
end
end
lib/saml/kit/translatable.rb
@@ -2,8 +2,9 @@ module Saml
module Kit
module Translatable
# @!visibility private
- def error_message(attribute, type: :invalid)
- I18n.translate(attribute, scope: "saml/kit.errors.#{name}")
+ def error_message(attribute, options = {})
+ default_options = { scope: "saml/kit.errors.#{name}" }
+ I18n.translate(attribute, default_options.merge(options))
end
end
end