ostatus2 0.3.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134189e93db8131de1acf2540494830cc3b0b9f7
-  data.tar.gz: 84091c342802e334d3607af0791286315a01d4eb
+  metadata.gz: bbf294e569b899f5aeb8406caca3a35230ac66d1
+  data.tar.gz: dfb5ffa9813a7738bdaa54fca1726fcdd58375ac
 SHA512:
-  metadata.gz: cbd9646dccf41f97984ad4dbe537ff649e3ff2ac3d3a85f61524039796e5b72b9da4857282854238a7b9584051788d4863376f6cf926c948de065ecb7fc1d1ae
-  data.tar.gz: 03de1727bfecddebb66092507e5a265757bfc97bca2723ef534eafe8ac7c8526cdbe8f0dfddb6bfd8e186062512d9c8d4346867872875bf9858f8d998ade15d2
+  metadata.gz: 327e56801a53d5c0cf885c5d8523b5d05c7773aa0a44f6a5017fc35f08dc3c5360ab9a543a17a300f646d8cf1babdb150a428652301f0929ce7959a883392c7b
+  data.tar.gz: 20eb364b94680f55ce7421e6cb202a99eecacb411e84f7ed376fcfd063601beb964e07b03152a998092ad9c5c03aa578766d1d57e20edb99012f2d6636cf258a

data/lib/ostatus2/magic_key.rb

@@ -0,0 +1,26 @@
+module OStatus2
+  module MagicKey
+    def magic_key_to_pem(magic_key)
+      _, modulus, exponent = magic_key.split('.')
+      modulus, exponent = [modulus, exponent].map { |n| decode_base64(n).bytes.inject(0) { |a, e| (a << 8) | e } }
+
+      key   = OpenSSL::PKey::RSA.new
+      key.n = modulus
+      key.e = exponent
+
+      key.to_pem
+    end
+
+    def decode_base64(string)
+      retries = 0
+
+      begin
+        return Base64::urlsafe_decode64(string)
+      rescue ArgumentError
+        retries += 1
+        string = "#{string}="
+        retry unless retries > 2
+      end
+    end
+  end
+end

data/lib/ostatus2/salmon.rb

@@ -1,5 +1,7 @@
 module OStatus2
   class Salmon
+    include OStatus2::MagicKey
+
     XMLNS = 'http://salmon-protocol.org/ns/magic-env'
 
     # Create a magical envelope XML document around the original body
@@ -68,9 +70,9 @@ module OStatus2
 
       data      = xml.at_xpath('//me:data')
       type      = data.attribute('type').value
-      body      = Base64::urlsafe_decode64(data.content) rescue ''
+      body      = decode_base64(data.content)
       sig       = xml.at_xpath('//me:sig')
-      signature = Base64::urlsafe_decode64(sig.content) rescue ''
+      signature = decode_base64(sig.content)
       encoding  = xml.at_xpath('//me:encoding').content
       alg       = xml.at_xpath('//me:alg').content
       plaintext = plaintext_signature(body, type, encoding, alg)

data/lib/ostatus2/version.rb

@@ -1,3 +1,3 @@
 module OStatus2
-  VERSION = "0.3.2"
+  VERSION = "1.0.1"
 end

data/lib/ostatus2.rb

@@ -8,6 +8,7 @@ require 'ostatus2/version'
 require 'ostatus2/publication'
 require 'ostatus2/subscription_response'
 require 'ostatus2/subscription'
+require 'ostatus2/magic_key'
 require 'ostatus2/salmon'
 
 module OStatus2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ostatus2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Eugen Rochko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/ostatus2.rb
+- lib/ostatus2/magic_key.rb
 - lib/ostatus2/publication.rb
 - lib/ostatus2/salmon.rb
 - lib/ostatus2/subscription.rb