Ticket #11351: plugin_install_from_secure_repository.diff

railties/lib/commands/plugin.rb

@@ -893 +893 @@
-      if url =~ /^svn:\/\/.*/
-        `svn ls #{url}`.split("\n").map {|entry| "/#{entry}"} rescue nil
-      else
-
+, credentials(url)
-          links("", stream.read)
-        end rescue nil
-      end
@@ -938 +938 @@
-  def fetch_dir(url)
-    @level += 1
-    push_d(File.basename(url)) if @level > 0
-
+, credentials(url)
-      contents =  stream.read
-      fetch(links(url, contents))
-    end
-    pop_d if @level > 0
-    @level -= 1
-  end
+  
+  def credentials(url)
+    uri = URI.parse(url)
+    raise ArgumentError, 'url is not an HTTP URI' unless uri.is_a?(URI::HTTP)
+    
+    options = {}
+    if uri && uri.user
+      options[:http_basic_authentication] = [URI.unescape(uri.user), URI.unescape(uri.password)]
+    end
+    options
+  end
-end
-
-Commands::Plugin.parse!