etherpad_canvas 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f5f0cb905c70a4b4452adc39b461034fd17961
-  data.tar.gz: 67d3b594e5674551fc36abdd862a8d4423103818
+  metadata.gz: ccb6dcf3c4924ddaa7bdde322c1d6964a3f2570a
+  data.tar.gz: 59285dce7becc30a79e03f108fcc7090ec60ef06
 SHA512:
-  metadata.gz: aa05534a12385563b3114f49f8668e71827dbafd8158e92c0eff1af7f43f60fd7b23ad7b5e35d3ad75135b3104f0c3974d2e0e070f94d613512246f678895b0c
-  data.tar.gz: 89f74afa0e8de8e36f906b73e2c53d638dcb64e85b3866a58c1d1fcf314750699b27aa0fb54c4aefe87e9541e377167f5d4056c21effd2d73bac59999b66360a
+  metadata.gz: 52cd53f87601f4a230814ebb1ca6c5d7a28230e7c2442a2b0f2603080aa6e6861a8d945e366e921d29fec81ea4517c6fa8ff5d6b1df060a397aca51f2b639753
+  data.tar.gz: f4d67a544a432fbbba732ae10ad787a28f63bddf383df7d8505883a2b77fadaa7edb86387b3515ba41a12b378b03e4d841118752547c936edfdf420e58732d80

data/README.rdoc

@@ -17,10 +17,9 @@ Installation
     sysadmin@appserver:~$ cd /path/to/canvas/gems/plugins
     sysadmin@appserver:/path/to/canvas/gems/plugins$ git clone https://github.com/atomicjolt/etherpad_canvas.git
 
-  Add RSA Private Key through Canvas settings and then
-  create a public_key.pem file that corresponds with
-  the private key to add to the Etherpad Plugin for
-  verification.
+  Run rake:secret and add the generated secret through 
+  Canvas settings and save that secret for utilization 
+  with the Etherpad Plugin for verification.
 
 ===================================================
 Usage

data/lib/etherpad_canvas/etherpad_collaboration.rb

@@ -21,31 +21,32 @@ class EtherpadCollaboration
 
   def self.sign_url(user, collaboration)
     plugin = PluginSetting.find_by(name: "etherpad_canvas")
+    etherpad_plugin = PluginSetting.find_by(name: "etherpad")
+    domain = etherpad_plugin.split("/")
+
     if !plugin.disabled
-      key_pem = plugin.settings[:key]
-      key = OpenSSL::PKey::RSA.new(key_pem)
-      timestamp = (Time.now.to_f * 1000).to_i
-      query = {
-        timestamp: timestamp,
-        user_id: user.id,
-        username: user.name,
-      }.to_query
-      if collaboration.url.include?("?")
-        url = collaboration.url.split("?")
-        url[1] = signing(key, query)
-        collaboration.url = url.join
-      else
-        collaboration.url += signing(key, query)
-      end
-
-      collaboration.url
+      key = plugin.settings[:key]
+
+      url = generate_url user, collaboration
+
+      url_sans_http = url.split(domain)[0]
+
+      digest = OpenSSL::Digest.new("sha1")
+
+      hmac = OpenSSL::HMAC.hexdigest(digest, key, url_sans_http)
+
+      "#{url}&signature=#{hmac}"
     end
   end
 
-  def signing(key, query)
-    digest = OpenSSL::Digest::SHA256.new
-    signature = key.sign digest, query
-    encoded_signature = CGI.escape(Base64.strict_encode64(signature))
-    "?#{query}&signature=#{encoded_signature}"
+  def self.generate_url(user, collaboration)
+    timestamp = (Time.now.to_f * 1000).to_i
+    query = {
+      timestamp: timestamp,
+      user_id: user.id,
+      username: user.name,
+    }.to_query
+
+    "#{collaboration.url}?#{query}"
   end
 end

data/lib/etherpad_canvas/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module EtherpadCanvas
-  VERSION = "1.0.3".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherpad_canvas
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Durr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails