contour 2.7.0 → 3.0.0.beta1

data/app/views/contour/authentications/_authentications.html.erb

@@ -1,3 +0,0 @@
-<div id="authentications">
-  <%= render partial: 'contour/authentications/add_remove_table' %>
-</div>

data/app/views/contour/authentications/_menu.html.erb

@@ -1,10 +0,0 @@
-<% PROVIDERS.each do |provider| %>
-  <% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
-  <% image_name = provider.to_s.downcase %>
-  <li>
-    <a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %>">
-      <%= image_tag "contour/#{image_name}_32.png", align: 'absmiddle', height: "28px", title: provider_name %>
-      <%= provider_name %>
-    </a>
-  </li>
-<% end %>

data/app/views/contour/authentications/destroy.js.erb

@@ -1 +0,0 @@
-$("#authentications").html("<%= escape_javascript(render("contour/authentications/add_remove_table")) %>");

data/app/views/contour/authentications/index.html.erb

@@ -1,6 +0,0 @@
-<% @title = "Authentications" %>
-<div class="page-header">
-  <h1><%= @title %></h1>
-</div>
-
-<%= render partial: 'contour/authentications/authentications' %>

data/app/views/contour/layouts/_latest_news.html.erb

@@ -1,17 +0,0 @@
-<% unless @news_feed.blank? %>
-  <div class="page-header">
-    <h1>
-      Latest News
-      <%#= link_to @news_feed.channel.title, @news_feed.channel.link, target: '_blank', class: 'btn btn-xs' %>
-    </h1>
-  </div>
-
-  <% @news_feed.items.each_with_index do |item, i| %>
-    <% if i < Contour.news_feed_items.to_i %>
-      <div class="well">
-        <label><%= link_to item.title, item.link, target: '_blank' %></label><br />
-        <ul style="list-style: none"><li><%= item.description.gsub("[...]", link_to('[read more]', item.link, target: '_blank')).html_safe %></li></ul>
-      </div>
-    <% end %>
-  <% end %>
-<% end %>

data/lib/contour/fixes/devise-with-rails-4-2.rb

@@ -1,17 +0,0 @@
-module ActionDispatch::Routing
-  class Mapper
-
-    protected
-      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
-        current_scope = @scope.dup
-
-        exclusive = { as: new_as, path: new_path, module: nil }
-        exclusive.merge!(options.slice(:constraints, :defaults, :options))
-
-        exclusive.each_pair { |key, value| @scope[key] = value }
-        yield
-      ensure
-        @scope = current_scope
-      end
-  end
-end

data/lib/contour/fixes/omniauth.rb

@@ -1,110 +0,0 @@
-require 'omniauth'
-require 'omniauth-ldap'
-
-# # Overwriting methods from Rack
-# # While OmniAuth 1.0.2 fixes the Builder setup, Rack 1.4.0 still responds incorrectly to it's release version.
-# # Wait for Rack 1.4.1 or updated version before removing the Builder fixes
-# module OmniAuth
-
-#   # class Builder updates for Rack 1.4.0
-#   class Builder
-#     def initialize(app = nil,&block)
-#       @use, @map, @run = [], nil, app
-#       instance_eval(&block) if block_given?
-#     end
-
-#     def on_failure(&block)
-#       OmniAuth.config.on_failure = block
-#     end
-
-#     def configure(&block)
-#       OmniAuth.configure(&block)
-#     end
-
-#     def provider(klass, *args, &block)
-#       if klass.is_a?(Class)
-#         middleware = klass
-#       else
-#         begin
-#           middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
-#         rescue NameError
-#           raise LoadError, "Could not find matching strategy for #{klass.inspect}. You may need to install an additional gem (such as omniauth-#{klass})."
-#         end
-#       end
-
-#       use middleware, *args, &block
-#     end
-
-#     def call(env)
-#       to_app.call(env)
-#     end
-#   end
-# end
-
-# Fix for LDAP Authentication with Domains
-module OmniAuth
-
-  # Required to correctly authenticate given bind_dn and LDAP
-  module LDAP
-    class Adaptor
-      class LdapError < StandardError; end
-      class ConfigurationError < StandardError; end
-      class AuthenticationError < StandardError; end
-      class ConnectionError < StandardError; end
-
-      attr_accessor :bind_dn, :password
-      attr_reader :connection, :uid, :base, :auth
-      def self.validate(configuration={})
-        message = []
-        MUST_HAVE_KEYS.each do |name|
-           message << name if configuration[name].nil?
-        end
-        raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
-      end
-
-      def bind_as(args = {})
-        result = false
-        ldap = @connection
-        ldap.auth args[:username], args[:password]
-        rs = ldap.search(base: args[:base], filter: Net::LDAP::Filter.eq(@uid, args[:username].split('\\').last.to_s))
-        result = rs.first if rs
-        result
-      end
-
-    end
-  end
-
-  # Required for proper script name for suburis
-  # Required for appending domain option to user credentials
-  module Strategies
-    class LDAP
-      include OmniAuth::Strategy
-
-      option :domain, ''
-
-      def request_phase
-        OmniAuth::LDAP::Adaptor.validate @options
-        f = OmniAuth::Form.new( title: (options[:title] || "LDAP Authentication"), url: "#{@env['SCRIPT_NAME']}" + callback_path ) # Modified to include @env['SCRIPT_NAME']
-        f.text_field 'Login', 'username'
-        f.password_field 'Password', 'password'
-        f.button "Sign In"
-        f.to_response
-      end
-
-      def callback_phase
-        bind_dn = "#{@options[:domain] + '\\' unless @options[:domain].blank?}#{request['username']}" # Added
-        @options[:bind_dn] = bind_dn if @options[:bind_dn].blank? # Added
-        @adaptor = OmniAuth::LDAP::Adaptor.new @options
-        raise MissingCredentialsError.new("Missing login credentials") if request['username'].nil? || request['password'].nil?
-        begin
-          @ldap_user_info = @adaptor.bind_as(base: @adaptor.base, username: bind_dn, password: request['password']) # Modified
-          return fail!(:invalid_credentials) if !@ldap_user_info
-          @user_info = self.class.map_user(@@config, @ldap_user_info)
-          super
-        rescue Exception => e
-          return fail!(:ldap_error, e)
-        end
-      end
-    end
-  end
-end

data/lib/contour/fixes/sass-rails.rb

@@ -1,8 +0,0 @@
-require 'sass/rails'
-
-class Sass::Rails::Importer
-  def sass_file? filename
-    filename = filename.to_s
-    SASS_EXTENSIONS.keys.any?{|ext| filename.match /#{ext}$/}
-  end
-end

data/lib/generators/contour/install/templates/omniauth.rb

@@ -1,33 +0,0 @@
-require 'omniauth-openid'
-require 'omniauth-ldap'
-# require 'omniauth-twitter'
-# require 'omniauth-facebook'
-# require 'omniauth-linkedin'
-# require 'omniauth-cas'
-
-require 'openid/store/filesystem'
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :open_id, store: OpenID::Store::Filesystem.new('/tmp'), name: 'google_apps', identifier: 'https://www.google.com/accounts/o8/id'
-  provider :open_id, store: OpenID::Store::Filesystem.new('/tmp')
-  provider :LDAP, host: 'ldap.example.com', port: 389, method: :plain, base: 'cn=users,dc=example,dc=com', uid: 'sAMAccountName', domain: '' #, try_sasl: true, sasl_mechanisms: "GSS-SPNEGO"
-
-  # provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  # provider :facebook, 'APP_ID', 'APP_SECRET'
-  # provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  # provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
-
-  # Other providers will need gems added in your Gemfile, and the provider configured in this block.
-  #   https://github.com/intridea/omniauth/wiki/List-of-Strategies
-end
-
-# This list will show the first choice as the default, and the rest as potential secondary login methods.
-PROVIDERS = [:google_apps, :open_id, :LDAP, :twitter, :facebook, :linked_in, :cas]
-
-# LDAP
-# :port (required) - The LDAP server port.
-# :method (required) - May be :plain, :ssl, or :tls.
-# :base (required) - The distinguished name (DN) for your organization; all users should be searchable under this base.
-# :uid (required) - The LDAP attribute name for the user name in the login form. Typically AD would be 'sAMAccountName' or 'UniquePersonalIdentifier', while OpenLDAP is 'uid'. You can also use 'dn' for the user to put in the dn in the login form (but usually is too long for user to remember or know).
-# :domain - Enter to keep users from having to enter the LDAP domain, usually in the form domain\username. Backslash will be appended automatically.
-# :try_sasl - Try to use SASL connection to server.
-# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'

data/test/controllers/authentications_controller_test.rb

@@ -1,57 +0,0 @@
-require 'test_helper'
-
-SimpleCov.command_name "test:functionals"
-
-class Contour::AuthenticationsControllerTest < ActionController::TestCase
-  setup do
-    login(users(:valid))
-    @request.env["omniauth.auth"] = {'provider' => 'google_apps', 'info'=> {'email' => 'test@example.com'}}
-    @authentication = authentications(:open_id)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
-
-  # TODO: Remove
-  # test "should get new" do
-  #   get :new
-  #   assert_response :success
-  # end
-
-  # TODO Redirects to Authentication Controller if user logged in, if not redirect to user sign up.
-  test "should create authentication" do
-    assert_difference('Authentication.count') do
-      post :create, authentication: @authentication.attributes
-    end
-
-    assert_redirected_to authentications_path
-  end
-
-  # TODO: Remove
-  # test "should show authentication" do
-  #   get :show, id: @authentication.to_param
-  #   assert_response :success
-  # end
-
-  # TODO: Remove
-  # test "should get edit" do
-  #   get :edit, id: @authentication.to_param
-  #   assert_response :success
-  # end
-
-  # TODO: Remove
-  # test "should update authentication" do
-  #   put :update, id: @authentication.to_param, authentication: @authentication.attributes
-  #   assert_redirected_to authentication_path(assigns(:authentication))
-  # end
-
-  test "should destroy authentication" do
-    assert_difference('Authentication.count', -1) do
-      delete :destroy, id: @authentication, format: 'js'
-    end
-
-    assert_template 'destroy'
-  end
-end

data/test/dummy/config/initializers/omniauth.rb

@@ -1,33 +0,0 @@
-require 'omniauth-openid'
-require 'omniauth-ldap'
-# require 'omniauth-twitter'
-# require 'omniauth-facebook'
-# require 'omniauth-linkedin'
-# require 'omniauth-cas'
-
-require 'openid/store/filesystem'
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :open_id, store: OpenID::Store::Filesystem.new('/tmp'), name: 'google_apps', identifier: 'https://www.google.com/accounts/o8/id'
-  provider :open_id, store: OpenID::Store::Filesystem.new('/tmp')
-  provider :LDAP, host: 'ldap.example.com', port: 389, method: :plain, base: 'cn=users,dc=example,dc=com', uid: 'sAMAccountName', domain: '' #, try_sasl: true, sasl_mechanisms: "GSS-SPNEGO"
-
-  # provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  # provider :facebook, 'APP_ID', 'APP_SECRET'
-  # provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  # provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
-
-  # Other providers will need gems added in your Gemfile, and the provider configured in this block.
-  #   https://github.com/intridea/omniauth/wiki/List-of-Strategies
-end
-
-# This list will show the first choice as the default, and the rest as potential secondary login methods.
-PROVIDERS = [:google_apps, :open_id, :LDAP, :twitter, :facebook, :linked_in, :cas]
-
-# LDAP
-# :port (required) - The LDAP server port.
-# :method (required) - May be :plain, :ssl, or :tls.
-# :base (required) - The distinguished name (DN) for your organization; all users should be searchable under this base.
-# :uid (required) - The LDAP attribute name for the user name in the login form. Typically AD would be 'sAMAccountName' or 'UniquePersonalIdentifier', while OpenLDAP is 'uid'. You can also use 'dn' for the user to put in the dn in the login form (but usually is too long for user to remember or know).
-# :domain - Enter to keep users from having to enter the LDAP domain, usually in the form domain\username. Backslash will be appended automatically.
-# :try_sasl - Try to use SASL connection to server.
-# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'

data/test/dummy/db/migrate/20111203203307_create_authentications.rb

@@ -1,11 +0,0 @@
-class CreateAuthentications < ActiveRecord::Migration
-  def change
-    create_table :authentications do |t|
-      t.integer :user_id
-      t.string :provider
-      t.string :uid
-
-      t.timestamps
-    end
-  end
-end

data/test/dummy/test/fixtures/authentications.yml

@@ -1,16 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-open_id:
-  user: valid
-  provider: open_id
-  uid: open_id@open_id.com
-
-google_apps:
-  user: valid
-  provider: google_apps
-  uid: test@gmail.com
-
-ldap:
-  user: valid
-  provider: ldap
-  uid: "CN=ldapid,CN=Users,DC=example,DC=com"

data/test/models/authentication_test.rb

@@ -1,11 +0,0 @@
-require 'test_helper'
-
-class AuthenticationTest < ActiveSupport::TestCase
-  test "should get provider name and handle OpenID special case" do
-    assert_equal 'OpenID', authentications(:open_id).provider_name
-  end
-
-  test "should get provider name" do
-    assert_equal 'Google Apps', authentications(:google_apps).provider_name
-  end
-end