Auto merge of #1779 - rubygems:fix_cert_invalid_email, r=bronzdoc

Raise error if the email is invalid when building cert

closes #1777

lib/rubygems/commands/cert_command.rb

@@ -110,16 +110,20 @@ def execute
       list_certificates_matching filter
     end
 
-    options[:build].each do |name|
-      build name
+    options[:build].each do |email|
+      build email
     end
 
     sign_certificates unless options[:sign].empty?
   end
 
-  def build name
+  def build email
+    if !valid_email?(email)
+      raise Gem::CommandLineError, "Invalid email address #{email}"
+    end
+
     key, key_path = build_key
-    cert_path = build_cert name, key
+    cert_path = build_cert email, key
 
     say "Certificate: #{cert_path}"
 
@@ -129,7 +133,7 @@ def build name
     end
   end
 
-  def build_cert name, key # :nodoc:
+  def build_cert email, key # :nodoc:
     expiration_length_days = options[:expiration_length_days]
     age =
       if expiration_length_days.nil? || expiration_length_days == 0
@@ -138,7 +142,7 @@ def build_cert name, key # :nodoc:
         Gem::Security::ONE_DAY * expiration_length_days
       end
 
-    cert = Gem::Security.create_cert_email name, key, age
+    cert = Gem::Security.create_cert_email email, key, age
     Gem::Security.write cert, "gem-public_cert.pem"
   end
 
@@ -286,5 +290,13 @@ def sign_certificates # :nodoc:
     end
   end
 
+  private
+
+  def valid_email? email
+    # It's simple, but is all we need
+    email =~ /\A.+@.+\z/
+  end
+
+
 end if defined?(OpenSSL::SSL)
 

test/rubygems/test_gem_commands_cert_command.rb

@@ -130,6 +130,28 @@ def test_execute_build
     assert_path_exists File.join(@tempdir, 'gem-public_cert.pem')
   end
 
+  def test_execute_build_bad_email_address
+    passphrase = 'Foo bar'
+    email = "nobody@"
+
+    @cmd.handle_options %W[--build #{email}]
+
+    @build_ui = Gem::MockGemUi.new "#{passphrase}\n#{passphrase}"
+
+    use_ui @build_ui do
+
+      e = assert_raises Gem::CommandLineError do
+        @cmd.execute
+      end
+
+      assert_equal "Invalid email address #{email}",
+        e.message
+
+      refute_path_exists File.join(@tempdir, 'gem-private_key.pem')
+      refute_path_exists File.join(@tempdir, 'gem-public_cert.pem')
+    end
+  end
+
   def test_execute_build_expiration_days
     passphrase = 'Foo bar'