dcc 0.2.0 → 0.2.2

data/lib/dcc/si/base/expanded_unc.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Dcc
+  module Si
+    module Base
+      # `si:expandedUncType` — expanded uncertainty stated directly on a real
+      # quantity. The v1 form; v2 keeps it as a deprecated alternative to
+      # `measurementUncertaintyUnivariate`.
+      module ExpandedUnc
+        # rubocop:disable Metrics/MethodLength -- one lutaml mapping
+        # block, written the same way as every sibling D-SI module.
+        def self.included(klass)
+          klass.class_eval do
+            attribute :uncertainty, :string
+            attribute :coverage_factor, :string
+            attribute :coverage_probability, :string
+            attribute :distribution, :string
+
+            xml do
+              namespace ::Dcc::Namespace::Si
+              element "expandedUnc"
+              ordered
+              map_element "uncertainty", to: :uncertainty
+              map_element "coverageFactor", to: :coverage_factor
+              map_element "coverageProbability", to: :coverage_probability
+              map_element "distribution", to: :distribution
+            end
+          end
+        end
+        # rubocop:enable Metrics/MethodLength
+      end
+    end
+  end
+end

data/lib/dcc/si/base/expanded_unc_xml_list.rb

@@ -19,7 +19,8 @@ module Dcc
               ordered
               map_element "uncertaintyXMLList", to: :uncertainty_xml_list
               map_element "coverageFactorXMLList", to: :coverage_factor_xml_list
-              map_element "coverageProbabilityXMLList", to: :coverage_probability_xml_list
+              map_element "coverageProbabilityXMLList",
+                          to: :coverage_probability_xml_list
               map_element "distributionXMLList", to: :distribution_xml_list
             end
           end
@@ -27,4 +28,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/si/base/hybrid.rb

@@ -18,7 +18,8 @@ module Dcc
             attribute :complex, :complex, collection: true
             attribute :constant, :constant, collection: true
             attribute :real_list_xml_list, :realListXMLList, collection: true
-            attribute :complex_list_xml_list, :complexListXMLList, collection: true
+            attribute :complex_list_xml_list, :complexListXMLList,
+                      collection: true
 
             xml do
               namespace ::Dcc::Namespace::Si
@@ -39,4 +40,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/si/base/measurement_uncertainty_univariate.rb

@@ -25,4 +25,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/si/base/real.rb

@@ -17,6 +17,8 @@ module Dcc
       #   </si:real>
       module Real
         def self.included(klass)
+          # rubocop:disable Metrics/BlockLength -- one lutaml mapping block,
+          # as in the sibling D-SI modules already listed in the todo file.
           klass.class_eval do
             attribute :id, :string
             attribute :ref_type, :string
@@ -25,7 +27,11 @@ module Dcc
             attribute :unit, ::Dcc::Type::SiUnit
             attribute :significant_digit, :integer
             attribute :date_time, :date_time
-            attribute :measurement_uncertainty_univariate, :measurementUncertaintyUnivariate
+            attribute :measurement_uncertainty_univariate,
+                      :measurementUncertaintyUnivariate
+            # Deprecated in v2, but the only uncertainty form v1 documents use.
+            attribute :expanded_unc, :expandedUnc
+            attribute :coverage_interval, :coverageInterval
 
             xml do
               namespace ::Dcc::Namespace::Si
@@ -38,11 +44,15 @@ module Dcc
               map_element "unit", to: :unit
               map_element "significantDigit", to: :significant_digit
               map_element "dateTime", to: :date_time
-              map_element "measurementUncertaintyUnivariate", to: :measurement_uncertainty_univariate
+              map_element "measurementUncertaintyUnivariate",
+                          to: :measurement_uncertainty_univariate
+              map_element "expandedUnc", to: :expanded_unc
+              map_element "coverageInterval", to: :coverage_interval
             end
           end
+          # rubocop:enable Metrics/BlockLength
         end
       end
     end
   end
-end
+end

data/lib/dcc/si/base/real_list_xml_list.rb

@@ -31,15 +31,17 @@ module Dcc
               map_element "quantityTypeXMLList", to: :quantity_type_xml_list
               map_element "valueXMLList", to: :value_xml_list
               map_element "unitXMLList", to: :unit_xml_list
-              map_element "significantDigitXMLList", to: :significant_digit_xml_list
+              map_element "significantDigitXMLList",
+                          to: :significant_digit_xml_list
               map_element "dateTimeXMLList", to: :date_time_xml_list
               map_element "expandedUncXMLList", to: :expanded_unc_xml_list
               map_element "standardMUXMLList", to: :standard_mu_xml_list
-              map_element "coverageIntervalMUXMLList", to: :coverage_interval_mu_xml_list
+              map_element "coverageIntervalMUXMLList",
+                          to: :coverage_interval_mu_xml_list
             end
           end
         end
       end
     end
   end
-end
+end

data/lib/dcc/si/base/si_list.rb

@@ -13,7 +13,8 @@ module Dcc
             attribute :date_time, :date_time
             attribute :real_list, :real, collection: true
             attribute :real_list_xml_list, :realListXMLList, collection: true
-            attribute :complex_list_xml_list, :complexListXMLList, collection: true
+            attribute :complex_list_xml_list, :complexListXMLList,
+                      collection: true
             attribute :list, :list, collection: true
 
             xml do
@@ -34,4 +35,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/si/base/standard_mu.rb

@@ -22,4 +22,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/si/base.rb

@@ -17,8 +17,11 @@ module Dcc
       autoload :StandardMU, "dcc/si/base/standard_mu"
       autoload :ExpandedMU, "dcc/si/base/expanded_mu"
       autoload :CoverageIntervalMU, "dcc/si/base/coverage_interval_mu"
+      autoload :ExpandedUnc, "dcc/si/base/expanded_unc"
+      autoload :CoverageInterval, "dcc/si/base/coverage_interval"
       autoload :ExpandedUncXmlList, "dcc/si/base/expanded_unc_xml_list"
-      autoload :MeasurementUncertaintyUnivariate, "dcc/si/base/measurement_uncertainty_univariate"
+      autoload :MeasurementUncertaintyUnivariate,
+               "dcc/si/base/measurement_uncertainty_univariate"
     end
   end
-end
+end

data/lib/dcc/si/v1/coverage_interval.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Dcc::Si::V1
+  class CoverageInterval < CommonElements
+    include ::Dcc::Si::Base::CoverageInterval
+  end
+  Configuration.register_model(CoverageInterval, id: :coverageInterval)
+end

data/lib/dcc/si/v1/expanded_unc.rb

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
 module Dcc::Si::V1
-  # Deprecated v1 expandedUnc type — superseded by expandedMU in v2.
-  # Kept so old fixtures parse without losing data.
   class ExpandedUnc < CommonElements
-    attribute :uncertainty, :string
-    attribute :coverage_factor, :string
-    attribute :coverage_probability, :string
-    attribute :distribution, :string
-
-    xml do
-      namespace ::Dcc::Namespace::Si
-      element "expandedUnc"
-      ordered
-      map_element "uncertainty", to: :uncertainty
-      map_element "coverageFactor", to: :coverage_factor
-      map_element "coverageProbability", to: :coverage_probability
-      map_element "distribution", to: :distribution
-    end
+    include ::Dcc::Si::Base::ExpandedUnc
   end
   Configuration.register_model(ExpandedUnc, id: :expandedUnc)
 end

data/lib/dcc/si/v1/measurement_uncertainty_univariate.rb

@@ -4,5 +4,6 @@ module Dcc::Si::V1
   class MeasurementUncertaintyUnivariate < CommonElements
     include ::Dcc::Si::Base::MeasurementUncertaintyUnivariate
   end
-  Configuration.register_model(MeasurementUncertaintyUnivariate, id: :measurementUncertaintyUnivariate)
+  Configuration.register_model(MeasurementUncertaintyUnivariate,
+                               id: :measurementUncertaintyUnivariate)
 end

data/lib/dcc/si/v1.rb

@@ -22,8 +22,10 @@ module Dcc
       autoload :ExpandedMU, "dcc/si/v1/expanded_mu"
       autoload :CoverageIntervalMU, "dcc/si/v1/coverage_interval_mu"
       autoload :ExpandedUnc, "dcc/si/v1/expanded_unc"
+      autoload :CoverageInterval, "dcc/si/v1/coverage_interval"
       autoload :ExpandedUncXmlList, "dcc/si/v1/expanded_unc_xml_list"
-      autoload :MeasurementUncertaintyUnivariate, "dcc/si/v1/measurement_uncertainty_univariate"
+      autoload :MeasurementUncertaintyUnivariate,
+               "dcc/si/v1/measurement_uncertainty_univariate"
 
       ROOT_ELEMENT_TAG = "real"
 
@@ -33,7 +35,8 @@ module Dcc
         Real Complex Constant
         RealListXmlList ComplexListXmlList Hybrid SiList
         StandardMU ExpandedMU CoverageIntervalMU
-        ExpandedUnc ExpandedUncXmlList MeasurementUncertaintyUnivariate
+        ExpandedUnc CoverageInterval
+        ExpandedUncXmlList MeasurementUncertaintyUnivariate
       ].freeze
 
       def self.load_all!

data/lib/dcc/si/v2/coverage_interval.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Dcc::Si::V2
+  class CoverageInterval < CommonElements
+    include ::Dcc::Si::Base::CoverageInterval
+  end
+  Configuration.register_model(CoverageInterval, id: :coverageInterval)
+end

data/lib/dcc/si/v2/coverage_interval_mu_xml_list.rb

@@ -16,9 +16,11 @@ module Dcc::Si::V2
       map_element "valueStandardMUXMLList", to: :value_standard_mu_xml_list
       map_element "intervalMinXMLList", to: :interval_min_xml_list
       map_element "intervalMaxXMLList", to: :interval_max_xml_list
-      map_element "coverageProbabilityXMLList", to: :coverage_probability_xml_list
+      map_element "coverageProbabilityXMLList",
+                  to: :coverage_probability_xml_list
       map_element "distributionXMLList", to: :distribution_xml_list
     end
   end
-  Configuration.register_model(CoverageIntervalMUXMLList, id: :coverageIntervalMUXMLList)
+  Configuration.register_model(CoverageIntervalMUXMLList,
+                               id: :coverageIntervalMUXMLList)
 end

data/lib/dcc/si/v2/expanded_mu_xml_list.rb

@@ -14,7 +14,8 @@ module Dcc::Si::V2
       ordered
       map_element "valueExpandedMUXMLList", to: :value_expanded_mu_xml_list
       map_element "coverageFactorXMLList", to: :coverage_factor_xml_list
-      map_element "coverageProbabilityXMLList", to: :coverage_probability_xml_list
+      map_element "coverageProbabilityXMLList",
+                  to: :coverage_probability_xml_list
       map_element "distributionXMLList", to: :distribution_xml_list
     end
   end

data/lib/dcc/si/v2/expanded_unc.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Dcc::Si::V2
+  class ExpandedUnc < CommonElements
+    include ::Dcc::Si::Base::ExpandedUnc
+  end
+  Configuration.register_model(ExpandedUnc, id: :expandedUnc)
+end

data/lib/dcc/si/v2/measurement_uncertainty_univariate.rb

@@ -4,5 +4,6 @@ module Dcc::Si::V2
   class MeasurementUncertaintyUnivariate < CommonElements
     include ::Dcc::Si::Base::MeasurementUncertaintyUnivariate
   end
-  Configuration.register_model(MeasurementUncertaintyUnivariate, id: :measurementUncertaintyUnivariate)
+  Configuration.register_model(MeasurementUncertaintyUnivariate,
+                               id: :measurementUncertaintyUnivariate)
 end

data/lib/dcc/si/v2.rb

@@ -22,9 +22,13 @@ module Dcc
       autoload :ExpandedMU, "dcc/si/v2/expanded_mu"
       autoload :ExpandedMUXMLList, "dcc/si/v2/expanded_mu_xml_list"
       autoload :CoverageIntervalMU, "dcc/si/v2/coverage_interval_mu"
-      autoload :CoverageIntervalMUXMLList, "dcc/si/v2/coverage_interval_mu_xml_list"
+      autoload :CoverageIntervalMUXMLList,
+               "dcc/si/v2/coverage_interval_mu_xml_list"
+      autoload :ExpandedUnc, "dcc/si/v2/expanded_unc"
+      autoload :CoverageInterval, "dcc/si/v2/coverage_interval"
       autoload :ExpandedUncXmlList, "dcc/si/v2/expanded_unc_xml_list"
-      autoload :MeasurementUncertaintyUnivariate, "dcc/si/v2/measurement_uncertainty_univariate"
+      autoload :MeasurementUncertaintyUnivariate,
+               "dcc/si/v2/measurement_uncertainty_univariate"
 
       ROOT_ELEMENT_TAG = "real"
 
@@ -36,6 +40,7 @@ module Dcc
         StandardMU StandardMUXMLList
         ExpandedMU ExpandedMUXMLList
         CoverageIntervalMU CoverageIntervalMUXMLList
+        ExpandedUnc CoverageInterval
         ExpandedUncXmlList MeasurementUncertaintyUnivariate
       ].freeze
 
@@ -46,4 +51,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/signature/result.rb

@@ -19,7 +19,7 @@ module Dcc
 
       def to_s
         if valid?
-          "Signature valid#{certificate_pem ? " (cert: #{certificate_pem.lines.first&.strip})" : ''}"
+          "Signature valid#{" (cert: #{certificate_pem.lines.first&.strip})" if certificate_pem}"
         else
           "Signature INVALID"
         end
@@ -40,4 +40,4 @@ module Dcc
       end
     end
   end
-end
+end

data/lib/dcc/signature/signer.rb

@@ -1,36 +1,49 @@
 # frozen_string_literal: true
 
+require "moxml"
+require "openssl"
+
 module Dcc
   module Signature
-    # `Dcc::Signature::Signer` wraps an enveloped XMLDSig signature over a
-    # DCC document using RSA-SHA-256. Requires the `xmldsig` gem.
+    # `Dcc::Signature::Signer` creates an enveloped XMLDSig signature over
+    # a DCC document using RSA-SHA-256 with exclusive C14N. Uses moxml's
+    # native Signature module.
     module Signer
+      EXC_C14N = "http://www.w3.org/2001/10/xml-exc-c14n#"
+      RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+      SHA256 = "http://www.w3.org/2001/04/xmlenc#sha256"
+      ENVELOPED = "http://www.w3.org/2000/09/xmldsig#enveloped-signature"
+
       class << self
         # @param xml_or_dcc [String, Lutaml::Model::Serializable] the DCC.
         # @param cert_pem [String] PEM-encoded signing certificate.
         # @param key_pem [String] PEM-encoded private key.
         # @return [String] the signed XML document.
         def call(xml_or_dcc, cert_pem:, key_pem:)
-          ensure_xmldsig!
           xml = xml_or_dcc.is_a?(::String) ? xml_or_dcc : xml_or_dcc.to_xml
-          document = Xmldsig::XMLDoc.new(xml)
-          document.sign(
-            OpenSSL::PKey::RSA.new(key_pem),
-            cert_pem,
-          ).to_xml
-        end
-
-        private
+          ctx = ::Moxml.new(::Lutaml::Model::Config.xml_adapter_type)
+          doc = ctx.parse(xml)
+          key = ::OpenSSL::PKey::RSA.new(key_pem)
+          cert = ::OpenSSL::X509::Certificate.new(cert_pem)
 
-        def ensure_xmldsig!
-          return if defined?(::Xmldsig)
+          signature = ::Moxml::Signature.sign(
+            context: ctx,
+            document: doc,
+            key: key,
+            certificate: cert,
+            signature_method: RSA_SHA256,
+            canonicalization_method: EXC_C14N,
+            digest_method: SHA256,
+            reference_uri: "",
+            transforms: [ENVELOPED],
+          )
 
-          require "xmldsig"
-        rescue ::LoadError
-          raise ::Dcc::MissingDependencyError.new(gem_name: "xmldsig", feature: "Dcc::Signature"),
-                "xmldsig is required for XMLDSig signing"
+          serialized = ::Moxml::Signature::Serializer
+            .new(context: ctx).serialize(signature)
+          doc.root.add_child(serialized.root)
+          doc.to_xml
         end
       end
     end
   end
-end
+end

data/lib/dcc/signature/verifier.rb

@@ -1,41 +1,43 @@
 # frozen_string_literal: true
 
+require "moxml"
+require "openssl"
+
 module Dcc
   module Signature
-    # `Dcc::Signature::Verifier` validates a signed DCC against a CA
-    # certificate. The signed XML subtree is extracted so callers can
-    # extract the trustworthy content.
+    # `Dcc::Signature::Verifier` validates a signed DCC using moxml's
+    # native Signature module.
     module Verifier
       class << self
         # @param xml [String] signed DCC XML.
-        # @param ca_cert_pem [String] PEM-encoded CA certificate.
+        # @param ca_cert_pem [String] PEM-encoded certificate or public key.
         # @return [Dcc::Signature::Result]
         def call(xml, ca_cert_pem:)
-          ensure_xmldsig!
-          document = Xmldsig::XMLDoc.new(xml)
-          signed_xml = nil
-          is_valid = document.validate(ca_cert_pem) do |signed_node|
-            signed_xml = signed_node.to_xml
-            true
-          end
+          ctx = ::Moxml.new(::Lutaml::Model::Config.xml_adapter_type)
+          doc = ctx.parse(xml)
+
+          key = load_key(ca_cert_pem)
+          result = ::Moxml::Signature.verify(
+            context: ctx,
+            document: doc,
+            key: key,
+          )
+
           ::Dcc::Signature::Result.new(
-            valid: is_valid,
+            valid: result.valid?,
             certificate_pem: ca_cert_pem,
-            signed_xml: signed_xml,
+            signed_xml: doc.to_xml,
           )
         end
 
         private
 
-        def ensure_xmldsig!
-          return if defined?(::Xmldsig)
-
-          require "xmldsig"
-        rescue ::LoadError
-          raise ::Dcc::MissingDependencyError.new(gem_name: "xmldsig", feature: "Dcc::Signature"),
-                "xmldsig is required for XMLDSig verification"
+        def load_key(pem)
+          ::OpenSSL::X509::Certificate.new(pem).public_key
+        rescue ::OpenSSL::X509::CertificateError
+          ::OpenSSL::PKey::RSA.new(pem)
         end
       end
     end
   end
-end
+end

data/lib/dcc/signature.rb

@@ -10,4 +10,4 @@ module Dcc
     autoload :Verifier, "dcc/signature/verifier"
     autoload :Result, "dcc/signature/result"
   end
-end
+end