ec2-signature 0.0.2 → 0.0.4

data/README

@@ -9,23 +9,21 @@ This gem will simply generate the AWS EC2 signature so that you can use your own
 require 'ec2-signature'
 # pass a hash containing your aws auth params to new obj
 mysig = EC2Signature.new( {
-            :access_id => ,
-            :secret_key => ,
-            :ec2_url => 'http://myec2server:8773/services/Cloud'
+            :awsaccessid => 'abcde12345fiow13jlaf1',
+            :awssecretkey => '1380adj13j43jklj32a',
+            :ec2url => 'http://myec2server:8773/services/Cloud'
           } )
 # generate the signature provided the query action you want to issue to your ec2 provider
-signature = mysig.sign( {'Action' => 'DescribeImages'} )
+mysig.sign 'DescribeImages'
+signature = mysig.signature
 # use the example net/http post method to post your signature to the ec2_url specified above
-mysig.post signature
+mysig.submit 
 
 
 ##############################
 ####  OpenStack Example 2 ####
 ##############################
-mysig.path = '/services/Admin'
 # opennebula's aws/ec2 api implementation has a diff path for admin cmds
-signature = mysig.sign( {
-                'Action' => 'DescribeUser', 
-                'Name' => 'jsmith',
-              } )
-mysig.post signature
+mysig.path = '/services/Admin'
+signature = mysig.sign 'DescribeUser', {'Name' => 'jsmith', }
+mysig.submit

data/ec2-signature.gemspec

@@ -4,7 +4,7 @@ require "ec2-signature/version"
 
 Gem::Specification.new do |s|
   s.name        = "ec2-signature"
-  s.version     = Ec2::Signature::VERSION
+  s.version     = EC2::Signature::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["John Tran"]
   s.email       = ["jtran@attinteractive.com"]

data/lib/ec2-signature.rb

@@ -3,18 +3,19 @@ require 'openssl'
 require 'base64'
 require 'cgi'
 
-class Ec2Signature
+class EC2Signature
 
-  attr_accessor :accessid, :secretkey, :ec2url, :host, :port, :path, :scheme, :method
+  attr_accessor :awsaccessid, :awssecretkey, :ec2url, :host, :port, :path, :scheme, :method, :project
+  attr_accessor :signature
 
   def initialize creds, method='POST'
     raise "Need a hash of AWS/EC2 credential info" unless creds.kind_of? Hash
-    [:accessid, :secretkey, :ec2url].each do |a| 
-      raise "Credential hash requires :accessid, :secretkey & :ec2url" unless creds[a]
+    [:awsaccessid, :awssecretkey, :ec2url].each do |a| 
+      raise "Credential hash requires :awsaccessid, :awssecretkey & :ec2url" unless creds[a]
     end
     raise "Method can only be 'GET' or 'POST'" unless ['GET','POST'].include? method
-    self.accessid = creds[:accessid]
-    self.secretkey = creds[:secretkey]
+    self.awsaccessid = creds[:awsaccessid]
+    self.awssecretkey = creds[:awssecretkey]
     self.ec2url = creds[:ec2url]
     uri = URI.parse creds[:ec2url]
     self.host = uri.host
@@ -24,12 +25,13 @@ class Ec2Signature
     self.method = method
   end
 
-  def sign actionparams={'Action'=>'DescribeInstances'}
-    raise "hash of AWS EC2 web params action required" unless actionparams.kind_of? Hash
-    raise "hash missing 'Action' key/value"  unless actionparams['Action']
-
+  def sign action='DescribeInstances', actionparams={}
+    raise 'actionparams needs to be a Hash' unless actionparams.kind_of?(Hash)
+    # openstack requires project names added to end of awssecretkey to change project context
+    newaccessid = ( project ? awsaccessid+':'+project : awsaccessid )
     actionparams.merge!({
-      'AWSAccessKeyId'    => accessid,
+      'Action'            => action,
+      'AWSAccessKeyId'    => newaccessid,
       'SignatureMethod'   => 'HmacSHA256',
       'SignatureVersion'  => '2',
       'Timestamp'         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
@@ -44,17 +46,17 @@ class Ec2Signature
     end
     string_to_sign = "#{method}\n#{host}:#{port}\n#{path}\n" << body.chop
     digest = OpenSSL::Digest::Digest.new('sha256')
-    signed_string = OpenSSL::HMAC.digest(digest, secretkey, string_to_sign)
+    signed_string = OpenSSL::HMAC.digest(digest, awssecretkey, string_to_sign)
     body << "Signature=#{CGI.escape(Base64.encode64(signed_string).chomp!).gsub(/\+/, '%20')}"
-
-    body
+    self.signature = body
+    self
   end
 
-  def submit signature=sign
+  def submit signature=signature
     require 'net/http'
     http = Net::HTTP.new host, port
     resp = case method
-      when 'GET' then http.get path.concat('?'+signature)
+      when 'GET' then http.get path+'?'+signature
       when 'POST' then http.post path, signature
     end
     resp.body

data/lib/ec2-signature/version.rb

@@ -1,5 +1,5 @@
-module Ec2
+module EC2
   module Signature
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - John Tran
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -08:00
+date: 2011-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: []