talktome 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01f2b1e8706384a106f6418060f2d17a87c4d76e415e5cdd3235714c40339de
-  data.tar.gz: 87032bc365971d322428d0245cc9d1eced6644d19f8253eacd6f061ec891e684
+  metadata.gz: 3921c37bcb667aedfa4119ab30f430b16cc05dfc9c1bd8d2607775f81fde5ad6
+  data.tar.gz: c374bc0d83fd26cf0f079fec2abf214ce5ffb387dd04a07ab2dbb04e4f610683
 SHA512:
-  metadata.gz: 6484f97e7455db0484cd296be7ea5184f333897cdb953fac3d9ffe98dbcbdb7299779db00683bdfaf0ee970d223bb9f58e140a26732dea5543d700c621cfddc6
-  data.tar.gz: be7f825012c0bdaa44b10939c3a29be70f9249a65b5156de065dbf6cfee7ae44e97aa5fb15ab9963e18947c889a332829b2497d696a0a9619689f48d44a027bf
+  metadata.gz: 1fa9f53a14b13bc8cc5b76a74ea2e61bf0eb25185f41e3c2f787748f77ea79f05f5ccb94988c5fbcbea7e1fc1a24d490456f34bde6edd26b113618c6396f6782
+  data.tar.gz: 33cb01d9ab2908673b8a20b196bc9d9070dc1ec76cdc7dfc506677004640f0e562dac5771db16b582672fbd426de0337a2c06941889ce80b31257a226dafc9d6

data/README.md

@@ -97,12 +97,16 @@ TALKTOME_EMAIL_DEFAULT_TO        default To: to use for email sending
 TALKTOME_EMAIL_SUBJECT           Set the subject of the default "contact us" email
 TALKTOME_EMAIL_FOOTER            Set the footer of the default "contact us" email
 
+TALKTOME_LAYOUTS_FOLDER          Set the folder to use for messaging layouts
+
 TALKTOME_SMTP_ADDRESS            host address for smtp sending
 TALKTOME_SMTP_PORT               port of smtp server to use
 TALKTOME_SMTP_DOMAIN             sending domain
 TALKTOME_SMTP_USER               user for smtp authentication
 TALKTOME_SMTP_PASSWORD           password for smtp authentication
 TALKTOME_SMTP_STARTTLS_AUTO      true or false (see ruby Mail library)
+
+TALKTOME_BEARER_SECRET           secret for the webapi, to let send emails to anyone
 ```
 
 ## Hacking Talktome

data/lib/talktome.rb

@@ -26,7 +26,7 @@ module Talktome
   def set_env(which, value, &bl)
     old, ENV[which] = ENV[which], value
     bl.call.tap{
-      ENV[which] = old unless old.nil?
+      ENV[which] = old
     }
   end
   module_function :set_env
@@ -78,6 +78,10 @@ module Talktome
       }
     }
 
+    if layouts_folder = ENV['TALKTOME_LAYOUTS_FOLDER']
+      options[:layouts] = Path(layouts_folder)
+    end
+
     options
   end
   module_function :auto_options

data/lib/talktome/app.rb

@@ -18,6 +18,7 @@ module Talktome
       @import finitio/data
       Email = String(s | s =~ /^[^@]+@[^@]+$/ )
       {
+        to       :? Email
         reply_to :? Email
         ...      :  .Object
       }
@@ -31,7 +32,8 @@ module Talktome
         subject  = Talktome.env('TALKTOME_EMAIL_SUBJECT', 'Someone wants to reach you!')
         footer   = Talktome.env('TALKTOME_EMAIL_FOOTER', "Truly yours,\n
           Sent by [Enspirit.be](https://enspirit.be/), contact us if you need help with any IT task.")
-        TALKTOME.talktome(action, {}, info.merge(allvars: as_array, subject: subject, footer: footer), [:email]){|email|
+        user     = load_user_from_info!
+        TALKTOME.talktome(action, user, info.merge(allvars: as_array, subject: subject, footer: footer), [:email]){|email|
           email.reply_to = info[:reply_to] if info.has_key?(:reply_to)
         }
         [ 200, { "Content-Type" => "text/plain"}, ["Ok"] ]
@@ -52,8 +54,19 @@ module Talktome
       }
     end
 
-    def fail!(message)
-      [ 400, { "Content-Type" => "text/plain"}, [message] ]
+    def load_user_from_info!
+      if to = info[:to]
+        secret = Talktome.env('TALKTOME_BEARER_SECRET')
+        fail!("Missing secret", 400) unless secret
+        fail!("Invalid secret", 401) unless "Bearer #{secret}" == env["HTTP_AUTHORIZATION"]
+        { email: info[:to] }
+      else
+        {}
+      end
+    end
+
+    def fail!(message, status = 400)
+      halt([ status, { "Content-Type" => "text/plain"}, [message] ])
     end
 
     def not_a_robot!(info)

data/lib/talktome/client/local.rb

@@ -33,7 +33,7 @@ module Talktome
       end
 
       def templater(strategy)
-        return nil unless tpl_folder = options[:templates]
+        return nil unless tpl_folder = options[:layouts] || options[:templates]
         ->(message, src, ctype) {
           if (file = tpl_folder/"#{strategy}.#{ctype}").file?
             data = { metadata: message.metadata, yield: src }

data/lib/talktome/version.rb

@@ -2,7 +2,7 @@ module Talktome
   module Version
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 2
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/app/test_app.rb

@@ -46,6 +46,22 @@ module Talktome
         end
       end
 
+      it 'allows to use a token authentification to bypass default security measures, for e.g. passing the :to' do
+        Talktome.set_env('TALKTOME_BEARER_SECRET', "Some secret") do
+          header 'Authorization', 'Bearer Some secret'
+          post "/contact-us/", {
+            to: 'hello@visitor.com',
+            reply_to: 'hello@visitor.com',
+            message: 'Hello from visitor',
+            key: 'value',
+          }.to_json, { "CONTENT_TYPE" => "application/json" }
+          expect(last_response).to be_ok
+          expect(Mail::TestMailer.deliveries.length).to eql(1)
+          expect(Mail::TestMailer.deliveries.first.to).to eql(["hello@visitor.com"])
+          expect(Mail::TestMailer.deliveries.first.from).to eql(["from@talktome.com"])
+        end
+      end
+
       it 'detects invalid emails' do
         post "/contact-us/", {
           reply_to: 'helloatvisitor.com',
@@ -71,6 +87,48 @@ module Talktome
         expect(Mail::TestMailer.deliveries.length).to eql(0)
       end
 
+      it 'forbids usage of :to unless a secret is provided' do
+        post "/contact-us/", {
+          to: 'hello@visitor.com',
+          reply_to: 'hello@visitor.com',
+          message: 'Hello from visitor',
+          key: 'value',
+        }.to_json, { "CONTENT_TYPE" => "application/json" }
+        expect(last_response.status).to eql(400)
+        expect(Mail::TestMailer.deliveries.length).to eql(0)
+      end
+
+      it 'does not allow setting the :to without a valid AUTH token' do
+        Talktome.set_env('TALKTOME_BEARER_SECRET', "Invalid secret") do
+          post "/contact-us/", {
+            to: 'hello@visitor.com',
+            reply_to: 'hello@visitor.com',
+            message: 'Hello from visitor',
+            key: 'value',
+          }.to_json, { "CONTENT_TYPE" => "application/json" }
+          expect(last_response.status).to eql(401)
+          expect(Mail::TestMailer.deliveries.length).to eql(0)
+        end
+      end
+
+      it 'requires a valid Email for :to' do
+        post "/contact-us/", {
+          to: nil,
+          reply_to: 'hello@visitor.com',
+          message: 'Hello from visitor',
+          key: 'value',
+        }.to_json, { "CONTENT_TYPE" => "application/json" }
+        expect(last_response.status).to eql(400)
+
+        post "/contact-us/", {
+          to: "notavalidemail",
+          reply_to: 'hello@visitor.com',
+          message: 'Hello from visitor',
+          key: 'value',
+        }.to_json, { "CONTENT_TYPE" => "application/json" }
+        expect(last_response.status).to eql(400)
+      end
+
     end
 
     context 'POST /contact-us/, regarding the Reply-To' do

data/spec/client/test_local.rb

@@ -29,7 +29,7 @@ module Talktome
         strategy.clear!
       }
 
-      context "without templates" do
+      context "without layouts" do
         let(:options) {
           {}
         }
@@ -41,10 +41,10 @@ module Talktome
         end
       end
 
-      context "with templates" do
+      context "with layouts under the :layouts option key" do
         let(:options) {
           {
-            templates: Path.dir/"../fixtures/templates"
+            layouts: Path.dir/"../fixtures/layouts"
           }
         }
 
@@ -63,6 +63,19 @@ module Talktome
         end
       end
 
+      context "with layouts under the :templates option key (backward compatibility)" do
+        let(:options) {
+          {
+            templates: Path.dir/"../fixtures/layouts"
+          }
+        }
+
+        it 'sends email when requested' do
+          client.talktome("welcome", user, tpldata, [:email])
+          expect(strategy.last.message.to_html).to eql("<html><title>Hello Test user</title><body><h1>Hello Test user</h1>\n\n<p>Welcome to this email example!</p>\n\n<h3>Test user</h3>\n</body></html>\n")
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talktome
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,16 +138,22 @@ dependencies:
   name: finitio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rack-robustness
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +191,7 @@ files:
 - lib/talktome/version.rb
 - spec/app/test_app.rb
 - spec/client/test_local.rb
-- spec/fixtures/templates/email.html
+- spec/fixtures/layouts/email.html
 - spec/fixtures/welcome/email.md
 - spec/fixtures/welcome/footer.mustache
 - spec/message/test_initialize.rb
@@ -199,7 +205,7 @@ homepage: http://github.com/enspirit/talktome
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -214,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: Talktome helps you talk to users by email, messaging, sms, etc.
 test_files: []