Merge branch 'master' into feature/mastodon_api
This commit is contained in:
commit
11167e3e43
@ -1,9 +1,10 @@
|
||||
class WebKeyDirectoryController < WellKnownController
|
||||
before_action :allow_cross_origin_requests
|
||||
|
||||
# /.well-known/openpgpkey/hu/:hashed_username(.txt)
|
||||
# /.well-known/openpgpkey/hu/:hashed_username(.txt)?l=username
|
||||
def show
|
||||
@user = User.find_by(cn: params[:l].downcase)
|
||||
username = params[:l] || ""
|
||||
@user = User.find_by(cn: username.downcase)
|
||||
|
||||
if @user.nil? ||
|
||||
@user.pgp_pubkey.blank? ||
|
||||
|
@ -9,6 +9,13 @@ RSpec.describe "OpenPGP Web Key Directory", type: :request do
|
||||
end
|
||||
end
|
||||
|
||||
describe "omitted 'l' param" do
|
||||
it "returns a 404 status" do
|
||||
get "/.well-known/openpgpkey/hu/fmb8gw3n4zdj4xpwaziki4mwcxr1368i"
|
||||
expect(response).to have_http_status(:not_found)
|
||||
end
|
||||
end
|
||||
|
||||
describe "non-existent user" do
|
||||
it "returns a 404 status" do
|
||||
get "/.well-known/openpgpkey/hu/fmb8gw3n4zdj4xpwaziki4mwcxr1368i?l=aristotle"
|
||||
|
Loading…
x
Reference in New Issue
Block a user