yopass 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db430181db17b14ef799a4967b2309d9394c53b
-  data.tar.gz: 1e61be3b5b13c9866cc85dbd8110b232a7b4acba
+  metadata.gz: 570a25ceb9e2e5bc73307fea8905cc2ffc50f8c7
+  data.tar.gz: 77e15af32283deca585374aef1a7bfb82d1a2581
 SHA512:
-  metadata.gz: 4f1e92c8c9ca27e0e91b641509c02361c60d13778797fe75bc21c014b3bbff940e9ba392d8f276cb2ee2aeeef057c35fb7cc1fa8ba7250a9847f000f547f6204
-  data.tar.gz: 67ee5fdb2509ab7d9934634c5a9ff1fabaa6f5e1f8f4216c0b7a9c68c5e36a3ca7bd2fabd9795a0cb54bfb2411724445b411d412ac35c0c48d46511d75328085
+  metadata.gz: bd90d1ffa4af0f7901bdd61d23137302719002b281825dff2ef35358e5af85c0de34165bcef2e229f6c8f29e5fec6f380e6f9b0d5514e6cd6b5ba3019e367842
+  data.tar.gz: 03421a1b0608f10bfc4de6ba191c6157e2118afcde79af1ed5536dbddcbcc849c0617d9cf0fae5756ed7a4ac87a36d2033a0d20488597c23c733c757a6ec0e02

data/.buildpacks

@@ -0,0 +1,2 @@
+https://github.com/bjacobel/heroku-buildpack-libsasl.git
+https://github.com/heroku/heroku-buildpack-ruby.git

data/.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = 'yopass'
-  s.version     = '1.1.2'
+  s.version     = '1.1.4'
   s.author      = 'Johan Haals'
   s.email       = ['jhaals@spotify.com']
   s.homepage    = 'https://github.com/jhaals/yopass'

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+vendor
+coverage

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Yopass changelog
 
+### 1.1.3
+
+* display placeholder for mobile number in form.
+* fixes bug where test would fail is memcached was running.
+
 ### 1.1.2
 
 * Typo

data/Gemfile

@@ -5,8 +5,7 @@ gem 'encryptor', '~> 1.3.0'
 gem 'memcached', '~> 1.7.2'
 gem 'yopass', :path => '.'
 
-group :test do
-  gem 'simplecov', :require => false
+group :dev do
   gem 'sinatra-contrib'
   gem 'rake'
   gem 'rspec'

data/Gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: .
+  specs:
+    yopass (1.1.3)
+      encryptor (~> 1.3.0)
+      memcached (~> 1.7.2)
+      sinatra (~> 1.4.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    backports (3.6.0)
+    diff-lcs (1.2.5)
+    encryptor (1.3.0)
+    memcached (1.7.2)
+    multi_json (1.9.2)
+    rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.2.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.2)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  encryptor (~> 1.3.0)
+  memcached (~> 1.7.2)
+  rake
+  rspec
+  sinatra (~> 1.4.4)
+  sinatra-contrib
+  yopass!

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec ruby lib/yopass.rb -p $PORT

data/lib/views/index.erb

@@ -34,7 +34,7 @@
       <div class="field">
         <label>Send decryption key over SMS (optional)</label>
           <div class="ui left labeled icon input">
-            <input type="text" name="mobile_number" placeholder"Mobile number eg 4670222123">
+            <input type="text" name="mobile_number" placeholder="Mobile number eg 4670222123">
             <i class="mobile icon"></i>
           </div>
       </div>

data/lib/yopass.rb

@@ -25,7 +25,7 @@ class Yopass < Sinatra::Base
 
   get '/' do
     # display mobile number field if send_sms is true
-    erb :index, :locals => {:send_sms => settings.config['send_sms']}
+    erb :index, :locals => { :send_sms => settings.config['send_sms'] }
   end
 
   post '/' do
@@ -35,9 +35,9 @@ class Yopass < Sinatra::Base
 
     lifetime = params[:lifetime]
     # calculate lifetime in secounds
-    lifetime_options = { '1w' => 3600*24*7,
-                         '1d' => 3600*24,
-                         '1h' => 3600,
+    lifetime_options = { '1w' => 3600 * 24 * 7,
+                         '1d' => 3600 * 24,
+                         '1h' => 3600
     }
     # Verify that user has posted a valid lifetime
     return 'Invalid lifetime' unless lifetime_options.include? lifetime
@@ -58,9 +58,9 @@ class Yopass < Sinatra::Base
       return "Can't contact memcached"
     end
 
-    if settings.config['send_sms'] == true and !params[:mobile_number].nil?
+    if settings.config['send_sms'] == true && !params[:mobile_number].nil?
       # strip everything except digits
-      mobile_number = params[:mobile_number].gsub(/[^0-9]/, "")
+      mobile_number = params[:mobile_number].gsub(/[^0-9]/, '')
       # load specified sms provider
       sms = SmsProvider.create(settings.config['sms::provider'],
                                settings.config['sms::settings'])
@@ -75,27 +75,29 @@ class Yopass < Sinatra::Base
     end
 
     erb :secret_url, :locals => {
-      :url => URI.join(settings.config['http_base_url'], "get?k=#{key}&p=#{password}"),
-      :key_sent_to_mobile => false}
+      :url => URI.join(settings.config['http_base_url'],"get?k=#{key}&p=#{password}"),
+      :key_sent_to_mobile => false }
   end
 
   get '/get' do
     # No password added
-    return erb :get_secret, :locals => {:key => params[:k]} if params[:p].nil? or params[:p].empty?
+    return erb :get_secret, :locals => {
+      :key => params[:k] } if params[:p].nil? || params[:p].empty?
 
     # Disable all caching
     headers 'Cache-Control' => 'no-cache, no-store, must-revalidate'
     headers 'Pragma' => 'no-cache'
     headers 'Expires' => '0'
+
     begin
-    result = settings.cache.get params[:k]
+      result = settings.cache.get params[:k]
     rescue Memcached::NotFound
       return erb :'404'
     end
     content_type 'text/plain'
 
     begin
-    result = Encryptor.decrypt(:value => result, :key => params[:p])
+      result = Encryptor.decrypt(:value => result, :key => params[:p])
     rescue OpenSSL::Cipher::CipherError
       return 'Invalid decryption key'
     end

data/lib/yopass/sms_provider.rb

@@ -5,7 +5,7 @@ class SmsProvider
     rescue LoadError => e
       raise "Unsupported provider #{provider}: #{e}"
     end
-    class_name = provider.split("_").map {|v| v.capitalize }.join
+    class_name = provider.split('_').map { |v| v.capitalize }.join
     const_get(class_name).new settings
   end
 end

data/lib/yopass/sms_provider/bulksms.rb

@@ -12,7 +12,7 @@ class Bulksms
     url = URI.join(@api_url, "?username=#{@username}&password=#{@password}" \
                    "&message=#{message}&msisdn=#{to}&sender=#{@sender}")
     result = open(url).read
-    return true if result.include? "IN_PROGRESS"
+    return true if result.include? 'IN_PROGRESS'
     false
   end
 end

data/spec/bulksms_spec.rb

@@ -0,0 +1,14 @@
+require 'yopass/sms_provider/bulksms'
+require 'spec_helper'
+
+describe 'bulksms' do
+
+  it 'should send sms' do
+    sms = Bulksms.new(
+      'username' => 'foobar',
+      'password' => '123',
+      'sender' => 'YoPass')
+    Bulksms.any_instance.stub(:send).and_return(true)
+    sms.send('467022123', 'decryption_key').should == true
+  end
+end

data/spec/sms_provder_spec.rb

@@ -0,0 +1,13 @@
+require 'yopass/sms_provider'
+require 'spec_helper'
+
+describe 'sms_provider' do
+
+  it 'should fail when loading non-existing providers' do
+    expect { SmsProvider.create('does_not_exist', {}) }.to raise_error(RuntimeError)
+  end
+
+  it 'should work fine to load provider' do
+    SmsProvider.create('bulksms', {})
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/vendor/"
-end
+require File.join(File.dirname(__FILE__), '../lib/yopass.rb')
+
 require 'sinatra'
 require 'rack/test'
 
-require File.join(File.dirname(__FILE__), '../lib/yopass.rb')
-
 set :run, false
 set :raise_errors, true
 set :logging, true

data/spec/yopass_spec.rb

@@ -24,6 +24,7 @@ describe 'yopass' do
   end
 
   it 'should complain about not being able to connect to memcached' do
+    Memcached.any_instance.stub(:set).and_raise(Memcached::ServerIsMarkedDead)
     post '/', params={'lifetime' => '1h', 'secret' => "0" * 100}
     last_response.body.should match /Can't contact memcached/
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yopass
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Johan Haals
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -59,11 +59,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .buildpacks
 - .gemspec
+- .gitignore
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
 - conf/config.ru
@@ -109,6 +113,8 @@ files:
 - lib/yopass.rb
 - lib/yopass/sms_provider.rb
 - lib/yopass/sms_provider/bulksms.rb
+- spec/bulksms_spec.rb
+- spec/sms_provder_spec.rb
 - spec/spec_helper.rb
 - spec/yopass_spec.rb
 homepage: https://github.com/jhaals/yopass
@@ -137,4 +143,7 @@ signing_key:
 specification_version: 4
 summary: Secure sharing for secrets and passwords
 test_files:
+- spec/bulksms_spec.rb
+- spec/sms_provder_spec.rb
 - spec/yopass_spec.rb
+has_rdoc: