From 6d357c9c233f7bea9be489078a9a8005aa7a8884 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Tue, 26 Aug 2014 16:52:35 -0700
Subject: [PATCH] Rename pop3s settings to pop3, remove 'insecure'

---
 app/jobs/scheduled/poll_mailbox.rb            | 19 ++++++++-----------
 config/application.rb                         |  2 +-
 config/site_settings.yml                      | 13 ++++++-------
 ...826234625_rename_settings_pop3s_to_pop3.rb |  9 +++++++++
 spec/jobs/poll_mailbox_spec.rb                | 18 +++++++++---------
 5 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb

diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 7faf2cfb9..8d86043c5 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -8,14 +8,14 @@ require_dependency 'email/message_builder'
 
 module Jobs
   class PollMailbox < Jobs::Scheduled
-    every SiteSetting.pop3s_polling_period_mins.minutes
+    every SiteSetting.pop3_polling_period_mins.minutes
     sidekiq_options retry: false
     include Email::BuildEmailHelper
 
     def execute(args)
       @args = args
-      if SiteSetting.pop3s_polling_enabled?
-        poll_pop3s
+      if SiteSetting.pop3_polling_enabled?
+        poll_pop3
       end
     end
 
@@ -72,14 +72,11 @@ module Jobs
       end
     end
 
-    def poll_pop3s
-      if !SiteSetting.pop3s_polling_insecure
-        Net::POP3.enable_ssl(OpenSSL::SSL::VERIFY_NONE)
-      end
-      Net::POP3.start(SiteSetting.pop3s_polling_host,
-                      SiteSetting.pop3s_polling_port,
-                      SiteSetting.pop3s_polling_username,
-                      SiteSetting.pop3s_polling_password) do |pop|
+    def poll_pop3
+      Net::POP3.start(SiteSetting.pop3_polling_host,
+                      SiteSetting.pop3_polling_port,
+                      SiteSetting.pop3_polling_username,
+                      SiteSetting.pop3_polling_password) do |pop|
         unless pop.mails.empty?
           pop.each do |mail|
             handle_mail(mail)
diff --git a/config/application.rb b/config/application.rb
index f290bd5c9..a73266698 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -91,7 +91,7 @@ module Discourse
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [
         :password,
-        :pop3s_polling_password,
+        :pop3_polling_password,
         :s3_secret_access_key,
         :twitter_consumer_secret,
         :facebook_app_secret,
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 72a13e9c6..623e48e60 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -385,13 +385,12 @@ email:
   email_custom_headers: 'Auto-Submitted: auto-generated'
   reply_by_email_enabled: false
   reply_by_email_address: ''
-  pop3s_polling_enabled: false
-  pop3s_polling_insecure: false
-  pop3s_polling_period_mins: 5
-  pop3s_polling_host: ''
-  pop3s_polling_port: 995
-  pop3s_polling_username: ''
-  pop3s_polling_password: ''
+  pop3_polling_enabled: false
+  pop3_polling_period_mins: 5
+  pop3_polling_host: ''
+  pop3_polling_port: 995
+  pop3_polling_username: ''
+  pop3_polling_password: ''
   email_in:
     default: false
     client: true
diff --git a/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb b/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb
new file mode 100644
index 000000000..0672e5168
--- /dev/null
+++ b/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb
@@ -0,0 +1,9 @@
+class RenameSettingsPop3sToPop3 < ActiveRecord::Migration
+  def up
+    execute "UPDATE site_settings SET name = replace(name, 'pop3s', 'pop3') WHERE name ILIKE 'pop3%'"
+  end
+
+  def down
+    execute "UPDATE site_settings SET name = replace(name, 'pop3', 'pop3s') WHERE name ILIKE 'pop3%'"
+  end
+end
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index b10dcc09e..3ba94945f 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -7,18 +7,18 @@ describe Jobs::PollMailbox do
 
   describe ".execute" do
 
-    it "does no polling if pop3s_polling_enabled is false" do
-      SiteSetting.expects(:pop3s_polling_enabled?).returns(false)
-      poller.expects(:poll_pop3s).never
+    it "does no polling if pop3_polling_enabled is false" do
+      SiteSetting.expects(:pop3_polling_enabled?).returns(false)
+      poller.expects(:poll_pop3).never
 
       poller.execute({})
     end
 
-    describe "with pop3s_polling_enabled" do
+    describe "with pop3_polling_enabled" do
 
-      it "calls poll_pop3s" do
-        SiteSetting.expects(:pop3s_polling_enabled?).returns(true)
-        poller.expects(:poll_pop3s).once
+      it "calls poll_pop3" do
+        SiteSetting.expects(:pop3_polling_enabled?).returns(true)
+        poller.expects(:poll_pop3).once
 
         poller.execute({})
       end
@@ -26,7 +26,7 @@ describe Jobs::PollMailbox do
 
   end
 
-  describe ".poll_pop3s" do
+  describe ".poll_pop3" do
 
     it "logs an error on pop authentication error" do
       error = Net::POPAuthenticationError.new
@@ -36,7 +36,7 @@ describe Jobs::PollMailbox do
 
       Discourse.expects(:handle_exception)
 
-      poller.poll_pop3s
+      poller.poll_pop3
     end
 
   end