yopass 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687e4922514a580bb51d8a9d85174a519b31d6ba
-  data.tar.gz: 8a0a6dae9bc3054641e5424bbdae20645de8c943
+  metadata.gz: 8db430181db17b14ef799a4967b2309d9394c53b
+  data.tar.gz: 1e61be3b5b13c9866cc85dbd8110b232a7b4acba
 SHA512:
-  metadata.gz: 19e8fb94dab66b23c05dc3a23dec89cb1f5d3cadb056840affa818e3254e1bf07391b9bf2229e93bd58b465739f7476a316cb1038a437ee20c2e7a0144a9e3be
-  data.tar.gz: 22675e3b02a946b0abdff389148b2dd40489adc4ff991fc5f81faa7dab24f293702b0755aa35358f779fa32c59637888c6820347c8d5ec8ca5f90bca3c6be2b6
+  metadata.gz: 4f1e92c8c9ca27e0e91b641509c02361c60d13778797fe75bc21c014b3bbff940e9ba392d8f276cb2ee2aeeef057c35fb7cc1fa8ba7250a9847f000f547f6204
+  data.tar.gz: 67ee5fdb2509ab7d9934634c5a9ff1fabaa6f5e1f8f4216c0b7a9c68c5e36a3ca7bd2fabd9795a0cb54bfb2411724445b411d412ac35c0c48d46511d75328085

data/.gemspec

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

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+    - 1.8.7
+    - 1.9.3
+    - 2.0.0

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Yopass changelog
+
+### 1.1.2
+
+* Typo
+* Shipp all fonts instead of loading them from external site. Caused insecure content warning

data/Gemfile

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

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2014 johan.haals@gmail.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,4 +1,6 @@
 # YoPass - Share Secrets Securely
+[![Build Status](https://travis-ci.org/JHaals/yopass.png?branch=master)](https://travis-ci.org/JHaals/yopass)
+
 YoPass is a website that store secrets encrypted(AES 256) in memory(memcached) for a fixed period of time.
 Secrets can then be shared more securely over channels such as IRC and Email. The decryption password for the secret can be sent over SMS to improve security.
 
@@ -35,3 +37,4 @@ Bulksms
 
 ### Screenshot
 ![YoPass website](http://f.cl.ly/items/2F2T1L3a3R162K2G383q/yopass.png)
+

data/Rakefile

@@ -0,0 +1,5 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]

data/lib/static/packaged/css/font.css

@@ -2,35 +2,35 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 300;
-  src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v7/DXI1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf) format('truetype');
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(/packaged/fonts/sans/OpenSans-Light.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
-  src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v7/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
+  src: local('Open Sans'), local('OpenSans'), url(/packaged/fonts/sans/OpenSans.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v7/k3k702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf) format('truetype');
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(/packaged/fonts/sans/OpenSans-Bold.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 300;
-  src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v7/PRmiXeptR36kaC0GEAetxrfB31yxOzP-czbf6AAKCVo.ttf) format('truetype');
+  src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(/packaged/fonts/sans/OpenSansLight-Italic.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(http://themes.googleusercontent.com/static/fonts/sourcesanspro/v7/ODelI1aHBYDBqgeIAH2zlNzbP97U9sKh0jjxbPbfOKg.ttf) format('truetype');
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(/packaged/fonts/sans/SourceSansPro-Regular.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(http://themes.googleusercontent.com/static/fonts/sourcesanspro/v7/toadOcfmlt9b38dHJxOBGLsbIrGiHa6JIepkyt5c0A0.ttf) format('truetype');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(/packaged/fonts/sans/SourceSansPro-Bold.ttf) format('truetype');
 }

data/lib/views/index.erb

@@ -70,7 +70,7 @@
       <h2 class="ui header">
         <i class="remove circle icon"></i>
         <div class="content">Not stored on disk
-          <div class="sub header">Your secret is stored in memory to incease security</div>
+          <div class="sub header">Your secret is stored in memory to increase security</div>
           </div>
       </h2>
     </div>

data/lib/yopass.rb

@@ -12,12 +12,15 @@ class Yopass < Sinatra::Base
     register Sinatra::Reloader
     set :config, YAML.load_file('conf/yopass.yaml')
   end
+  configure :test do
+    set :config, YAML.load_file('conf/yopass.yaml')
+  end
   configure :production do
     set :config, YAML.load_file('/etc/yopass.yaml')
   end
   configure do
-    set :cache, Memcached.new(settings.config['memcached_url'])
     set :public_folder, File.dirname(__FILE__) + '/static'
+    set :cache, Memcached.new(settings.config['memcached_url'])
   end
 
   get '/' do
@@ -47,8 +50,13 @@ class Yopass < Sinatra::Base
     password = SecureRandom.hex[0..8]
     # encrypt secret with generated password
     data = Encryptor.encrypt(params[:secret], :key => password)
+
     # store secret in memcached
-    settings.cache.set key, data, lifetime_options[lifetime]
+    begin
+      settings.cache.set key, data, lifetime_options[lifetime]
+    rescue Memcached::ServerIsMarkedDead
+      return "Can't contact memcached"
+    end
 
     if settings.config['send_sms'] == true and !params[:mobile_number].nil?
       # strip everything except digits

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/vendor/"
+end
+require 'sinatra'
+require 'rack/test'
+
+require File.join(File.dirname(__FILE__), '../lib/yopass.rb')
+
+set :run, false
+set :raise_errors, true
+set :logging, true
+
+def app
+    Yopass
+end
+
+RSpec.configure do |config|
+    config.include Rack::Test::Methods
+end

data/spec/yopass_spec.rb

@@ -0,0 +1,57 @@
+#ENV['RACK_ENV'] = 'test'
+require 'spec_helper'
+
+describe 'yopass' do
+
+  it 'should give the website' do
+    get '/'
+    last_response.body.should match /Share Secrets Securely/
+  end
+
+  it 'should complain about invalid lifetime' do
+    post '/', params={'lifetime' => 'foo'}
+    last_response.body.should match /Invalid lifetime/
+  end
+
+  it 'should complain about missing secret' do
+    post '/', params={'lifetime' => '1h', 'secret' => ''}
+    last_response.body.should match /No secret submitted/
+  end
+
+  it 'should complain about secret being to long' do
+    post '/', params={'lifetime' => '1h', 'secret' => "0" * 10000}
+    last_response.body.should match /This site is meant to store secrets not novels/
+  end
+
+  it 'should complain about not being able to connect to memcached' do
+    post '/', params={'lifetime' => '1h', 'secret' => "0" * 100}
+    last_response.body.should match /Can't contact memcached/
+  end
+
+  it 'should store secret' do
+    Memcached.any_instance.stub(:set)
+    post '/', params={'lifetime' => '1h', 'secret' => "0" * 100}
+    last_response.body.should match /http:\/\/127.0.0.1:4567\/get\?k=/
+  end
+
+  it 'should receive secret' do
+    Memcached.any_instance.stub(:get).and_return("\xCD\xB6\xA8\xAD\x9A\x9A\xE6\xB2\xB1\\\x8EMULf\xAC")
+    Memcached.any_instance.stub(:delete)
+    get '/get?p=mykey&k=123'
+    last_response.body.should match /hello world/
+  end
+
+  it 'should raise Memcached::NotFound' do
+    Memcached.any_instance.stub(:get).and_raise(Memcached::NotFound)
+    get '/get?p=mykey&k=123'
+    last_response.body.should match /Secret does not exist/
+  end
+
+  it 'should complain about invalid decryption key' do
+    Memcached.any_instance.stub(:get).and_return("\xCD\xB6\xA8\xAD\x9A\x9A\xE6\xB2\xB1\\\x8EMULf\xAC")
+    Memcached.any_instance.stub(:delete)
+    get '/get?p=invalid&k=123'
+    last_response.body.should match /Invalid decryption key/
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yopass
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Johan Haals
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -60,8 +60,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gemspec
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
+- Rakefile
 - conf/config.ru
 - conf/yopass.yaml
 - lib/static/js/jquery.address.js
@@ -78,6 +82,12 @@ files:
 - lib/static/packaged/fonts/icons.svg
 - lib/static/packaged/fonts/icons.ttf
 - lib/static/packaged/fonts/icons.woff
+- lib/static/packaged/fonts/sans/OpenSans-Bold.ttf
+- lib/static/packaged/fonts/sans/OpenSans-Light.ttf
+- lib/static/packaged/fonts/sans/OpenSans.ttf
+- lib/static/packaged/fonts/sans/OpenSansLight-Italic.ttf
+- lib/static/packaged/fonts/sans/SourceSansPro-Bold.ttf
+- lib/static/packaged/fonts/sans/SourceSansPro-Regular.ttf
 - lib/static/packaged/images/loader-large-inverted.gif
 - lib/static/packaged/images/loader-large.gif
 - lib/static/packaged/images/loader-medium-inverted.gif
@@ -99,6 +109,8 @@ files:
 - lib/yopass.rb
 - lib/yopass/sms_provider.rb
 - lib/yopass/sms_provider/bulksms.rb
+- spec/spec_helper.rb
+- spec/yopass_spec.rb
 homepage: https://github.com/jhaals/yopass
 licenses:
 - Apache 2.0
@@ -124,4 +136,5 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Secure sharing for secrets and passwords
-test_files: []
+test_files:
+- spec/yopass_spec.rb