Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed: auto revoke sessions after password reset

Damian Legawiec8ff9fa0a4b99
diff --git a/spree/api/app/controllers/spree/api/v3/admin/password_resets_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/password_resets_controller.rb
index 0bedca488a..5c1ba8da98 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/password_resets_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/password_resets_controller.rb
@@ -55,6 +55,11 @@ module Spree
if user.update(password: params[:password], password_confirmation: params[:password_confirmation])
user.publish_event('admin_user.password_reset')
+ # A password reset must kill every existing session — a stolen
+ # refresh token must not survive the victim resetting their
+ # password. Revoke first, then mint the fresh token for this
+ # browser (the auto-sign-in below).
+ Spree::RefreshToken.revoke_all_for(user)
refresh_token = Spree::RefreshToken.create_for(user, request_env: request_env_for_token)
set_refresh_cookie(refresh_token)
diff --git a/spree/api/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb b/spree/api/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb
index 7f5cd108bd..9f76905f2d 100644
--- a/spree/api/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb
@@ -56,6 +56,9 @@ module Spree
if user.update(password: params[:password], password_confirmation: params[:password_confirmation])
jwt = generate_jwt(user)
+ # Kill every existing session before minting the new one —
+ # a stolen refresh token must not survive a password reset.
+ Spree::RefreshToken.revoke_all_for(user)
refresh_token = Spree::RefreshToken.create_for(user, request_env: { ip_address: request.remote_ip, user_agent: request.user_agent&.truncate(255) })
user.publish_event('customer.password_reset')
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/password_resets_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/password_resets_controller_spec.rb
index 20f296976e..28cf25aaab 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/password_resets_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/password_resets_controller_spec.rb
@@ -56,6 +56,17 @@ RSpec.describe Spree::Api::V3::Admin::PasswordResetsController, type: :controlle
expect(admin_user.reload.valid_password?('new-secret-123')).to be(true)
end
+ it 'revokes every pre-existing session, keeping only the fresh one' do
+ stolen_token = Spree::RefreshToken.create_for(admin_user, request_env: {})
+ token = admin_user.generate_token_for(:password_reset)
+
+ patch :update, params: { id: token, password: 'new-secret-123', password_confirmation: 'new-secret-123' }
+
+ expect(response).to have_http_status(:ok)
+ expect(Spree::RefreshToken.exists?(stolen_token.id)).to be(false)
+ expect(Spree::RefreshToken.where(user: admin_user).count).to eq(1)
+ end
+
it 'rejects an invalid token' do
patch :update, params: { id: 'bogus', password: 'new-secret-123', password_confirmation: 'new-secret-123' }
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
index 53cfd72b65..4cba9bdfd3 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customer/password_resets_controller_spec.rb
@@ -111,6 +111,20 @@ RSpec.describe Spree::Api::V3::Store::Customer::PasswordResetsController, type:
expect(json_response['user']['email']).to eq(user.email)
end
+ it 'revokes every pre-existing session, keeping only the fresh one' do
+ stolen_token = Spree::RefreshToken.create_for(user, request_env: {})
+
+ patch :update, params: {
+ id: reset_token,
+ password: 'newsecurepassword',
+ password_confirmation: 'newsecurepassword'
+ }
+
+ expect(response).to have_http_status(:ok)
+ expect(Spree::RefreshToken.exists?(stolen_token.id)).to be(false)
+ expect(Spree::RefreshToken.where(user: user).count).to eq(1)
+ end
+
it 'publishes customer.password_reset event' do
expect_any_instance_of(Spree.user_class).to receive(:publish_event)
.with('customer.password_reset')