jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove controller-level force_ssl checks.

Browse Source 
Obsoleted by force_ssl being globally enabled by default.
This commit is contained in:
evazion
2018-01-28 19:59:39 -06:00
parent c50ad41792
commit d70a0a64bd
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@@ -11,7 +11,6 @@ class ApplicationController < ActionController::Base
before_action :set_safe_mode before_action :set_safe_mode
# before_action :secure_cookies_check # before_action :secure_cookies_check
layout "default" layout "default"
force_ssl :if => :ssl_login?
helper_method :show_moderation_notice? helper_method :show_moderation_notice?
before_action :enable_cors before_action :enable_cors
@@ -32,10 +31,6 @@ class ApplicationController < ActionController::Base
CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 20.hours.ago) CurrentUser.can_approve_posts? && (cookies[:moderated].blank? || Time.at(cookies[:moderated].to_i) < 20.hours.ago)
end end
def ssl_login?
cookies[:ssl_login].present?
end
def enable_cors def enable_cors
response.headers["Access-Control-Allow-Origin"] = "*" response.headers["Access-Control-Allow-Origin"] = "*"
end end

5
app/controllers/user_upgrades_controller.rb
View File

@@ -1,7 +1,6 @@
class UserUpgradesController < ApplicationController class UserUpgradesController < ApplicationController
before_action :member_only, :only => [:new, :show] before_action :member_only, :only => [:new, :show]
helper_method :user helper_method :user
force_ssl :if => :ssl_enabled?
skip_before_action :verify_authenticity_token, only: [:create] skip_before_action :verify_authenticity_token, only: [:create]
def create def create
@@ -57,8 +56,4 @@ class UserUpgradesController < ApplicationController
redirect_to user_upgrade_path redirect_to user_upgrade_path
end end
def ssl_enabled?
!Rails.env.development? && !Rails.env.test?
end
end end

8
app/logical/session_creator.rb
View File

@@ -28,14 +28,6 @@ class SessionCreator
} }
end end
if secure
cookies.permanent[:ssl_login] = {
:value => "1",
:secure => true,
:httponly => true
}
end
session[:user_id] = user.id session[:user_id] = user.id
user.update_column(:last_ip_addr, ip_addr) user.update_column(:last_ip_addr, ip_addr)
return true return true