pundit: convert emails to pundit.

app/controllers/emails_controller.rb

@@ -1,24 +1,18 @@
 class EmailsController < ApplicationController
-  before_action :member_only
   respond_to :html, :xml, :json
 
   def show
-    @user = User.find(params[:user_id])
+    @email_address = authorize EmailAddress.find_by_user_id!(params[:user_id])
-    check_privilege(@user)
+    respond_with(@email_address)
-
-    respond_with(@user.email_address)
   end
 
   def edit
-    @user = User.find(params[:user_id])
+    @user = authorize User.find(params[:user_id]), policy_class: EmailAddressPolicy
-    check_privilege(@user)
-
     respond_with(@user)
   end
 
   def update
-    @user = User.find(params[:user_id])
+    @user = authorize User.find(params[:user_id]), policy_class: EmailAddressPolicy
-    check_privilege(@user)
 
     if User.authenticate(@user.name, params[:user][:password])
       @user.update(email_address_attributes: { address: params[:user][:email] })
@@ -37,17 +31,10 @@ class EmailsController < ApplicationController
   end
 
   def verify
-    email_id = Danbooru::MessageVerifier.new(:email_verification_key).verify(params[:email_verification_key])
+    @email_address = authorize EmailAddress.find_by_user_id!(params[:user_id])
-    @email_address = EmailAddress.find(email_id)
     @email_address.update!(is_verified: true)
 
     flash[:notice] = "Email address verified"
     redirect_to @email_address.user
   end
-
-  private
-
-  def check_privilege(user)
-    raise User::PrivilegeError unless user.id == CurrentUser.id || CurrentUser.is_admin?
-  end
 end

app/helpers/users_helper.rb

@@ -15,4 +15,8 @@ module UsersHelper
     verifier = ActiveSupport::MessageVerifier.new(Danbooru.config.email_key, serializer: JSON, digest: "SHA256")
     verifier.generate(user.id.to_s)
   end
+
+  def email_verification_url(user)
+    verify_user_email_url(user, email_verification_key: user.email_address.verification_key)
+  end
 end

app/models/email_address.rb

@@ -12,4 +12,18 @@ class EmailAddress < ApplicationRecord
     self.normalized_address = EmailNormalizer.normalize(value) || address
     super
   end
+
+  concerning :VerificationMethods do
+    def verifier
+      @verifier ||= Danbooru::MessageVerifier.new(:email_verification_key)
+    end
+
+    def verification_key
+      verifier.generate(id)
+    end
+
+    def valid_key?(key)
+      id == verifier.verified(key)
+    end
+  end
 end

app/policies/email_address_policy.rb

@@ -0,0 +1,14 @@
+class EmailAddressPolicy < ApplicationPolicy
+  def show?
+    record.user_id == user.id
+  end
+
+  def update?
+    # XXX here record is a user, not the email address.
+    record.id == user.id
+  end
+
+  def verify?
+    record.valid_key?(request.params[:email_verification_key])
+  end
+end

app/views/user_mailer/email_change_confirmation.html.erb

@@ -9,7 +9,7 @@
     </p>
 
     <p>
-      <%= link_to "Verify email address", verify_user_email_url(@user, email_verification_key: Danbooru::MessageVerifier.new(:email_verification_key).generate(@user.email_address.id)) %>
+      <%= link_to "Verify email address", email_verification_url(@user) %>
     </p>
 
     <p>

app/views/user_mailer/welcome_user.html.erb

@@ -8,7 +8,7 @@
     </p>
 
     <p>
-      <%= link_to "Verify email address", verify_user_email_url(@user, email_verification_key: Danbooru::MessageVerifier.new(:email_verification_key).generate(@user.email_address.id)) %>
+      <%= link_to "Verify email address", email_verification_url(@user) %>
     </p>
 
     <p>

test/functional/emails_controller_test.rb

@@ -1,9 +1,12 @@
 require "test_helper"
 
 class EmailsControllerTest < ActionDispatch::IntegrationTest
+  include UsersHelper
+
   context "in all cases" do
     setup do
       @user = create(:user, email_address: build(:email_address, { address: "bob@ogres.net", is_verified: false }))
+      @other_user = create(:user, email_address: build(:email_address, { address: "alice@ogres.net", is_verified: false }))
     end
 
     context "#show" do
@@ -11,6 +14,11 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
         get_auth user_email_path(@user), @user, as: :json
         assert_response :success
       end
+
+      should "not show email addresses to other users" do
+        get_auth user_email_path(@user), @other_user, as: :json
+        assert_response 403
+      end
     end
 
     context "#edit" do
@@ -20,13 +28,29 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
       end
     end
 
-    context "#create" do
+    context "#update" do
       context "with the correct password" do
-        should "work" do
+        should "update an existing address" do
-          put_auth user_email_path(@user), @user, params: { user: { password: "password", email: "abc@ogres.net" }}
+          assert_difference("EmailAddress.count", 0) do
+            put_auth user_email_path(@user), @user, params: { user: { password: "password", email: "abc@ogres.net" }}
+          end
 
           assert_redirected_to(settings_path)
           assert_equal("abc@ogres.net", @user.reload.email_address.address)
+          assert_equal(false, @user.email_address.is_verified)
+          assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user]
+        end
+
+        should "create a new address" do
+          @user.email_address.destroy
+
+          assert_difference("EmailAddress.count", 1) do
+            put_auth user_email_path(@user), @user, params: { user: { password: "password", email: "abc@ogres.net" }}
+          end
+
+          assert_redirected_to(settings_path)
+          assert_equal("abc@ogres.net", @user.reload.email_address.address)
+          assert_equal(false, @user.reload.email_address.is_verified)
           assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user]
         end
       end
@@ -46,12 +70,21 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
       context "with a correct verification key" do
         should "mark the email address as verified" do
           assert_equal(false, @user.reload.email_address.is_verified)
-          get_auth verify_user_email_path(@user), @user, params: { email_verification_key: Danbooru::MessageVerifier.new(:email_verification_key).generate(@user.email_address.id) }
+          get email_verification_url(@user)
 
           assert_redirected_to @user
           assert_equal(true, @user.reload.email_address.is_verified)
         end
       end
+
+      context "with an incorrect verification key" do
+        should "not mark the email address as verified" do
+          get verify_user_email_path(@user, email_verification_key: @other_user.email_address.verification_key)
+
+          assert_response 403
+          assert_equal(false, @user.reload.email_address.is_verified)
+        end
+      end
     end
   end
 end