rename some config keys to clarify what they are

This commit is contained in:
Albert Yi
2016-11-28 17:28:47 -08:00
parent 428d4689d6
commit e7907e0e14
8 changed files with 30 additions and 30 deletions

View File

@@ -32,8 +32,8 @@ protected
response.headers["Access-Control-Allow-Origin"] = "*"
end
def require_shared_key
unless params[:key] == Danbooru.config.shared_remote_key
def require_reportbooru_key
unless params[:key] == Danbooru.config.reportbooru_key
render(text: "forbidden", status: 403)
return false
end

View File

@@ -1,6 +1,6 @@
class RelatedTagsController < ApplicationController
respond_to :json
before_filter :require_shared_key, only: [:update]
before_filter :require_reportbooru_key, only: [:update]
def show
@query = RelatedTagQuery.new(params[:query].to_s.downcase, params[:category])

View File

@@ -5,7 +5,7 @@ module PostsHelper
if params[:ms] == "1" && @post_set.post_count == 0 && @post_set.is_single_tag?
session_id = session.id
digest = OpenSSL::Digest.new("sha256")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, ",#{session_id}")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.reportbooru_key, ",#{session_id}")
return render("posts/partials/index/missed_search_count", session_id: session_id, sig: sig)
end
end
@@ -20,7 +20,7 @@ module PostsHelper
key = "ps-#{tags}"
value = session.id
digest = OpenSSL::Digest.new("sha256")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, "#{key},#{value}")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.reportbooru_key, "#{key},#{value}")
return render("posts/partials/index/search_count", key: key, value: value, sig: sig)
end
end
@@ -36,7 +36,7 @@ module PostsHelper
key = "uid"
value = user.id
digest = OpenSSL::Digest.new("sha256")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, "#{key},#{value}")
sig = OpenSSL::HMAC.hexdigest(digest, Danbooru.config.reportbooru_key, "#{key},#{value}")
render("users/common_searches", user: user, sig: sig)
end

View File

@@ -6,7 +6,7 @@ class MissedSearchService
def fetch_data
Cache.get("ms", 1.minute) do
url = URI.parse("#{Danbooru.config.report_server}/missed_searches")
url = URI.parse("#{Danbooru.config.reportbooru_server}/missed_searches")
response = ""
Net::HTTP.start(url.host, url.port, :use_ssl => url.is_a?(URI::HTTPS)) do |http|
http.read_timeout = 1

View File

@@ -15,7 +15,7 @@ class PopularSearchService
dates = date.strftime("%Y-%m-%d")
Cache.get("ps-#{scale}-#{dates}", 1.minute) do
url = URI.parse("#{Danbooru.config.report_server}/hits/#{scale}?date=#{dates}")
url = URI.parse("#{Danbooru.config.reportbooru_server}/hits/#{scale}?date=#{dates}")
response = ""
Net::HTTP.start(url.host, url.port, :use_ssl => url.is_a?(URI::HTTPS)) do |http|
http.read_timeout = 1

View File

@@ -20,7 +20,7 @@ module Reports
def generate_sig
digest = OpenSSL::Digest.new("sha256")
OpenSSL::HMAC.hexdigest(digest, Danbooru.config.shared_remote_key, "#{min_date},#{max_date},#{queries}")
OpenSSL::HMAC.hexdigest(digest, Danbooru.config.reportbooru_key, "#{min_date},#{max_date},#{queries}")
end
end
end

View File

@@ -24,13 +24,13 @@ module Reports
end
def fetch_similar_user_ids(endpoint = "user_similarity")
return NotImplementedError unless Danbooru.config.report_server
return NotImplementedError unless Danbooru.config.reportbooru_server
params = {
"key" => Danbooru.config.shared_remote_key,
"key" => Danbooru.config.reportbooru_key,
"user_id" => user_id
}
uri = URI.parse("#{Danbooru.config.report_server}/reports/#{endpoint}")
uri = URI.parse("#{Danbooru.config.reportbooru_server}/reports/#{endpoint}")
uri.query = URI.encode_www_form(params)
Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.is_a?(URI::HTTPS)) do |http|