tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Keybase verification using wrong domain for remote accounts (#10547)

Browse Source
This commit is contained in:
Eugen Rochko
2019-04-10 20:28:43 +02:00
committed by GitHub
parent 793b0513eb
commit a9f130b8d8
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/proof_provider/keybase.rb
View File

@@ -2,7 +2,7 @@
class ProofProvider::Keybase
BASE_URL = ENV.fetch('KEYBASE_BASE_URL', 'https://keybase.io')
DOMAIN = ENV.fetch('KEYBASE_DOMAIN', Rails.configuration.x.local_domain)
DOMAIN = ENV.fetch('KEYBASE_DOMAIN', Rails.configuration.x.local_domain)
class Error < StandardError; end
@@ -50,12 +50,20 @@ class ProofProvider::Keybase
end
def badge
@badge ||= ProofProvider::Keybase::Badge.new(@proof.account.username, @proof.provider_username, @proof.token)
@badge ||= ProofProvider::Keybase::Badge.new(@proof.account.username, @proof.provider_username, @proof.token, domain)
end
def verifier
@verifier ||= ProofProvider::Keybase::Verifier.new(@proof.account.username, @proof.provider_username, @proof.token, domain)
end
private
def verifier
@verifier ||= ProofProvider::Keybase::Verifier.new(@proof.account.username, @proof.provider_username, @proof.token)
def domain
if @proof.account.local?
DOMAIN
else
@proof.account.domain
end
end
end