osa 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ad6f3864c9196aff9026ad350f71c7904c27817dbd0217bf6008885830ac15
-  data.tar.gz: fe44a6e9d98590eb231c04c794327ca1132feaf9d13d556563fe900ec5bce190
+  metadata.gz: 22c6dd2dc64261089df031e75fee841e1416276244674dce617792aacbb12fca
+  data.tar.gz: f0442134bc13835edcbacea2aa594fdc95202e47beed2e71c29f5214bbae2335
 SHA512:
-  metadata.gz: c9dfa0f4cf44acf3ca08654f670cdca47a7a9ae7c681dfea0b9b9ddb6acf064a9b88c98dd325e449e9efa23647fc663cb407a4ec19a1fdd4e86df1a556fe467e
-  data.tar.gz: 1f32dbf2f0cbf9373788100ca8f99579be14732cf86c91ce45c443d9ae67476d762eae81b7b9d3b5243b97011dd066df713f72dd8002ab53d32d9e27f145999f
+  metadata.gz: ca001d8b232f9bfa8bcfde6e75be2a6e1a7b2d025254e22af2feec25625d979e3bd10a88325cee888442b5686b22c7f93fd1866225d7bb6ca38e27e9c62e05af
+  data.tar.gz: 7d96e933b2c4b09d335f825c933ba01197399aea947e7ca2fca3f66a851c7f469f046fd37abbb59548c54fbb37835eef3684540172cf01bcf30489f2106e6208

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
   DisabledByDefault: true
   Exclude:
     - '**/vendor/**/*'
+    - 'bin/**'
 
 Bundler/DuplicatedGem:
   Enabled: true

data/Gemfile

@@ -1,4 +1,5 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osa (0.1.0)
+    osa (0.1.1)
       activerecord (~> 6.0)
       faraday (~> 1.1)
       public_suffix (~> 4.0)

data/Rakefile

@@ -1,10 +1,11 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
-
-require "bundler/setup"
-require "osa"
+require 'bundler/setup'
+require 'osa'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +9,5 @@ require "osa"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/osa

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+#
+# This file was generated by Bundler.
+#
+# The application 'osa' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path('../bundle', __FILE__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('osa', 'osa')

data/exe/osa

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'osa/services/setup_service'
 require 'osa/services/auth_service'
 
@@ -8,7 +9,7 @@ case cmd
 when 'setup'
   OSA::SetupService.new.setup!
 when 'login'
-  OSA::AuthService.login(Config.first || Config.new)
+  OSA::AuthService.login(OSA::Config.first || OSA::Config.new)
 when 'scan-junk'
   require 'osa/scripts/scan_junk_folder'
 when 'scan-report'

data/lib/osa.rb

@@ -1 +1,2 @@
-require "osa/version"
+# frozen_string_literal: true
+require 'osa/version'

data/lib/osa/clients/http_client.rb

@@ -15,6 +15,11 @@ module OSA
       handle_response(response)
     end
 
+    def put(*args, **kwargs)
+      response = @connection.put(*args, **kwargs)
+      handle_response(response)
+    end
+
     def delete(*args, **kwargs)
       response = @connection.delete(*args, **kwargs)
       handle_response(response)
@@ -31,7 +36,7 @@ module OSA
         if response.status > 299
           raise StandardError, "Request failed with status code: #{response.status}, body: #{response.body}"
         end
-        if response.headers['content-type'].include?('application/json')
+        if response.headers['content-type']&.include?('application/json')
           JSON.parse(response.body)
         else
           response.body

data/lib/osa/clients/ms_graph_client.rb

@@ -4,43 +4,49 @@ require 'json'
 require 'base64'
 require 'osa/util/paginated'
 require 'osa/clients/http_client'
+require 'active_support/core_ext/numeric/bytes'
+require 'active_support'
 
 module OSA
-  class MSGraphClient < HttpClient
+  class MSGraphClient
+    URL = 'https://graph.microsoft.com'
+
     def initialize(token)
-      connection = Faraday.new(
+      @authenticated = HttpClient.new(Faraday.new(
         url: 'https://graph.microsoft.com',
         headers: {
           'authorization' => "Bearer #{token}"
         }
-      )
-      super connection
+      ))
+
+      @unauthenticated = HttpClient.new(Faraday.new(
+        url: 'https://graph.microsoft.com'
+      ))
     end
 
     def rules
-      get('/v1.0/me/mailFolders/inbox/messageRules')
+      @authenticated.get('/v1.0/me/mailFolders/inbox/messageRules')
     end
 
     def rule(id)
-      get("/v1.0/me/mailFolders/inbox/messageRules/#{id}")
+      @authenticated.get("/v1.0/me/mailFolders/inbox/messageRules/#{id}")
     end
 
     def folders
-      Paginated.new(get('/v1.0/me/mailFolders'), self)
+      Paginated.new(@authenticated.get('/v1.0/me/mailFolders'), self)
     end
 
     def mails(folder_id)
-      Paginated.new(get("/v1.0/me/mailFolders/#{folder_id}/messages"), self)
+      Paginated.new(@authenticated.get("/v1.0/me/mailFolders/#{folder_id}/messages"), self)
     end
 
     def raw_mail(mail_id)
-      get("/v1.0/me/messages/#{mail_id}/$value")
+      @authenticated.get("/v1.0/me/messages/#{mail_id}/$value")
     end
 
     def forward_mail_as_attachment(mail_id, to)
       raw_mail = self.raw_mail(mail_id)
       forward_message = create_forward_message(mail_id)
-      add_email_attachment(forward_message['id'], raw_mail)
       update = {
         toRecipients: [
           {
@@ -51,36 +57,68 @@ module OSA
         ]
       }
       update_message(forward_message['id'], update)
+      add_email_attachment(forward_message['id'], 'email.eml', raw_mail)
       send_message(forward_message['id'])
     end
 
     def create_forward_message(mail_id)
-      post("/v1.0/me/messages/#{mail_id}/createForward")
+      @authenticated.post("/v1.0/me/messages/#{mail_id}/createForward")
     end
 
-    def add_email_attachment(mail_id, content)
-      body = {
-        "@odata.type": '#microsoft.graph.fileAttachment',
-        "contentBytes": Base64.encode64(content),
-        "name": 'email.eml'
-      }
-      post("/v1.0/me/messages/#{mail_id}/attachments", body.to_json, 'content-type': 'application/json')
+    def add_email_attachment(mail_id, name, content)
+      if content.length < 3.megabytes
+        add_small_email_attachment(mail_id, name, content)
+      else
+        add_large_email_attachment(mail_id, name, content)
+      end
     end
 
     def delete_mail(mail_id)
-      delete("/v1.0/me/messages/#{mail_id}")
+      @authenticated.delete("/v1.0/me/messages/#{mail_id}")
     end
 
     def update_rule(id, update)
-      patch("/v1.0/me/mailFolders/inbox/messageRules/#{id}", update.to_json, 'content-type' => 'application/json')
+      @authenticated.patch("/v1.0/me/mailFolders/inbox/messageRules/#{id}", update.to_json, 'content-type' => 'application/json')
     end
 
     def update_message(id, update)
-      patch("/v1.0/me/messages/#{id}", update.to_json, 'content-type': 'application/json')
+      @authenticated.patch("/v1.0/me/messages/#{id}", update.to_json, 'content-type': 'application/json')
     end
 
     def send_message(id)
-      post("/v1.0/me/messages/#{id}/send")
+      @authenticated.post("/v1.0/me/messages/#{id}/send")
     end
+
+    private
+      def add_small_email_attachment(mail_id, name, content)
+        body = {
+          "@odata.type": '#microsoft.graph.fileAttachment',
+          contentBytes: Base64.encode64(content),
+          name: name
+        }
+        @authenticated.post("/v1.0/me/messages/#{mail_id}/attachments", body.to_json, 'content-type': 'application/json')
+      end
+
+      def add_large_email_attachment(mail_id, name, content)
+        upload_session = create_upload_session(mail_id, name, content.length)
+        ranges = upload_session['nextExpectedRanges'].map do |range|
+          range.split('-').then { |start, finish| (start.to_i..finish&.to_i) }
+        end
+        ranges.each do |range|
+          current_content = content[range]
+          @unauthenticated.put(upload_session['uploadUrl'], current_content[range], 'Content-Range': "bytes #{range.begin}-#{(range.end || content.length) - 1}/#{content.length}")
+        end
+      end
+
+      def create_upload_session(mail_id, name, size)
+        body = {
+          AttachmentItem: {
+            attachmentType: :file,
+            name: name,
+            size: size
+          }
+        }
+        @authenticated.post("/v1.0/me/messages/#{mail_id}/attachments/createUploadSession", body.to_json, 'content-type': 'application/json')
+      end
   end
 end

data/lib/osa/scripts/scan_report_folder.rb

@@ -17,7 +17,6 @@ loop do
     puts "deleting spam from #{email_address}"
     context.graph_client.delete_mail(mail['id'])
 
-
     next if email_address.nil?
     domain = PublicSuffix.domain(email_address.split('@', 2)[1])
 

data/lib/osa/services/auth_service.rb

@@ -39,7 +39,7 @@ module OSA
       base_uri = 'https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize'
 
       uri = "#{base_uri}#{query_str}"
-      puts "Open the following url in your browser and enter the authentication code displayed."
+      puts 'Open the following url in your browser and enter the authentication code displayed.'
       puts uri
 
       prompt = TTY::Prompt.new

data/lib/osa/util/constants.rb

@@ -3,5 +3,5 @@
 module OSA
   CLIENT_ID = 'befa4a9e-5d16-4a48-9792-4bd1d125abe8'
   REDIRECT_URL = 'https://storage.googleapis.com/outlook-spam-automator/login.html'
-  SCOPE = 'https://graph.microsoft.com/MailboxSettings.ReadWrite https://graph.microsoft.com/MailboxSettings.ReadWrite offline_access'
+  SCOPE = 'https://graph.microsoft.com/Mail.ReadWrite https://graph.microsoft.com/MailboxSettings.ReadWrite offline_access'
 end

data/lib/osa/util/context.rb

@@ -10,7 +10,7 @@ module OSA
     attr_reader :auth_service
     attr_reader :config
 
-    def initialize(config=nil)
+    def initialize(config = nil)
       @config = config || Config.first
 
       if @config.nil?

data/lib/osa/util/db.rb

@@ -5,10 +5,9 @@ ActiveRecord::Base.establish_connection(
   adapter: 'sqlite3',
   database: ENV['DATABASE'] || "#{Dir.pwd}/osa.db"
 )
-root = "#{File.dirname(__FILE__ )}/../"
+root = "#{File.dirname(__FILE__)}/../"
 ActiveRecord::MigrationContext.new("#{root}/migrations", ActiveRecord::SchemaMigration).migrate
 
-
 module OSA
   class Blacklist < ActiveRecord::Base
   end

data/lib/osa/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module OSA
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

data/osa.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'lib/osa/version'
 
 Gem::Specification.new do |spec|
@@ -9,11 +10,11 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Outlook Spam Automator'
   spec.description   = 'Get rid of spam on your Outlook account'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Moray Baruh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,6 +98,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/osa
 - bin/setup
 - exe/osa
 - lib/osa.rb