singularity 0.0.7 → 0.1.0

data/lib/singularity.rb

@@ -1,9 +1,7 @@
 require 'rubygems'
-require 'redis_hash'
+require 'redis'
 require 'securerandom'
 
-require_relative 'global_user'
-
 module Singularity
   def self.cattr_accessor(attribute, default = nil)
     class_variable_set("@@#{attribute}", default)
@@ -18,10 +16,10 @@ module Singularity
     EOS
   end
 
-  #cattr_accessor :user_class, IG::User::GlobalUser
   cattr_accessor :auth_path, "http://authmaster.local:9292/api"
   cattr_accessor :master, false
   cattr_accessor :session_prefix, "rack_session"
+  cattr_accessor :profile_prefix, "profile"
   cattr_accessor :token_prefix, "singularity_session_token"
   cattr_accessor :warden_user_key, "warden.user.default.key"
 
@@ -80,9 +78,7 @@ module Singularity
     end
 
     def redis
-      @@redis ||= Redis::NativeHash.redis # JUNK
+      @redis ||= Redis.current
     end
   end
 end
-
-require 'singularity/engine' if defined?(Rails)

data/lib/singularity/password_hash.rb

@@ -19,12 +19,13 @@ module Singularity
       digest_algorithm.length
     end
 
-    def self.generate(password, salt)
-      OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, key_length, digest_algorithm).unpack('H*').first
+    def self.generate(password, salt, options = {})
+      iters = options.fetch(:iterations, iterations)
+      OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iters, key_length, digest_algorithm).unpack('H*').first
     end
 
-    def matches?(password, salt)
-      Rack::Utils.secure_compare digest, self.class.generate(password, salt)
+    def matches?(password, salt, options = {})
+      Rack::Utils.secure_compare digest, self.class.generate(password, salt, options)
     end
   end
-end
+end

data/lib/singularity/profile.rb

@@ -0,0 +1,66 @@
+require 'redis/hash_key'
+require 'forwardable'
+require 'singularity/password_hash'
+
+module Singularity
+  class Profile
+    extend Forwardable
+
+    attr_reader :prefix, :identity, :redis
+
+    def initialize(identity, options = {})
+      raise ArgumentError, "identity must be present" unless identity.to_s.length > 0
+
+      @prefix       = options.fetch(:prefix) { Singularity.profile_prefix }
+      @identity     = identity
+      @redis        = options.fetch(:redis) { Redis.current }
+    end
+
+    def_delegators :profile, :[], :[]=
+    def_delegators :profile, :all, :bulk_get, :bulk_set, :each, :empty?, :fetch
+    def_delegators :profile, :has_key?, :include?, :incr, :incrby, :key, :key?
+    def_delegators :profile, :keys, :member?, :vals, :values, :clear
+
+    def password_hash
+      self['password_hash']
+    end
+
+    def password_hash=(value)
+      self['password_hash'] = value
+    end
+
+    def password_salt
+      self['password_salt']
+    end
+
+    def password_salt=(value)
+      self['password_salt'] = value
+    end
+
+    def password_iterations
+      iters = self['password_iterations'].to_i
+      iters = PasswordHash.iterations unless iters > 0
+
+      iters
+    end
+
+    def password_iterations=(value)
+      self['password_iterations'] = value
+    end
+
+    def password?(value)
+      return false unless password_hash.to_s.length > 0
+      return false unless password_salt.to_s.length > 0
+
+      PasswordHash.new(password_hash).matches?(value, password_salt, iterations: password_iterations)
+    end
+
+  private
+
+    def profile
+      @profile ||= Redis::HashKey.new("#{ prefix }:#{ identity }", marshal: true).tap do |hash|
+        hash.instance_variable_set(:@redis, redis)
+      end
+    end
+  end
+end

data/lib/singularity/version.rb

@@ -1,3 +1,3 @@
 module Singularity
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/singularity/profile_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'singularity'
+require 'singularity/profile'
+
+describe Singularity::Profile do
+  let(:redis) { MockRedis.new }
+
+  subject { Singularity::Profile.new('me@example.com', redis: redis) }
+
+  it "provides #password_hash" do
+    expect{ subject.password_hash = 'foobar' }.to_not raise_error
+    expect( subject.password_hash ).to eq 'foobar'
+  end
+
+  it "provides #password_salt" do
+    expect{ subject.password_salt = 'baz' }.to_not raise_error
+    expect( subject.password_salt ).to eq 'baz'
+  end
+
+  it "provides #password_iterations" do
+    expect{ subject.password_iterations = 15_000 }.to_not raise_error
+    expect( subject.password_iterations ).to eq 15_000
+  end
+
+  it "password_iterations returns default iterations if zero" do
+    subject.password_iterations = 0
+    expect( subject.password_iterations ).to eq Singularity::PasswordHash.iterations
+  end
+
+  it "passes through [] methods to profile hash" do
+    subject['foo'] = 'bar'
+    expect( redis.hget('profile:me@example.com', 'foo') ).to eq 'bar'
+  end
+
+  it "provides #password?" do
+    subject.password_salt       = SecureRandom.hex(32)
+    subject.password_iterations = 25_000
+    subject.password_hash       = Singularity::PasswordHash.generate('passw0rd', subject.password_salt, iterations: 25_000)
+
+    expect( subject.password?('passw0rd') ).to be true
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+require 'mock_redis'

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: singularity
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Carl Zulauf
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis-native_hash
+  name: redis-objects
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,108 +23,113 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mock_redis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 description: Singularity helps you keep users logged in across many domains
 email:
-- czulauf@lyconic.com
 - alassek@lyconic.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- Rakefile
-- lib/assets/javascripts/singularity.js.erb
-- lib/global_user.rb
-- lib/singularity.rb
-- lib/singularity/engine.rb
 - lib/singularity/password_hash.rb
+- lib/singularity/profile.rb
 - lib/singularity/version.rb
-- singularity.gemspec
+- lib/singularity.rb
+- spec/singularity/profile_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/lyconic/singularity
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: multi-domain single sign on
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTZmY2IxNDdmMzIyYTg2YjM2MGMxY2MwNDgwZTI3NjcwMzZiZWMzNQ==
-  data.tar.gz: !binary |-
-    MzAyMWEyMjdlNWIzNGYyZGViOTU1ZTE3ZjQyOTg2ZTFkMzcwNTEwMg==
-SHA512:
-  metadata.gz: !binary |-
-    ODk1MzdmM2FiMzNhMmJjZTk1NWNiZjk4ZDhlZjY3OTIwYjljMTMyMmRlODlm
-    ZjA0MTQxNjVjZjNhMTVkYTg2ODdlNjVkMDU0ZDc0YTNiMGI4Mjc3M2U2NTQ1
-    ZGFiOWMxNDgzNzU0YTJlYmU2YmQxNDExN2RkYjZhYzM4MzJkOWE=
-  data.tar.gz: !binary |-
-    MTk0MDdmMGVkYjQ5ZmM1ZjJjYjhiNTZjN2UzZjRkODUxNDE0Y2MxODQ0N2Jh
-    NTVmODBjN2RhNDY2NjMxMTQwMjljMmRhYzk5OTQ1ZDQyZTA1MjcyZTJkNTE3
-    OTFjYTZkYTJmZjlkMTdjMDIxZThlN2E2YWZlZGJlMTJkYTAxODc=

data/.gitignore

@@ -1,4 +0,0 @@
-pkg/
-*.swp
-*.swo
-.DS_Store

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-

data/Gemfile.lock

@@ -1,82 +0,0 @@
-PATH
-  remote: .
-  specs:
-    singularity (0.0.2)
-      jquery-rails (~> 1.0)
-      railties (~> 3.1)
-      redis-native_hash
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    json (1.6.3)
-    multi_json (1.0.4)
-    rack (1.3.5)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.11)
-      json (~> 1.4)
-    redis (2.2.2)
-    redis-native_hash (0.1.0)
-      redis (>= 2.0.0)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    thor (0.14.6)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  rspec (~> 2.3.0)
-  singularity!

data/Rakefile

@@ -1,36 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "singularity #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/lib/assets/javascripts/singularity.js.erb

@@ -1,59 +0,0 @@
-var Singularity = (function () {
-
-  this.master_auth   = "<%= Singularity.auth_path %>";
-  this.logged_in     = false;
-  this.session_token = '';
-
-  this.extend = function ( options ) {
-    jQuery.extend( true, this, options );
-  }
-
-  this.init = function ( command ) {
-    if ( this.logged_in === true )
-    if ( command === 'register' ) {
-      this.registerMasterAuth();
-    }
-
-    if ( this.logged_in === false )
-    if ( command === 'lookup' ) {
-      this.checkMasterAuth();
-    }
-  }
-
-  function login ( result ) {
-    $(Singularity).trigger(result['logged_in'] ? 'login.success' : 'login.failure')
-  }
-
-  function register ( result ) {
-    $(Singularity).trigger(result['logged_in'] ? 'register.success' : 'register.failure');
-  }
-
-  var xhr, timeout;
-
-  this.checkMasterAuth = function () {
-    $(this).trigger('lookup');
-
-    var url = this.master_auth + '/lookup?token=' + this.session_token + '&callback=?';
-    xhr     = $.getJSON(url).then(login).fail(function () { $(Singularity).trigger('login.failure') });
-    timeout = setTimeout(requestTimeout, 5000);
-
-    return xhr;
-  }
-
-  function requestTimeout () {
-    if ( xhr.readyState !== 4 ) xhr.abort();
-  }
-
-  this.registerMasterAuth = function () {
-    $(this).trigger('register');
-
-    var url = this.master_auth + '/register?token=' + this.session_token + '&callback=?';
-    return xhr = $.getJSON(url).then(register).fail(function () { $(Singularity).trigger('register.failure') });
-  }
-
-  $(this).on('login.success', function () { window.location.reload(true) });
-  $(this).on('login.success login.failure', function () { clearTimeout(timeout) });
-
-  return this;
-
-}).apply({});

data/lib/global_user.rb

@@ -1,32 +0,0 @@
-require 'singularity/password_hash'
-
-class GlobalUser < Redis::NativeHash
-  attr_persist :login, :password_hash
-
-  def initialize(data = {})
-    super(namespace)
-    update(data)
-  end
-
-  def namespace; :global_user; end
-
-  def salt
-    self[:password_salt] ||= SecureRandom.hex(32)
-  end
-
-  def password=(value)
-    self[:password_hash] = Singularity::PasswordHash.generate(value, salt)
-  end
-
-  def password?(value)
-    return false unless value.present?
-    return false unless self[:password_hash].present?
-    Singularity::PasswordHash.new(self[:password_hash]).matches?(value, salt)
-  end
-
-  def save
-    self.key = login unless login.nil?
-    super
-  end
-end
-

data/lib/singularity/engine.rb

@@ -1,5 +0,0 @@
-require 'singularity/version'
-
-module Singularity
-  class Engine < ::Rails::Engine; end
-end

data/singularity.gemspec

@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/singularity/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name         = "singularity"
-  s.homepage     = "https://github.com/lyconic/singularity"
-  s.version      = Singularity::VERSION
-  s.platform     = Gem::Platform::RUBY
-  s.authors      = ["Carl Zulauf", "Adam Lassek"]
-  s.email        = ["czulauf@lyconic.com", "alassek@lyconic.com"]
-  s.summary      = "multi-domain single sign on"
-  s.description  = "Singularity helps you keep users logged in across many domains"
-  s.files        = `git ls-files`.split("\n")
-  s.licenses     = ["MIT"]
-  s.require_path = "lib"
-
-  s.add_dependency "redis-native_hash", ">= 0"
-  s.add_dependency "railties", ">= 3.1"
-  s.add_dependency "jquery-rails"
-
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "rspec", "~> 2.3.0"
-end
-