nokogiri-xmlsec 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce9aa5774cf601b1d61c7a91d1a40b54ccc1707
-  data.tar.gz: 09ddf766c88fd311c714f1d64f20ba8c2be1de55
+  metadata.gz: 071248ba595e25283ee6987fb5ac39a111a86eab
+  data.tar.gz: 48e03d326c3b0b65e4dc4980c9a59836591c3d9a
 SHA512:
-  metadata.gz: 8dc8f5fb6f6523d39572a633e91b1948dc4fb3b956082e50919dbfb06565872b2d26ac3ffce27aa3a3cf79fe5e264235ecb25900e9ef3b4169a31687848bed30
-  data.tar.gz: de1fb73e0f83c43c9f4f1de2afcc13f7b65a7b41dedacc727b37341ea325f54e03f7764ced670e1c946bcbcb51994edce0dadf2e398bd03661a09362f6731f76
+  metadata.gz: 5ba83c44cd6e92e403639d093cec53678bf2ffc3afaa284b8cbfd7a5da752ee81b0b140e41f83408fc4e07166ec783a2badbfa5841adab9a0789a734ea211ced
+  data.tar.gz: 697783269c10f6114b47af84e124b58ed7ff746f79ce86d2429c5b7e9268e8eece8273679b646a0438e2b5b49d28fa8d267a5616ac67eaa9c95d939744d5823a

data/ext/nokogiri_ext_xmlsec/nokogiri_helpers_set_attribute_id.c

@@ -0,0 +1,43 @@
+#include "xmlsecrb.h"
+
+VALUE set_id_attribute(VALUE self, VALUE rb_attr_name) {
+  xmlNodePtr node;
+  xmlAttrPtr attr;
+  xmlAttrPtr tmp;
+  xmlChar *name;
+  const xmlChar *idName;
+  
+  Data_Get_Struct(self, xmlNode, node);
+  Check_Type(rb_attr_name, T_STRING);
+  idName = (const xmlChar *)RSTRING_PTR(rb_attr_name);
+
+  // find pointer to id attribute
+  attr = xmlHasProp(node, idName);
+  if((attr == NULL) || (attr->children == NULL)) {
+    rb_raise(rb_eRuntimeError, "Can't find attribute to add register as id");
+    return Qfalse;
+  }
+  
+  // get the attribute (id) value
+  name = xmlNodeListGetString(node->doc, attr->children, 1);
+  if(name == NULL) {
+    rb_raise(rb_eRuntimeError, "Attribute %s has no value", idName);
+    return Qfalse;
+  }
+  
+  // check that we don't have that id already registered
+  tmp = xmlGetID(node->doc, name);
+  if(tmp != NULL) {
+    // rb_raise(rb_eRuntimeError, "Attribute %s is already an ID", idName);
+    xmlFree(name);
+    return Qfalse;
+  }
+  
+  // finally register id
+  xmlAddID(NULL, node->doc, name, attr);
+
+  // and do not forget to cleanup
+  xmlFree(name);
+
+  return Qtrue;
+}

data/ext/nokogiri_ext_xmlsec/nokogiri_init.c

@@ -1,6 +1,7 @@
 #include "xmlsecrb.h"
 
 VALUE rb_cNokogiri_XML_Document = T_NIL;
+VALUE rb_cNokogiri_XML_Node = T_NIL;
 VALUE rb_eSigningError = T_NIL;
 VALUE rb_eVerificationError = T_NIL;
 VALUE rb_eKeystoreError = T_NIL;
@@ -12,6 +13,7 @@ void Init_Nokogiri_ext() {
   VALUE Nokogiri = rb_define_module("Nokogiri");
   VALUE Nokogiri_XML = rb_define_module_under(Nokogiri, "XML");
   rb_cNokogiri_XML_Document = rb_const_get(Nokogiri_XML, rb_intern("Document"));
+  rb_cNokogiri_XML_Node = rb_const_get(Nokogiri_XML, rb_intern("Node"));
 
   rb_define_method(rb_cNokogiri_XML_Document, "sign_with_key",            sign_with_key, 2);
   rb_define_method(rb_cNokogiri_XML_Document, "sign_with_certificate",    sign_with_certificate, 3);
@@ -20,6 +22,7 @@ void Init_Nokogiri_ext() {
   rb_define_method(rb_cNokogiri_XML_Document, "verify_with_certificates", verify_signature_with_certificates, 1);
   rb_define_method(rb_cNokogiri_XML_Document, "encrypt_with_key",         encrypt_with_key, 2);
   rb_define_method(rb_cNokogiri_XML_Document, "decrypt_with_key",         decrypt_with_key, 2);
+  rb_define_method(rb_cNokogiri_XML_Node,     "set_id_attribute",         set_id_attribute, 1);
 
   rb_eSigningError      = rb_define_class_under(XMLSec, "SigningError",      rb_eRuntimeError);
   rb_eVerificationError = rb_define_class_under(XMLSec, "VerificationError", rb_eRuntimeError);

data/ext/nokogiri_ext_xmlsec/nokogiri_verify_signature_certificates.c

@@ -75,7 +75,7 @@ VALUE verify_signature_with_certificates(VALUE self, VALUE rb_certs) {
 
   // verify signature
   if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) {
-    rb_raise(rb_eVerificationError, "signature could not be verified");
+    rb_raise(rb_eVerificationError, "error occurred during signature verification");
     goto done;
   }
       

data/ext/nokogiri_ext_xmlsec/xmlsecrb.h

@@ -25,6 +25,7 @@ VALUE verify_signature_with_named_keys(VALUE self, VALUE rb_keys);
 VALUE verify_signature_with_certificates(VALUE self, VALUE rb_certs);
 VALUE encrypt_with_key(VALUE self, VALUE rb_key_name, VALUE rb_key);
 VALUE decrypt_with_key(VALUE self, VALUE rb_key_name, VALUE rb_key);
+VALUE set_id_attribute(VALUE self, VALUE rb_attr_name);
 
 void Init_Nokogiri_ext(void);
 

data/lib/xmlsec.rb

@@ -87,7 +87,7 @@ class Nokogiri::XML::Document
     if opts[:key]
       encrypt_with_key opts[:name].to_s, opts[:key]
     else
-      raise "private :key is required for encryption"
+      raise "public :key is required for encryption"
     end
     self
   end

data/lib/xmlsec/version.rb

@@ -1,3 +1,3 @@
 module Xmlsec
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-xmlsec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Colin MacKenzie IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -132,6 +132,7 @@ files:
 - ext/nokogiri_ext_xmlsec/init.c
 - ext/nokogiri_ext_xmlsec/nokogiri_decrypt_with_key.c
 - ext/nokogiri_ext_xmlsec/nokogiri_encrypt_with_key.c
+- ext/nokogiri_ext_xmlsec/nokogiri_helpers_set_attribute_id.c
 - ext/nokogiri_ext_xmlsec/nokogiri_init.c
 - ext/nokogiri_ext_xmlsec/nokogiri_sign_certificate.c
 - ext/nokogiri_ext_xmlsec/nokogiri_sign_rsa.c