mirror of
https://github.com/discourse/discourse.git
synced 2025-03-04 18:29:20 +00:00
FIX: increase secure session for OAuth expiration time (#27674)
By default, secure sessions expire after 1 hour. For OAuth authentication it should expire at the same time when the authentication cookie expires - `SiteSetting.maximum_session_age.hours`. It is possible that the forum will not have persistent sessions, based on `persistent_sessions` site setting. In that case, with next username and password authentication we need to reset information about OAuth. Bug introduced in this PR - https://github.com/discourse/discourse/pull/27547
This commit is contained in:
parent
592b5ceed1
commit
a1d2c46d28
@ -370,6 +370,7 @@ class SessionController < ApplicationController
|
||||
return render(json: @second_factor_failure_payload) if !second_factor_auth_result.ok
|
||||
|
||||
if user.active && user.email_confirmed?
|
||||
secure_session["oauth"] = false if !SiteSetting.persistent_sessions
|
||||
login(user, second_factor_auth_result)
|
||||
else
|
||||
not_activated(user)
|
||||
|
@ -86,7 +86,7 @@ class Users::OmniauthCallbacksController < ApplicationController
|
||||
|
||||
cookies["_bypass_cache"] = true
|
||||
cookies[:authentication_data] = { value: client_hash.to_json, path: Discourse.base_path("/") }
|
||||
secure_session["oauth"] = true
|
||||
secure_session.set("oauth", true, expires: SiteSetting.maximum_session_age.hours)
|
||||
redirect_to @origin
|
||||
end
|
||||
|
||||
|
@ -237,6 +237,10 @@ RSpec.describe Users::OmniauthCallbacksController do
|
||||
expect(data["can_edit_username"]).to eq(true)
|
||||
expect(data["destination_url"]).to eq(destination_url)
|
||||
expect(read_secure_session["oauth"]).to eq("true")
|
||||
expect(Discourse.redis.ttl("#{session[:secure_session_id]}oauth")).to be_between(
|
||||
SiteSetting.maximum_session_age.hours.seconds - 10,
|
||||
SiteSetting.maximum_session_age.hours.seconds,
|
||||
)
|
||||
end
|
||||
|
||||
it "should return the right response for staged users" do
|
||||
|
Loading…
x
Reference in New Issue
Block a user