github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 23:28:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

OpenID Connect: ensure consistent issuer URL

Browse Source 
root_url does not know the right protocol in all contexts,
some clients are strict when validating this.
This commit is contained in:
Jonne Haß
2020-10-24 22:30:43 +02:00
parent d27cd175df
commit 0aba20f85c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/openid_connect/discovery_controller.rb
View File

@@ -28,7 +28,7 @@ module Api
class DiscoveryController < ApplicationController class DiscoveryController < ApplicationController
def configuration def configuration
render json: OpenIDConnect::Discovery::Provider::Config::Response.new( render json: OpenIDConnect::Discovery::Provider::Config::Response.new(
issuer: root_url, issuer: AppConfig.environment.url,
registration_endpoint: api_openid_connect_clients_url, registration_endpoint: api_openid_connect_clients_url,
authorization_endpoint: new_api_openid_connect_authorization_url, authorization_endpoint: new_api_openid_connect_authorization_url,
token_endpoint: api_openid_connect_access_tokens_url, token_endpoint: api_openid_connect_access_tokens_url,

2
lib/api/openid_connect/id_token.rb
View File

@@ -53,7 +53,7 @@ module Api
def claims def claims
sub = build_sub sub = build_sub
@claims ||= { @claims ||= {
iss: Rails.application.routes.url_helpers.root_url, iss: AppConfig.environment.url,
sub: sub, sub: sub,
aud: @authorization.o_auth_application.client_id, aud: @authorization.o_auth_application.client_id,
exp: @expires_at.to_i, exp: @expires_at.to_i,

2
spec/controllers/api/openid_connect/discovery_controller_spec.rb
View File

@@ -8,7 +8,7 @@ describe Api::OpenidConnect::DiscoveryController, type: :controller do
it "should have the issuer as the root url" do it "should have the issuer as the root url" do
json_body = JSON.parse(response.body) json_body = JSON.parse(response.body)
expect(json_body["issuer"]).to eq(root_url) expect(json_body["issuer"]).to eq(AppConfig.environment.url)
end end
it "should have the appropriate user info endpoint" do it "should have the appropriate user info endpoint" do