Download as
Browse Code »

Commit dc356d387f39b26cb8738db07af076f428cc2ae9

Authored by AntonioTerceiro
1 parent d31f0c9f
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem438: base URL must be SSL-aware 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2470 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 14 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @dc356d3
@@ -713,4 +713,8 @@ module ApplicationHelper @@ -713,4 +713,8 @@ module ApplicationHelper
713 url_for(options) 713 url_for(options)
714 end 714 end
715 715
  716 + def base_url
  717 + environment.top_url(request.ssl?)
  718 + end
  719 +
716 end 720 end
app/models/environment.rb
  Diff comments   View file @dc356d3
@@ -256,8 +256,9 @@ class Environment < ActiveRecord::Base @@ -256,8 +256,9 @@ class Environment < ActiveRecord::Base
256 end 256 end
257 end 257 end
258 258
259 - def top_url  
260 - result = "http://#{default_hostname}" 259 + def top_url(ssl = false)
  260 + protocol = (ssl ? 'https' : 'http')
  261 + result = "#{protocol}://#{default_hostname}"
261 if Noosfero.url_options.has_key?(:port) 262 if Noosfero.url_options.has_key?(:port)
262 result << ':' << Noosfero.url_options[:port].to_s 263 result << ':' << Noosfero.url_options[:port].to_s
263 end 264 end
app/views/layouts/application.rhtml
  Diff comments   View file @dc356d3
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <%# FIXME %> 50 <%# FIXME %>
51 <%= stylesheet_link_tag '/designs/icons/default/style.css' %> 51 <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
52 52
53 - <base href="<%= environment.top_url %>"/> 53 + <base href="<%= base_url %>"/>
54 </head> 54 </head>
55 55
56 <body class='noosfero category<%= category_color %><%= 56 <body class='noosfero category<%= category_color %><%=
test/unit/environment_test.rb
  Diff comments   View file @dc356d3
@@ -187,6 +187,12 @@ class EnvironmentTest &lt; Test::Unit::TestCase @@ -187,6 +187,12 @@ class EnvironmentTest &lt; Test::Unit::TestCase
187 assert_equal 'http://www.lalala.net:9999', env.top_url 187 assert_equal 'http://www.lalala.net:9999', env.top_url
188 end 188 end
189 189
  190 + should 'use https when asked for a ssl url' do
  191 + env = Environment.new
  192 + env.expects(:default_hostname).returns('www.lalala.net')
  193 + assert_equal 'https://www.lalala.net', env.top_url(true)
  194 + end
  195 +
190 should 'provide an approval_method setting' do 196 should 'provide an approval_method setting' do
191 env = Environment.new 197 env = Environment.new
192 198