Remove encryption

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-05-08 15:14:56 +03:00
parent 100d750bc5
commit f38ce01bc3
No known key found for this signature in database
GPG Key ID: 161B5D6A44D3D88A
4 changed files with 7 additions and 24 deletions

View File

@ -200,7 +200,6 @@ gem 'nprogress-rails'
gem 'request_store'
gem "virtus"
gem 'addressable'
gem 'simple_encrypt'
group :development do
gem 'brakeman', require: false

View File

@ -551,7 +551,6 @@ GEM
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
simple_encrypt (0.0.1)
simple_oauth (0.1.9)
simplecov (0.9.0)
docile (~> 1.1.0)
@ -775,7 +774,6 @@ DEPENDENCIES
settingslogic
shoulda-matchers (~> 2.7.0)
sidekiq (~> 3.3)
simple_encrypt
simplecov
sinatra
six

View File

@ -1,7 +1,5 @@
module VersionCheckHelper
def version_status_badge
if File.exists?(Rails.root.join('safe', 'public.pem'))
image_tag VersionCheck.new.url
end
image_tag VersionCheck.new.url
end
end

View File

@ -1,27 +1,15 @@
# This class is used to encrypt GitLab version and URL
# with public key when we send it to version.gitlab.com to
require "base64"
# This class is used to build image URL to
# check if it is a new version for update
class VersionCheck
include SimpleEncrypt
def public_key
public_key_file = Rails.root.join('safe', 'public.pem').to_s
File.read(public_key_file)
end
def data
{
version: Gitlab::VERSION,
url: Gitlab.config.gitlab.url
}
end
def encrypt(string)
encrypt_with_public_key(string, public_key)
{ version: Gitlab::VERSION }
end
def url
"#{host}?gitlab_info=#{encrypt(data.to_json)}"
encoded_data = Base64.urlsafe_encode64(data.to_json)
"#{host}?gitlab_info=#{encoded_data}"
end
def host