appoxy_api 0.0.5 → 0.0.6

data/lib/api/api_controller.rb

@@ -14,7 +14,7 @@ module Appoxy
         module ApiController
 
             def verify_signature
-
+                params2 = nil
                 if request.put? || request.post?
                     # We'll extract params from body instead here
                     # todo: maybe check for json format first in case this is a file or something?
@@ -25,28 +25,47 @@ module Appoxy
                     params.merge! params2
                 end
 
-                operation = "#{controller_name}/#{action_name}"
-                puts "XXX " + operation
+                #operation = "#{controller_name}/#{action_name}"
+                #operation = request.env["PATH_INFO"].gsub(/\/api\//, "")# here we're getting original request url'
+
+#                #getting clean params (without parsed via routes)
+#                params_for_signature = params2||request.query_parameters
+#                #removing mandatory params
+#                params_for_signature = params_for_signature.delete_if {|key, value| ["access_key", "sigv", "sig", "timestamp"].include? key}
 
-#            puts 'params in base=' + params.inspect
 
+                #puts "params " +operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
                 access_key = params["access_key"]
                 sigv = params["sigv"]
                 timestamp = params["timestamp"]
                 sig = params["sig"]
-
+                signature = ""
+                case sigv
+                    when "0.1"
+                        puts "outdated version of client"
+                        signature = "#{controller_name}/#{action_name}"
+                    when "0.2"
+                        puts "new version of client"
+                        operation = request.env["PATH_INFO"].gsub(/\/api\//, "")# here we're getting original request url'
+                        params_for_signature = params2||request.query_parameters
+                        params_for_signature = params_for_signature.delete_if {|key, value| ["access_key", "sigv", "sig", "timestamp"].include? key}
+                        signature = operation+Appoxy::Api::Signatures.hash_to_s(params_for_signature)
+                end
+#                puts "signature " + signature
                 raise Appoxy::Api::ApiError, "No access_key" if access_key.nil?
                 raise Appoxy::Api::ApiError, "No sigv" if sigv.nil?
                 raise Appoxy::Api::ApiError, "No timestamp" if timestamp.nil?
                 raise Appoxy::Api::ApiError, "No sig" if sig.nil?
-
-                sig2 = Appoxy::Api::Signatures.generate_signature(operation, timestamp, secret_key_for_signature(access_key))
+                timestamp2 = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
+                raise Appoxy::Api::ApiError, "Request timed out!" unless (Time.parse(timestamp2)-Time.parse(timestamp))<60 # deny all requests older than 60 seconds
+                sig2 = Appoxy::Api::Signatures.generate_signature(signature, timestamp, secret_key_for_signature(access_key))
                 raise Appoxy::Api::ApiError, "Invalid signature!" unless sig == sig2
 
-                puts 'Verified OK'
+                puts 'Signature OK'
 
             end
 
+
             def sig_should
                 raise "You didn't define a sig_should method in your controller!"
             end
@@ -56,8 +75,8 @@ module Appoxy
                 response_as_string = '' # in case we want to add debugging or something
 #                respond_to do |format|
                 #                format.json { render :json=>msg }
-                response_as_string = render_to_string :json => msg
-                render :json => response_as_string
+#                response_as_string = render_to_string :json => msg
+                render :json => msg
 #                end
                 true
             end
@@ -79,6 +98,7 @@ module Appoxy
 
         end
 
+
         class ApiError < StandardError
 
             def initialize(msg=nil)

data/lib/api/client.rb

@@ -9,12 +9,14 @@ module Appoxy
 
             attr_accessor :host, :access_key, :secret_key
 
+
             def initialize(host, access_key, secret_key, options={})
                 @host = host
                 @access_key = access_key
                 @secret_key = secret_key
             end
 
+
             def get(method, params={}, options={})
                 begin
 #                ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
@@ -25,6 +27,7 @@ module Appoxy
                 end
             end
 
+
             def post(method, params={}, options={})
                 begin
                     parse_response RestClient.post(url(method), add_params(method, params).to_json, headers)
@@ -36,6 +39,7 @@ module Appoxy
 
             end
 
+
             def put(method, body, options={})
                 begin
                     parse_response RestClient.put(url(method), add_params(method, body).to_json, headers)
@@ -46,21 +50,32 @@ module Appoxy
                 end
             end
 
+
+            def delete(method, params={}, options={})
+                begin
+                    parse_response RestClient.delete(append_params(url(method), add_params(method, params)))
+                rescue RestClient::BadRequest => ex
+                    raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+                end
+            end
+
+
             def url(command_path)
                 url = host + command_path
                 url
             end
 
+
             def add_params(command_path, hash)
                 ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-                # puts 'timestamp = ' + ts
-                sig = Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
-
-                extra_params = {'sigv'=>"0.1", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
+                #p "hash_to s" + command_path + Appoxy::Api::Signatures.hash_to_s(hash)
+                sig = Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
+                extra_params = {'sigv'=>"0.2", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
                 hash.merge!(extra_params)
 
             end
 
+
             def append_params(host, params)
                 host += "?"
                 i = 0
@@ -72,11 +87,13 @@ module Appoxy
                 return host
             end
 
+
             def headers
                 user_agent = "Appoxy API Ruby Client"
                 headers = {'User-Agent' => user_agent}
             end
 
+
             def parse_response(response)
                 begin
                     return ActiveSupport::JSON.decode(response.to_s)
@@ -90,4 +107,4 @@ module Appoxy
         end
 
     end
-end
+end

data/lib/api/signatures.rb

@@ -7,12 +7,20 @@ module Appoxy
                 return gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
             end
 
+
             def self.generate_signature(operation, timestamp, secret_key)
                 my_sha_hmac = Digest::HMAC.digest(operation + timestamp, secret_key, Digest::SHA1)
                 my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
                 return my_b64_hmac_digest
             end
 
+
+            def self.hash_to_s(hash)
+                str = ""
+                hash.each_pair {|key, value| str+= "#{key}#{value}" }
+                #removing all characters that could differ after parsing with rails
+                return str.delete "\"\/:{}[]\' T"
+            end
         end
     end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -07:00
+date: 2010-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,11 +50,12 @@ homepage: http://www.appoxy.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -61,6 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -70,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Appoxy API Helper gem