mournmail 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2cbdbd1f9d9fe5f74f7d098cbf1eae74e113d544705005a9ca95f652799c7e3
-  data.tar.gz: 384b036461c6ea691d7559bb17fec0c2439ebebf51e5694e49481844d25336a5
+  metadata.gz: 7b758be18cec7a7b8e51d1d1a02cdc8652200800d3c96cd54b471f360e139310
+  data.tar.gz: d201ace873c79702fec68815cda4276f4d78d8dcb60e982b2d24c43efd014778
 SHA512:
-  metadata.gz: 18831f3e5fff6e0a181791c56a926c866cfef9f2b210e5f47f7f0bca04c73695130cdd3f9924b9a7e359e1f479e878ea1c8c157092162e366513e62a9111eca3
-  data.tar.gz: b252222b12d59b599df9f81f5b610dff5649c0440782e89ca273602039738b8a3708f6499560ad461c88844a14c0bcb2e9216ddb21dbdd00471a82de52e71569
+  metadata.gz: d972e8d6410736c90eb8074f723a96bed957ca7cdd7c74350261c47cce57c3527a692ea422375e08a5f892ee08fbcfcb7d88edbb0b83e9c6ab1adf6f0616383b
+  data.tar.gz: fa3659729fc83d4373896511009080e36297c1382e857e25ef2c7dfa1421d78ef506bafd23d81e00f504972116a0a281843359b22b4446b2031791e6b115450c

data/lib/mournmail/config.rb

@@ -36,4 +36,21 @@ module Textbringer
   end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
   CONFIG[:mournmail_signature_regexp] = /^\n-- /
+  CONFIG[:mournmail_allowed_attachment_extensions] = [
+    "txt",
+    "md",
+    "htm",
+    "html",
+    "pdf",
+    "jpg",
+    "jpeg",
+    "png",
+    "gif",
+    "doc",
+    "docx",
+    "xls",
+    "xlsx",
+    "ppt",
+    "zip"
+  ]
 end

data/lib/mournmail/message_mode.rb

@@ -129,6 +129,14 @@ module Mournmail
         raise EditorError, "Can't open a multipart entity."
       end
       ext = part_file_name(part).slice(/\.([^.]+)\z/, 1)
+      if part.main_type != "text" || part.sub_type == "html"
+        if ext.nil?
+          raise EditorError, "The extension of the filename is not specified"
+        end
+        if !CONFIG[:mournmail_allowed_attachment_extensions].include?(ext)
+          raise EditorError, ".#{ext} is not allowed"
+        end
+      end
       if ext
         file_name = ["mournmail", "." + ext]
       else

data/lib/mournmail/utils.rb

@@ -11,12 +11,13 @@ require 'google/api_client/client_secrets'
 require 'google/api_client/auth/storage'
 require 'google/api_client/auth/storages/file_store'
 require 'launchy'
+require "socket"
 
 class Net::SMTP
   def auth_xoauth2(user, secret)
     check_auth_args user, secret
     res = critical {
-      s = Mournmail.xoauth2_string(user, secret)
+      s = Net::IMAP::XOauth2Authenticator.new(user, secret).process("")
       get_response('AUTH XOAUTH2 ' + base64_encode(s))
     }
     check_auth_response res
@@ -24,20 +25,6 @@ class Net::SMTP
   end
 end
 
-class Net::IMAP::Xoauth2Authenticator
-  def process(data)
-    Mournmail.xoauth2_string(@user, @access_token)
-  end
-
-  private
-
-  def initialize(user, access_token)
-    @user = user
-    @access_token = access_token
-  end
-end
-Net::IMAP.add_authenticator("XOAUTH2", Net::IMAP::Xoauth2Authenticator)
-
 module Mournmail
   begin
     require "mail-gpg"
@@ -225,6 +212,41 @@ module Mournmail
     end
   end
 
+  class GoogleAuthCallbackServer
+    def initialize
+      @servers = Socket.tcp_server_sockets("127.0.0.1", 0)
+    end
+
+    def port
+      @servers.first.local_address.ip_port
+    end
+
+    def receive_code
+      Socket.accept_loop(@servers) do |sock, addr|
+        line = sock.gets
+        query_string = line.slice(%r'\AGET [^?]*\?(.*) HTTP/1.1\r\n', 1)
+        params = CGI.parse(query_string)
+        code = params["code"][0]
+        while line = sock.gets
+          break if line == "\r\n"
+        end
+        sock.print("HTTP/1.1 200 OK\r\n")
+        sock.print("Content-Type: text/plain\r\n")
+        sock.print("\r\n")
+        if code
+          sock.print("Authenticated!")
+        else
+          sock.print("Authentication failed!")
+        end
+        return code
+      ensure
+        sock.close
+      end
+    ensure
+      @servers.each(&:close)
+    end
+  end
+
   def self.google_access_token(account = current_account)
     auth_path = File.expand_path("cache/#{account}/google_auth.json",
                                  CONFIG[:mournmail_directory])
@@ -236,28 +258,21 @@ module Mournmail
       conf = CONFIG[:mournmail_accounts][account]
       path = File.expand_path(conf[:client_secret_path])
       client_secrets = Google::APIClient::ClientSecrets.load(path)
+      callback_server = GoogleAuthCallbackServer.new
       auth_client = client_secrets.to_authorization
       auth_client.update!(
         :scope => 'https://mail.google.com/',
-        :redirect_uri => 'urn:ietf:wg:oauth:2.0:oob'
+        :redirect_uri => "http://127.0.0.1:#{callback_server.port}/"
       )
       auth_uri = auth_client.authorization_uri.to_s
-      auth_client.code = foreground! {
+      foreground! do
         begin
           Launchy.open(auth_uri)
         rescue Launchy::CommandNotFoundError
-          buffer = show_google_auth_uri(auth_uri)
+          show_google_auth_uri(auth_uri)
         end
-        begin
-          Window.echo_area.clear_message
-          Window.redisplay
-          read_from_minibuffer("Code: ").chomp
-        ensure
-          if buffer
-            kill_buffer(buffer, force: true)
-          end
-        end
-      }
+      end
+      auth_client.code = callback_server.receive_code
       auth_client.fetch_access_token!
       old_umask = File.umask(077)
       begin
@@ -288,10 +303,6 @@ module Mournmail
     buffer
   end
   
-  def self.xoauth2_string(user, access_token)
-    "user=#{user}\1auth=Bearer #{access_token}\1\1"
-  end
-
   def self.fetch_summary(mailbox, all: false)
     if all
       summary = Mournmail::Summary.new(mailbox)

data/lib/mournmail/version.rb

@@ -1,3 +1,3 @@
 module Mournmail
-  VERSION = "1.0.1"
+  VERSION = "1.0.3"
 end

data/mournmail.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "textbringer"
   spec.add_runtime_dependency "net-smtp"
-  spec.add_runtime_dependency "net-imap"
+  spec.add_runtime_dependency "net-imap", ">= 0.3.1"
   spec.add_runtime_dependency "mail"
   spec.add_runtime_dependency "mime-types"
   spec.add_runtime_dependency "rroonga"
-  spec.add_runtime_dependency "google-api-client"
+  spec.add_runtime_dependency "google-apis-core"
   spec.add_runtime_dependency "launchy"
   spec.add_runtime_dependency "html2text"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="