Bug 924633 - now dealing with empty certificate and private key files

adellape · Mar 27, 2013 · 61c9560 · 61c9560
1 parent c1e83d0
commit 61c9560
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/lib/rhc/commands/alias.rb b/lib/rhc/commands/alias.rb
@@ -61,7 +61,10 @@ def update_cert(app, app_alias)
       raise ArgumentError, "Private key file not found: #{private_key_file_path}" if !File.exist?(private_key_file_path) || !File.file?(private_key_file_path)
 
       certificate_content = File.read(certificate_file_path)
+      raise ArgumentError, "Invalid certificate file: #{certificate_file_path} is empty" if certificate_content.to_s.strip.length == 0
+
       private_key_content = File.read(private_key_file_path)
+      raise ArgumentError, "Invalid private key file: #{private_key_file_path} is empty" if private_key_content.to_s.strip.length == 0
 
       rest_app = rest_client.find_application(options.namespace, app)
       rest_alias = rest_app.find_alias(app_alias)

diff --git a/lib/rhc/rest/alias.rb b/lib/rhc/rest/alias.rb
@@ -19,7 +19,7 @@ def destroy
       def add_certificate(ssl_certificate_content, private_key_content, pass_phrase)
         debug "Running add_certificate for alias #{@id}"
         if (client.api_version_negotiated >= 1.4)
-          rest_method "UPDATE", {
+          foo = rest_method "UPDATE", {
             :ssl_certificate => ssl_certificate_content, 
             :private_key => private_key_content, 
             :pass_phrase => pass_phrase

diff --git a/spec/rhc/assets/empty.txt b/spec/rhc/assets/empty.txt
diff --git a/spec/rhc/commands/alias_spec.rb b/spec/rhc/commands/alias_spec.rb
@@ -214,6 +214,20 @@
       it { expect { run }.should exit_with_code(1) }
       it { run_output.should =~ /The server does not support SSL certificates for custom aliases/m }
     end
+    context 'invalid certificate file (empty)' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/empty.txt', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Invalid certificate file/m }
+    end
+    context 'invalid private key file (empty)' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/empty.txt', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Invalid private key file/m }
+    end
   end
 
   describe 'alias delete-cert' do