github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 06:51:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request from GHSA-7cmh-wm9h-j63f

Browse Source
This commit is contained in:
David Taylor
2019-08-27 17:11:19 +01:00
committed by Jeff Atwood
parent 03d51d6519
commit 8e5a8d1d54
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -134,7 +134,10 @@ class Users::OmniauthCallbacksController < ApplicationController
user.email_tokens.create!(email: user.email)
end
user.activate
if !user.active || !user.email_confirmed?
user.password = SecureRandom.hex
user.activate
end
user.update!(registration_ip_address: request.remote_ip) if user.registration_ip_address.blank?
end