orthrus-ssh 0.6.0 → 0.6.1

data/lib/orthrus/ssh.rb

@@ -7,7 +7,7 @@ require 'orthrus/ssh/dsa'
 require 'orthrus/ssh/utils'
 
 module Orthrus::SSH
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   def self.load_private(path)
     data = File.read(path)

data/lib/orthrus/ssh/rack_app.rb

@@ -25,7 +25,7 @@ module Orthrus::SSH
     def form(body)
       [200,
        { "Content-Type" => "application/x-www-form-urlencoded" },
-       [body]
+       [Rack::Utils.build_query(body)]
       ]
     end
 
@@ -34,14 +34,14 @@ module Orthrus::SSH
       id = req.params["id"]
 
       unless pub = @sessions.find_key(user, id)
-        return form("code=unknown")
+        return form :code => "unknown"
       end
 
       session, nonce = @sessions.new_session(user, pub)
 
-      nonce = Rack::Utils.escape Utils.sha1_hash(nonce)
+      nonce = Utils.sha1_hash(nonce)
 
-      form "code=check&session_id=#{session}&nonce=#{nonce}"
+      form :code => 'check', :session_id => session, :nonce => nonce
     end
 
     def verify(req)
@@ -52,10 +52,12 @@ module Orthrus::SSH
 
       sig = req.params['sig']
 
+      token = @sessions.new_access_token(id)
+
       if pub.verify(sig, nonce, true)
-        form "code=verified&access_token=1"
+        form :code => 'verified', :access_token => token
       else
-        form "code=fail"
+        form :code => "fail"
       end
     end
   end

data/test/sessions.rb

@@ -21,7 +21,7 @@ class OrthrusTestSessions
     ["secret", @pub]
   end
 
-  def access_token
+  def new_access_token(session_id)
     1
   end
 end

data/test/test_orthrus_ssh_rackapp.rb

@@ -34,7 +34,8 @@ class TestOrthrusSSHRackApp < MiniTest::Unit::TestCase
     assert_equal "application/x-www-form-urlencoded",
                  headers["Content-Type"]
 
-    assert_equal "code=unknown", body[0]
+    params = Rack::Utils.parse_query body[0]
+    assert_equal "unknown", params['code']
   end
 
   def test_call_requests_signature
@@ -79,6 +80,9 @@ class TestOrthrusSSHRackApp < MiniTest::Unit::TestCase
 
     code, headers, body = @app.call(env)
 
-    assert_equal ["code=verified&access_token=1"], body
+    params = Rack::Utils.parse_query body.first
+
+    assert_equal "verified", params['code']
+    assert_equal "1", params["access_token"]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orthrus-ssh
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Evan Phoenix