nokogiri-xmlsec-instructure 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72eea7707ea8c4d24e0cb82afc804752be0313d810554ca54f4ea9e4a3f857e9
-  data.tar.gz: 4641d782e76a25aa3f251ff160f04d66198a1c2c3a4020f625dc29f7bbe5e365
+  metadata.gz: 3d80bf299c2e7900122535982dfde8b7b6ab67ea53528b0b055c3758b9b9753f
+  data.tar.gz: 379cbbff6fc67ac23cf9d604d15aea36f79e58418b034dcf5e5b45db3c86a739
 SHA512:
-  metadata.gz: f116055729f4a0bddbee6432c99e9f505aad12a45452121d4fb14414de8eaf613009db60d28d55a7e7c8b7c5678e67e7d3a297741186f4e9eabcf4d08b88385c
-  data.tar.gz: d73b7b9d8ff63621b3162b4d83dfcf8ffd52b253d589fc863ef44d47847801e23ad8a386b4459a933431c5eaef0e377051089e8c4af06cde05522e3d390f4ae3
+  metadata.gz: e87ccfb10dfc8d9afe6964c58f4a56179fde5faa0ab007fb8bb5b62a038d6bc609d7f96efc09fbc394d3e51af568f3134133d87d5a843d6a456fe949dca464c2
+  data.tar.gz: 705acc4113dc8380a29c3ef001a19eceda6a128e9c08441a3ebd9f135452f5d0a22419d8cfdd64f2002841132687f10f84af09fe998d19f701aeff5d4860e21a

data/.github/workflows/push.yml

@@ -0,0 +1,40 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [3.0, 2.7]
+        gemfile: ['gemfiles/nokogiri_13.10.gemfile', 'gemfiles/nokogiri_12.5.gemfile']
+
+    steps:
+      - name: Install libxmlsec
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libxmlsec1-dev
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      - name: Install dependencies
+        run: bundle install
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      - name: Run tests
+        run: bundle exec rake
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 spec/old
 *.so
 *.sw[opn]
+*.gemfile.lock

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.4

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise "nokogiri-13.10" do
+  gem "nokogiri", "1.13.10"
+end
+
+appraise "nokogiri-12.5" do
+  gem "nokogiri", "1.12.5"
+end

data/ext/nokogiri_ext_xmlsec/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+require 'nokogiri'
 
 def barf message = 'dependencies not met'
   raise message
@@ -10,18 +11,12 @@ pkg_config('xmlsec1')
 $CFLAGS << " " + `xmlsec1-config  --cflags`.strip
 $CFLAGS << " -fvisibility=hidden"
 
-if $CFLAGS =~ /\-DXMLSEC_CRYPTO=\\\\\\"openssl\\\\\\"/
-puts "Changing escaping: #{$CFLAGS}"
-  $CFLAGS['-DXMLSEC_CRYPTO=\\\\\\"openssl\\\\\\"'] =
-    '-DXMLSEC_CRYPTO=\\"openssl\\"'
-end
-
-if $CFLAGS =~ /\-DXMLSEC_CRYPTO="openssl"/
-puts "Ensure we escaping: #{$CFLAGS}"
-  $CFLAGS['-DXMLSEC_CRYPTO="openssl"'] =
-  '-DXMLSEC_CRYPTO=\\"openssl\\"'
-end
+$CFLAGS << Dir[Gem.loaded_specs['nokogiri'].full_gem_path + "/ext/*"].map { |dir| " -I#{dir}"}.join("")
 
-puts "Clfags: #{$CFLAGS}"
+puts "Cflags: #{$CFLAGS}"
 $libs = `xmlsec1-config  --libs`.strip
+
+# We reference symbols out of nokogiri but don't link directly against it
+$LDFLAGS << ' -Wl,-undefined,dynamic_lookup'
+
 create_makefile('nokogiri_ext_xmlsec')

data/ext/nokogiri_ext_xmlsec/init.c

@@ -47,7 +47,7 @@ void Init_nokogiri_ext_xmlsec() {
   }
   // load crypto
   #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING
-    if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) {
+    if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
       rb_raise(rb_eRuntimeError,
         "Error: unable to load default xmlsec-crypto library. Make sure"
         "that you have it installed and check shared libraries path\n"

data/ext/nokogiri_ext_xmlsec/nokogiri_decrypt_with_key.c

@@ -1,11 +1,6 @@
 #include "xmlsecrb.h"
 #include "util.h"
 
-// technically we should include nokogiri.h, but we don't know
-// how to find it. we _know_ this function will exist at runtime
-// though, so just declare it here
-void noko_xml_document_pin_node(xmlNodePtr);
-
 VALUE decrypt_with_key(VALUE self, VALUE rb_key_name, VALUE rb_key) {
   VALUE rb_exception_result = Qnil;
   const char* exception_message = NULL;
@@ -21,7 +16,7 @@ VALUE decrypt_with_key(VALUE self, VALUE rb_key_name, VALUE rb_key) {
 
   Check_Type(rb_key,      T_STRING);
   Check_Type(rb_key_name, T_STRING);
-  Data_Get_Struct(self, xmlNode, node);
+  Noko_Node_Get_Struct(self, xmlNode, node);
   key       = RSTRING_PTR(rb_key);
   keyLength = RSTRING_LEN(rb_key);
   keyName = StringValueCStr(rb_key_name);

data/ext/nokogiri_ext_xmlsec/nokogiri_encrypt_with_key.c

@@ -53,7 +53,7 @@ VALUE encrypt_with_key(VALUE self, VALUE rb_rsa_key_name, VALUE rb_rsa_key,
     goto done;
   }
 
-  Data_Get_Struct(self, xmlNode, node);
+  Noko_Node_Get_Struct(self, xmlNode, node);
   doc = node->doc;
 
   // create encryption template to encrypt XML file and replace 

data/ext/nokogiri_ext_xmlsec/nokogiri_helpers_set_attribute_id.c

@@ -1,9 +1,6 @@
 #include "xmlsecrb.h"
 #include "util.h"
 
-// declaration from Nokogiri proper
-VALUE noko_xml_node_wrap(VALUE klass, xmlNodePtr node) ;
-
 VALUE set_id_attribute(VALUE self, VALUE rb_attr_name) {
   VALUE rb_exception_result = Qnil;
   const char* exception_message = NULL;
@@ -17,7 +14,7 @@ VALUE set_id_attribute(VALUE self, VALUE rb_attr_name) {
 
   resetXmlSecError();
 
-  Data_Get_Struct(self, xmlNode, node);
+  Noko_Node_Get_Struct(self, xmlNode, node);
   Check_Type(rb_attr_name, T_STRING);
   idName = StringValueCStr(rb_attr_name);
 
@@ -86,7 +83,7 @@ VALUE get_id(VALUE self, VALUE rb_id)
   xmlDocPtr doc;
 
   Check_Type(rb_id, T_STRING);
-  Data_Get_Struct(self, xmlDoc, doc);
+  Noko_Node_Get_Struct(self, xmlDoc, doc);
   prop = xmlGetID(doc, (const xmlChar *)StringValueCStr(rb_id));
   if (prop) {
     return noko_xml_node_wrap(Qnil, (xmlNodePtr)prop);

data/ext/nokogiri_ext_xmlsec/nokogiri_sign.c

@@ -90,7 +90,7 @@ VALUE sign(VALUE self, VALUE rb_opts) {
     goto done;
   }
 
-  Data_Get_Struct(self, xmlNode, envelopeNode);
+  Noko_Node_Get_Struct(self, xmlNode, envelopeNode);
   doc = envelopeNode->doc;
   // create signature template for enveloped signature.
   signNode = xmlSecTmplSignatureCreate(doc, xmlSecTransformExclC14NId,

data/ext/nokogiri_ext_xmlsec/nokogiri_verify_with.c

@@ -146,7 +146,7 @@ VALUE verify_with(VALUE self, VALUE rb_opts) {
   resetXmlSecError();
 
   Check_Type(rb_opts, T_HASH);
-  Data_Get_Struct(self, xmlNode, node);
+  Noko_Node_Get_Struct(self, xmlNode, node);
 
   // verify start node
   if(!xmlSecCheckNodeName(node, xmlSecNodeSignature, xmlSecDSigNs)) {

data/ext/nokogiri_ext_xmlsec/xmlsecrb.h

@@ -20,6 +20,12 @@
 #include <xmlsec/crypto.h>
 #include <xmlsec/errors.h>
 
+#include <nokogiri.h>
+// Lifted from modern nokogiri.h
+#ifndef Noko_Node_Get_Struct
+  #define Noko_Node_Get_Struct(obj,type,sval) ((sval) = (type*)DATA_PTR(obj))
+#endif
+
 // TODO(awong): Support non-gcc and non-clang compilers.
 #define EXTENSION_EXPORT __attribute__((visibility("default")))
 

data/gemfiles/nokogiri_12.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "nokogiri", "1.12.5"
+
+gemspec path: "../"

data/gemfiles/nokogiri_13.10.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "nokogiri", "1.13.10"
+
+gemspec path: "../"

data/lib/xmlsec/version.rb

@@ -1,3 +1,3 @@
 module Xmlsec
-  VERSION = '0.10.1'
+  VERSION = '0.10.3'
 end

data/nokogiri-xmlsec-instructure.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'nokogiri', '>= 1.11.2'
 
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"

data/spec/fixtures/sign3-result.xml

@@ -32,7 +32,8 @@ eymfHtzOeY86WyvfsjZmaz2XnIo9dzZsK71yMEKkgvXQnnYy9pK0NaYcG0B0hcii
 gSVEWpEpCSo560x0mSuLnJYdQQzZ/L6xvxZ1AgMBAAEwDQYJKoZIhvcNAQEFBQAD
 gYEATyK/RlfpohUVimgFkycTF2hyusjctseXoZDCctgg/STMsL8iA0P9YB6k91GC
 kWpwevuiwarD1MfSUV6goPINFkIBvfK+5R9lpHaTqqs615z8T9R5VJgaLcFe3tWd
-7oq3V2q5Nl6MrZfXj2N07qe6/9zfdauxYO26vAEKCvIkbMo=</X509Certificate>
+7oq3V2q5Nl6MrZfXj2N07qe6/9zfdauxYO26vAEKCvIkbMo=
+</X509Certificate>
 </X509Data>
 </KeyInfo>
 </Signature></Envelope>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-xmlsec-instructure
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Albert J. Wong
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.2
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +154,11 @@ extensions:
 - ext/nokogiri_ext_xmlsec/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/push.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".tool-versions"
+- Appraisals
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -163,6 +179,8 @@ files:
 - ext/nokogiri_ext_xmlsec/util.c
 - ext/nokogiri_ext_xmlsec/util.h
 - ext/nokogiri_ext_xmlsec/xmlsecrb.h
+- gemfiles/nokogiri_12.5.gemfile
+- gemfiles/nokogiri_13.10.gemfile
 - lib/nokogiri-xmlsec.rb
 - lib/xmlsec.rb
 - lib/xmlsec/version.rb
@@ -201,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Wrapper around http://www.aleksey.com/xmlsec to support XML encryption, decryption,

data/.travis.yml

@@ -1,3 +0,0 @@
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libxmlsec1-dev