stuartpreston-azure-sdk-for-ruby 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79011371187700f252d099c2dba1361b7f578111
-  data.tar.gz: 46bcd38a6c7e472619b6d901e521439ae8a2268e
+  metadata.gz: 74ffefba6eece817b30916acf39b2bf18cc2170e
+  data.tar.gz: cdebe9e5766d715c901f05b26e611a219e365182
 SHA512:
-  metadata.gz: 87a9c90eb7bc23b5b233472cb707c4feab18fdfff8e57dd2cbbed83f385e49b53ae1bd825b2a006d46e0dafc2a40da053df51544c484ac054520ff781c0a8b80
-  data.tar.gz: cec3895e035c7313890b8cde60bcf55cc09cc7e564a20d09b5259ab6e349d66805c6697a0403eac29461bd9d6446c6d3dab63f4769df2770b401b61e105b51c2
+  metadata.gz: 52e659246d3574a55b42fa5e221530578f2f03ffb6ace5dd3760fabf1609a7fedac5c92f3b436d7ae0eb0835ef4d5aee03fb503ce2d9133b1703d0c436e1eade
+  data.tar.gz: de1968be02983c26defdfd3341765b4155d09282a6e6352a24133e26d640d0423e538aeb1d0ee3acf7eb80d9314b21b669f3316d478de96cd9549dfdfed558b2

data/ChangeLog.txt

@@ -1,3 +1,9 @@
+2014.03.30 - version 0.6.9 (stuartpreston-azure-sdk-for-ruby) 
+* Implement fixes for regression issues with filename handling
+
+2014.03.29 - version 0.6.8 (stuartpreston-azure-sdk-for-ruby)
+* Support for accepting certificates in memory (@jkeiser)
+
 2014.03.12 - version 0.6.7 (stuartpreston-azure-sdk-for-ruby)
 * Support for .pfx and .publishsettings as certificate sources
 

data/README.md

@@ -1,10 +1,15 @@
-# Microsoft Azure SDK for Ruby
-## Fork taken February 2015 as no official release since May 2014.
+# Microsoft Azure SDK for Ruby (gem: stuartpreston-azure-sdk-for-ruby)
+This is a fork of the 'official' Azure SDK for Ruby which was taken in February 2015 due to there being no official releases since May 2014.
+
 [![Build Status](https://travis-ci.org/stuartpreston/azure-sdk-for-ruby.png?branch=master)](https://travis-ci.org/stuartpreston/azure-sdk-for-ruby)
 
+Please view the [changelog](changelog.txt) for an up to date list of what is supported.
 
+### 
 This project provides a Ruby package that makes it easy to access and manage Microsoft Azure Services like Storage, Service Bus and Virtual Machines.
 
+This package accesses the Microsoft Azure Service Management API, and ***not*** the Microsoft Azure Resource Management API.
+
 # Library Features
 * Storage
     * Blobs
@@ -51,11 +56,8 @@ This project provides a Ruby package that makes it easy to access and manage Mic
 
 # Supported Ruby Versions
 
-* Ruby 1.9.3
 * Ruby 2.0
 
-**Notice** that Ruby 2.0 x64 on Windows is not supported due to the [lack of nokogiri](https://github.com/sparklemotion/nokogiri/issues/864).
-
 # Getting Started
 
 ## Install the rubygem package
@@ -71,7 +73,7 @@ gem install azure
 To get the source code of the SDK via **git** just type:
 
 ```bash
-git clone https://github.com/Azure/azure-sdk-for-ruby.git
+git clone https://github.com/stuartpreston/azure-sdk-for-ruby.git
 cd ./azure-sdk-for-ruby
 ```
 Then, run bundler to install all the gem dependencies:
@@ -519,7 +521,7 @@ base_management_service.get_affinity_group('affinity-group-name')
 require 'azure'
 
 Azure.configure do |config|
-  config.management_certificate = "path to *.pem or *.pfx file"
+  config.management_certificate = "path to .pem, .pfx or .publishsettings file"
   config.subscription_id        = "your subscription id"
   config.management_endpoint    = "https://management.database.windows.net:8443/"
 #To access other service management apis use "https://management.core.windows.net".
@@ -589,7 +591,7 @@ vnet.set_network_configuration(vnetxml)
 
 # Useful commands for certificate operations
 
-Currently the sdk supports *.pem or *.pfx (passwordless pfx) for service management operations. Following are the steps discussed on various cert operations.
+Currently the sdk supports .pem, .pfx or .publishsettings for service management operations. Following are the steps discussed on various cert operations.
 
 * To create pfx, simply download the publishsettings file for your subscription, copy the contents of Management Certificate from the publishsettings and save it in a file and name the file as your cert.pfx. This pfx will be a passwordless pfx which can be supplied as a cert parameter for Service Management Commands
 * Using the following openssl commands to extract the pem file and pass the pem file as management cert parameter.
@@ -607,7 +609,7 @@ Be sure to check out the Microsoft Azure [Developer Forums on Stack Overflow and
 # Contribute Code or Provide Feedback
 
 If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
-If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-ruby/issues) section of the project.
+If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/stuartpreston/azure-sdk-for-ruby/issues) section of the project.
 
 # Learn More
 

data/lib/azure/base_management/base_management_service.rb

@@ -31,38 +31,7 @@ module Azure
     class BaseManagementService
       def initialize
         validate_configuration
-        cert_file = nil
-        begin
-          if Azure.config.management_certificate =~ /(pem)$/
-            cert_file = File.read(Azure.config.management_certificate)
-            certificate_key = OpenSSL::X509::Certificate.new(cert_file)
-            private_key = OpenSSL::PKey::RSA.new(cert_file)
-          elsif Azure.config.management_certificate =~ /(pfx)$/
-            # Parse pfx content
-            File.open(Azure.config.management_certificate, "rb") do |f|
-                cert_file = f.read
-            end
-            cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert_file))
-            certificate_key = OpenSSL::X509::Certificate.new(
-              cert_content.certificate.to_pem
-            )
-            private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
-          elsif Azure.config.management_certificate =~ /(publishsettings)$/
-            # Parse publishsettings content
-            publish_settings = Nokogiri::XML(File.open(Azure.config.management_certificate, "r"))
-            subscription_id = Azure.config.subscription_id
-            xpath = "//PublishData/PublishProfile/Subscription[@Id='#{subscription_id}']/@ManagementCertificate"
-            cert_file = publish_settings.xpath(xpath).text
-            cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert_file))
-            certificate_key = OpenSSL::X509::Certificate.new(
-              cert_content.certificate.to_pem
-            )
-            private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
-          end
-        rescue Exception => e
-          raise "Management certificate not valid. Error: #{e.message}"
-        end
-
+        certificate_key, private_key = read_management_certificate(Azure.config.management_certificate)
         Azure.configure do |config|
           config.http_certificate_key = certificate_key
           config.http_private_key = private_key
@@ -79,12 +48,43 @@ module Azure
         raise error_message if m_ep.nil? || m_ep.empty?
 
         m_cert = Azure.config.management_certificate
-        error_message = "Could not read from file '#{m_cert}'."
-        raise error_message unless test('r', m_cert)
+        if m_cert.is_a?(Hash)
+           error_message = "Management certificate hash #{m_cert} does not have key :type!  If specifying a hash, you must specify :type => <:pem, :pfx or :publishsettings>!"
+           raise error_message unless m_cert.has_key?(:type) && %w(pem pfx publishsettings).include?(m_cert[:type].to_s)
+
+           error_message = "Management certificate hash #{m_cert} does not have the certificate data!  If specifying a hash, you must specify either :data => String, :io => <IO object> or :path => <path>!"
+           raise error_message unless [ :data, :io, :path ].any? { |k| m_cert.has_key?(k) }
+
+           unexpected_keys = m_cert.keys - [ :type, :data, :io, :path ]
+           error_message = "Management certificate hash #{m_cert} has unexpected keys #{unexpected_keys.join(", ")}!  Only :type, :data, :io and :path are accepted values when specifying a hash."
+           raise error_message unless unexpected_keys.empty?
+
+           if m_cert[:data]
+             error_message= "Management certificate :data in #{m_cert} is not a String!  Must be a String."
+             raise error_message unless m_cert[:data].is_a?(String)
+           end
+           if m_cert[:io]
+             error_message= "Management certificate :io in #{m_cert} is not an IO object!  Must be an IO object."
+             raise error_message unless m_cert[:io].is_a?(IO)
+           end
+           if m_cert[:path]
+             error_message= "Management certificate :path in #{m_cert} is not a String!  Must be a String."
+             raise error_message unless m_cert[:path].is_a?(String)
+             unless m_cert[:data] || m_cert[:io] # :path is only used to print information out if data or IO is there
+               error_message = "Could not read from file '#{m_cert[:path]}'."
+               raise error_message unless test('r', m_cert[:data])
+             end
+           end
+
+        else
+           m_cert_ext = File.extname(m_cert)
+           error_message = "Management certificate path '#{m_cert}' must have extension .pem, .pfx or .publishsettings"
+           raise error_message unless %w(.pem .pfx .publishsettings).include?(m_cert_ext)
+
+           error_message = "Could not read from file '#{m_cert}'."
+           raise error_message unless test('r', m_cert)
+        end
 
-        m_cert = Azure.config.management_certificate
-        error_message = 'Management certificate expects a .pem, .pfx or .publishsettings file.'
-        raise error_message unless m_cert =~ /(pem|pfx|publishsettings)$/
       end
 
       # Public: Gets a list of regional data center locations from the server
@@ -244,6 +244,61 @@ module Azure
           raise error
         end
       end
+
+      def read_management_certificate(cert)
+        cert_file = nil
+        begin
+          # If it's a String, the type is the extension (.pem, .pfx, .publishsettings)
+          if cert.is_a?(String)
+            cert = {
+              type: File.extname(cert).split('.').last,
+              path: cert
+            }
+          end
+
+          case cert[:type].to_sym
+          when :pem
+            read_pem(cert)
+          when :pfx
+            read_pfx(cert)
+          when :publishsettings
+            read_publishsettings(cert)
+          else
+            raise ArgumentError, "Unknown type #{type} on Azure.config.management_certificate #{cert}"
+          end
+        end
+      end
+
+      def read_pem(cert)
+        cert[:data] ||= cert[:io] ? cert[:io].read : File.open(cert[:path], "r") { |f| f.read }
+
+        certificate_key = OpenSSL::X509::Certificate.new(cert[:data])
+        private_key = OpenSSL::PKey::RSA.new(cert[:data])
+        [ certificate_key, private_key ]
+      end
+
+      def read_pfx(cert)
+        cert[:data] ||= cert[:io] ? cert[:io].read : File.open(cert[:path], "rb") { |f| f.read }
+
+        cert_content = OpenSSL::PKCS12.new(Base64.decode64(cert[:data]))
+        certificate_key = OpenSSL::X509::Certificate.new(
+          cert_content.certificate.to_pem
+        )
+        private_key = OpenSSL::PKey::RSA.new(cert_content.key.to_pem)
+        [ certificate_key, private_key ]
+      end
+
+      def read_publishsettings(cert)
+        cert[:io] ||= cert[:data] ? StringIO.new(cert[:data]) : File.open(cert[:path], "r")
+
+        # Parse publishsettings content
+        publish_settings = Nokogiri::XML(cert[:io])
+        subscription_id = Azure.config.subscription_id
+        xpath = "//PublishData/PublishProfile/Subscription[@Id='#{subscription_id}']/@ManagementCertificate"
+        cert_file = publish_settings.xpath(xpath).text
+
+        read_pfx(data: cert_file, path: cert[:path])
+      end
     end
   end
-end
+end

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 7 unless defined? UPDATE
+    UPDATE = 9 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stuartpreston-azure-sdk-for-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri