openshift-origin-auth-mongo 0.8.9 → 1.1.1

data/{lib/openshift-origin-auth-mongo/app → app}/controllers/account_controller.rb

@@ -12,7 +12,7 @@ class AccountController < BaseController
     Rails.logger.debug "username = #{username}, password = #{password}"
     
     if(username.nil? || password.nil? || username.strip.empty? || password.strip.empty?)
-      log_action('nil', 'nil', username, "ADD_USER", false, "Username or password not specified or empty")
+      log_action('nil', 'nil', username, "ADD_USER", true, "Username or password not specified or empty")
       @reply = RestReply.new(:unprocessable_entity)
       @reply.messages.push(Message.new(:error, "Invalid username or password", 1001, "username"))
       respond_with @reply, :status => @reply.status
@@ -20,7 +20,7 @@ class AccountController < BaseController
     end
     
     if auth_service.user_exists?(username)
-      log_action('nil', 'nil', username, "ADD_USER", false, "User '#{username}' already registered")
+      log_action('nil', 'nil', username, "ADD_USER", true, "User '#{username}' already registered")
       @reply = RestReply.new(:unprocessable_entity)
       @reply.messages.push(Message.new(:error, "Error: User '#{username}' already registered.", 1002, "id"))
       respond_with @reply, :status => @reply.status

data/bin/oo-register-user

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env oo-ruby
 require 'rubygems'
 require 'getoptlong'
 require 'active_resource'

data/{lib/openshift-origin-auth-mongo/config/initializers/openshift-origin-auth-mongo-defaults.conf → conf/openshift-origin-auth-mongo.conf.example}

@@ -1,8 +1,3 @@
-AUTH_SALT="ClWqe5zKtEW4CJEMyjzQ"
-AUTH_PRIVKEYFILE="/var/www/openshift/broker/config/server_priv.pem"
-AUTH_PRIVKEYPASS=""
-AUTH_PUBKEYFILE="/var/www/openshift/broker/config/server_pub.pem"
-
 MONGO_REPLICA_SETS=false
 # Replica set example: "<host-1>:<port-1> <host-2>:<port-2> ..."
 MONGO_HOST_PORT="localhost:27017"

data/config/initializers/openshift-origin-auth-mongo.rb

@@ -0,0 +1,61 @@
+require 'openshift-origin-common'
+
+Broker::Application.configure do
+  conf_file = File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '.conf')
+  if Rails.env.development?
+    dev_conf_file = File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '-dev.conf')
+    if File.exist? dev_conf_file
+      conf_file = dev_conf_file
+    else
+      Rails.logger.info "Development configuration for #{File.basename(__FILE__, '.rb')} not found. Using production configuration."
+    end
+  end
+  conf = OpenShift::Config.new(conf_file)
+
+  # Grab this now because we need it for the MONGO_HOST_PORT parsing.
+  replica_sets = conf.get_bool("MONGO_REPLICA_SETS", "true")
+  hp = conf.get("MONGO_HOST_PORT", "localhost:27017")
+
+  # Depending on the value of the MONGO_REPLICA_SETS setting, MONGO_HOST_PORT
+  # must follow one of two formats, as described below.
+
+  if !hp
+    raise "Broker is missing Mongo configuration."
+  elsif replica_sets
+    # The string should be of the following form:
+    #
+    #   host-1:port-1 host-2:port-2 ...
+    #
+    # We need to parse into an array of arrays:
+    #
+    #   [[<host-1>, <port-1>], [<host-2>, <port-2>], ...]
+    #
+    # where each host is a string and each port is an integer.
+
+    host_port = hp.split.map do |x|
+      (h,p) = x.split(":")
+      [h, p.to_i]
+    end
+  else
+
+    # The string should be of the following form:
+    #
+    #   host:port
+    #
+    # We need to parse into an array:
+    #
+    #   [host,port]
+    #
+    # where host is a string and port is an integer.
+
+    (h,p) = hp.split(":")
+    host_port = [h, p.to_i]
+  end
+
+  config.auth[:mongo_replica_sets] = replica_sets
+  config.auth[:mongo_host_port]    = host_port
+  config.auth[:mongo_user] = conf.get("MONGO_USER", "openshift")
+  config.auth[:mongo_password] = conf.get("MONGO_PASSWORD", "mooo")
+  config.auth[:mongo_db] = conf.get("MONGO_DB", "openshift_broker_dev")
+  config.auth[:mongo_collection] = conf.get("MONGO_COLLECTION", "auth_user")
+end

data/lib/mongo_auth_engine.rb

@@ -0,0 +1,7 @@
+require 'openshift-origin-controller'
+require 'rails'
+
+module OpenShift
+  class MongoAuthServiceEngine < ::Rails::Engine
+  end
+end

data/lib/{openshift-origin-auth-mongo/lib/openshift → openshift}/mongo_auth_service.rb

@@ -46,9 +46,9 @@ module OpenShift
     end
     
     def authenticate(request, login, password)
-      params = request.request_parameters()
-      if params['broker_auth_key'] && params['broker_auth_iv']
-        validate_broker_key(params['broker_auth_iv'], params['broker_auth_key'])
+      if request.headers['User-Agent'] == "OpenShift"
+        # password == iv, login == key
+        return validate_broker_key(password, login)
       else
         raise OpenShift::AccessDeniedException if login.nil? || login.empty? || password.nil? || password.empty?
         encoded_password = Digest::MD5.hexdigest(Digest::MD5.hexdigest(password) + @salt)

data/lib/openshift-origin-auth-mongo.rb

@@ -1,8 +1,8 @@
 module OpenShift
   module MongoAuthServiceModule
-    require 'openshift-origin-auth-mongo/engine/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+    require 'mongo_auth_engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   end
 end
 
-require "openshift-origin-auth-mongo/lib/openshift/mongo_auth_service.rb"
+require "openshift/mongo_auth_service.rb"
 OpenShift::AuthService.provider=OpenShift::MongoAuthService

data/openshift-origin-auth-mongo.gemspec

@@ -1,23 +1,26 @@
 # -*- encoding: utf-8 -*-
+config_dir  = File.join(File.join("config", "**"), "*")
+app_dir  = File.join(File.join("app", "**"), "*")
 $:.push File.expand_path("../lib", __FILE__)
 lib_dir  = File.join(File.join("lib", "**"), "*")
 test_dir  = File.join(File.join("test", "**"), "*")
 bin_dir  = File.join("bin","*")
+conf_dir  = File.join(File.join("conf", "**"), "*")
 spec_file = "rubygem-openshift-origin-auth-mongo.spec"
 
 Gem::Specification.new do |s|
   s.name        = "openshift-origin-auth-mongo"
-  s.version     = `rpm -q --qf "%{version}\n" --specfile #{spec_file}`.split[0]
-  s.license     = `rpm -q --qf "%{license}\n" --specfile #{spec_file}`.split[0]
+  s.version     = `rpm -q --define 'rhel 7' --qf "%{version}\n" --specfile #{spec_file}`.split[0]
+  s.license     = `rpm -q --define 'rhel 7' --qf "%{license}\n" --specfile #{spec_file}`.split[0]
   s.authors     = ["Krishna Raman"]
   s.email       = ["kraman@gmail.com"]
-  s.homepage    = `rpm -q --qf "%{url}\n" --specfile #{spec_file}`.split[0]
-  s.summary     = `rpm -q --qf "%{description}\n" --specfile #{spec_file}`.split[0]
-  s.description = `rpm -q --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+  s.homepage    = `rpm -q --define 'rhel 7' --qf "%{url}\n" --specfile #{spec_file}`.split[0]
+  s.summary     = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
+  s.description = `rpm -q --define 'rhel 7' --qf "%{description}\n" --specfile #{spec_file}`.split[0]
 
   s.rubyforge_project = "openshift-origin-auth-mongo"
 
-  s.files       = Dir[lib_dir] + Dir[bin_dir]
+  s.files       = Dir[lib_dir] + Dir[bin_dir] + Dir[conf_dir] + Dir[config_dir] + Dir[app_dir]
   s.test_files  = Dir[test_dir]
   s.executables = Dir[bin_dir].map {|binary| File.basename(binary)}
   s.files       += %w(README.md Rakefile Gemfile rubygem-openshift-origin-auth-mongo.spec openshift-origin-auth-mongo.gemspec LICENSE COPYRIGHT)
@@ -25,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('openshift-origin-controller')
   s.add_dependency('json')  
-  s.add_development_dependency('rake')  
+  s.add_development_dependency('rake', '>= 0.8.7', '<= 0.9.2.2')  
   s.add_development_dependency('bundler')
   s.add_development_dependency('mocha')
 end

data/rubygem-openshift-origin-auth-mongo.spec

@@ -1,146 +1,138 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname openshift-origin-auth-mongo
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-
-Summary:        OpenShift Origin plugin for mongo auth service
-Name:           rubygem-%{gemname}
-Version:        0.8.9
+%if 0%{?fedora}%{?rhel} <= 6
+    %global scl ruby193
+    %global scl_prefix ruby193-
+%endif
+%{!?scl:%global pkg_name %{name}}
+%{?scl:%scl_package rubygem-%{gem_name}}
+%global gem_name openshift-origin-auth-mongo
+%global rubyabi 1.9.1
+
+Summary:        OpenShift plugin for mongo auth service
+Name:           rubygem-%{gem_name}
+Version:        1.1.1
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
-Source0:        rubygem-%{gemname}-%{version}.tar.gz
+Source0:        rubygem-%{gem_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ruby(abi) = 1.8
-Requires:       rubygems
+Requires:       %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+Requires:       %{?scl:%scl_prefix}ruby
+Requires:       %{?scl:%scl_prefix}rubygems
+Requires:       %{?scl:%scl_prefix}rubygem(activeresource)
+Requires:       %{?scl:%scl_prefix}rubygem(json)
+Requires:       %{?scl:%scl_prefix}rubygem(mocha)
 Requires:       rubygem(openshift-origin-common)
-Requires:       rubygem(json)
-Requires:       rubygem(mocha)
 Requires:       openshift-origin-broker
-Requires:  		selinux-policy-targeted
-Requires:  		policycoreutils-python
-Obsoletes:      rubygem-swingshift-mongo-plugin
-
-BuildRequires:  ruby
-BuildRequires:  rubygems
+Requires:     selinux-policy-targeted
+Requires:     policycoreutils-python
+Requires:       openssl
+%if 0%{?fedora}%{?rhel} <= 6
+BuildRequires:  ruby193-build
+BuildRequires:  scl-utils-build
+%endif
+BuildRequires:  %{?scl:%scl_prefix}ruby(abi) = %{rubyabi}
+BuildRequires:  %{?scl:%scl_prefix}ruby 
+BuildRequires:  %{?scl:%scl_prefix}rubygems
+BuildRequires:  %{?scl:%scl_prefix}rubygems-devel
 BuildArch:      noarch
-Provides:       rubygem(%{gemname}) = %version
-
-%package -n ruby-%{gemname}
-Summary:        OpenShift Origin plugin for mongo auth service
-Requires:       rubygem(%{gemname}) = %version
-Provides:       ruby(%{gemname}) = %version
+Provides:       rubygem(%{gem_name}) = %version
+Obsoletes:      rubygem-swingshift-mongo-plugin
 
 %description
 Provides a mongo auth service based plugin
 
-%description -n ruby-%{gemname}
-Provides a mongo auth service based plugin
+%package doc
+Summary:        OpenShift plugin for mongo auth service ri documentation
+
+%description doc
+OpenShift plugin for mongo auth service ri documentation
 
 %prep
 %setup -q
 
 %build
+%{?scl:scl enable %scl - << \EOF}
+mkdir -p .%{gem_dir}
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+# gem install compiles any C extensions and installs into a directory
+# We set that to be a local directory so that we can move it into the
+# buildroot in %%install
+gem install -V \
+        --local \
+        --install-dir .%{gem_dir} \
+        --bindir ./%{_bindir} \
+        --force \
+        --rdoc \
+        %{gem_name}-%{version}.gem
+%{?scl:EOF}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-mkdir -p %{buildroot}%{ruby_sitelib}
-mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 
-# Build and install into the rubygem structure
-gem build %{gemname}.gemspec
-gem install --local --install-dir %{buildroot}%{gemdir} --force %{gemname}-%{version}.gem
-
-# Move the gem binaries to the standard filesystem location
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}%{_bindir}
-rm -rf %{buildroot}%{gemdir}/bin
-
-# Symlink into the ruby site library directories
-ln -s %{geminstdir}/lib/%{gemname} %{buildroot}%{ruby_sitelib}
-ln -s %{geminstdir}/lib/%{gemname}.rb %{buildroot}%{ruby_sitelib}
+# If there were programs installed:
+mkdir -p %{buildroot}/usr/bin
+cp -a ./%{_bindir}/* %{buildroot}/usr/bin
 
 mkdir -p %{buildroot}/etc/openshift/plugins.d
-cp lib/openshift-origin-auth-mongo/config/initializers/openshift-origin-auth-mongo-defaults.conf %{buildroot}/etc/openshift/plugins.d/openshift-origin-auth-mongo.conf
+cp %{buildroot}/%{gem_instdir}/conf/openshift-origin-auth-mongo.conf.example %{buildroot}/etc/openshift/plugins.d/
+
 
 %clean
 rm -rf %{buildroot}
 
-%post
-/usr/bin/openssl genrsa -out /var/www/openshift/broker/config/server_priv.pem 2048
-/usr/bin/openssl rsa    -in /var/www/openshift/broker/config/server_priv.pem -pubout > /var/www/openshift/broker/config/server_pub.pem
-
 %files
 %defattr(-,root,root,-)
-%dir %{geminstdir}
-%doc %{geminstdir}/Gemfile
-%{gemdir}/doc/%{gemname}-%{version}
-%{gemdir}/gems/%{gemname}-%{version}
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%{_bindir}/*
-%config(noreplace) %{_sysconfdir}/openshift/plugins.d/openshift-origin-auth-mongo.conf
-
-%files -n ruby-%{gemname}
-%{ruby_sitelib}/%{gemname}
-%{ruby_sitelib}/%{gemname}.rb
+%doc LICENSE COPYRIGHT Gemfile
+%exclude %{gem_cache}
+%{gem_instdir}
+%{gem_spec}
+/usr/bin/*
+/etc/openshift/plugins.d/openshift-origin-auth-mongo.conf.example
+
+%files doc
+%doc %{gem_docdir}
 
 %changelog
+* Fri Jan 11 2013 Troy Dawson <tdawson@redhat.com> 1.1.1-1
+- updated gemspecs so they work with scl rpm spec files. (tdawson@redhat.com)
+- more changes for US3078 (abhgupta@redhat.com)
+- fix elif typos (dmcphers@redhat.com)
+- add oo-ruby (dmcphers@redhat.com)
+- more ruby1.9 changes (dmcphers@redhat.com)
+- add config to gemspec (dmcphers@redhat.com)
+- Moving plugins to Rails 3.2.8 engine (kraman@gmail.com)
+- getting specs up to 1.9 sclized (dmcphers@redhat.com)
+- specifying rake gem version range (abhgupta@redhat.com)
+- Bug 871436 - moving the default path for AUTH_PRIVKEYFILE and AUTH_PUBKEYFILE
+  under /etc (bleanhar@redhat.com)
+- fix an ss reference (dmcphers@redhat.com)
+- Moving broker config to /etc/openshift/broker.conf Rails app and all oo-*
+  scripts will load production environment unless the
+  /etc/openshift/development marker is present Added param to specify default
+  when looking up a config value in OpenShift::Config Moved all defaults into
+  plugin initializers instead of separate defaults file No longer require
+  loading 'openshift-origin-common/config' if 'openshift-origin-common' is
+  loaded openshift-origin-common selinux module is merged into F16 selinux
+  policy. Removing from broker %%postrun (kraman@gmail.com)
+- BZ847976 - Fixing Jenkins integration (bleanhar@redhat.com)
+- Fixed broker/node setup scripts to install cgroup services. Fixed
+  mcollective-qpid plugin so it installs during origin package build. Updated
+  cgroups init script to work with both systemd and init.d Updated oo-trap-user
+  script Renamed oo-cgroups to openshift-cgroups (service and init.d) and
+  created oo-admin-ctl-cgroups Pulled in oo-get-mcs-level and abstract/util
+  from origin-selinux branch Fixed invalid file path in rubygem-openshift-
+  origin-auth-mongo spec Fixed invlaid use fo Mcollective::Config in
+  mcollective-qpid-plugin (kraman@gmail.com)
+
 * Thu Oct 11 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.9-1
 - fix for mongo auth plugin spec file (abhgupta@redhat.com)
 - Centralize plug-in configuration (miciah.masters@gmail.com)
 - Removing old build scripts Moving broker/node setup utilities into util
   packages Fix Auth service module name conflicts (kraman@gmail.com)
 - Merge pull request #613 from kraman/master (openshift+bot@redhat.com)
-- Module name and gem path fixes for auth plugins (kraman@gmail.com)
-
-* Mon Oct 08 2012 Dan McPherson <dmcphers@redhat.com> 0.8.8-1
-- 
-
-* Fri Oct 05 2012 Krishna Raman <kraman@gmail.com> 0.8.7-1
-- new package built with tito
-
-* Mon Aug 20 2012 Brenton Leanhardt <bleanhar@redhat.com> 0.8.6-1
-- gemspec refactorings based on Fedora packaging feedback (bleanhar@redhat.com)
-- Providing a better error message for invalid broker iv/token
-  (kraman@gmail.com)
-- fix for cartridge-jenkins_build.feature cucumber test (abhgupta@redhat.com)
-- Bug 836055 - Bypass authentication by making a direct request to broker with
-  broker_auth_key (kraman@gmail.com)
-- MCollective updates - Added mcollective-qpid plugin - Added mcollective-
-  msg-broker plugin - Added mcollective agent and facter plugins - Added
-  option to support ignoring node profile - Added systemu dependency for
-  mcollective-client (kraman@gmail.com)
-- Updated gem info for rails 3.0.13 (admiller@redhat.com)
-
-* Wed May 30 2012 Krishna Raman <kraman@gmail.com> 0.8.5-1
-- Fix for Bugz 825366, 825340. SELinux changes to allow access to
-  user_action.log file. Logging authentication failures and user creation for
-  OpenShift Origin (abhgupta@redhat.com)
-- Raise auth exception when no user/password is provided by web browser. Bug
-  815971 (kraman@gmail.com)
-- Adding livecd build scripts Adding a text only minimal version of livecd
-  Added ability to access livecd dns from outside VM (kraman@gmail.com)
-- Merge pull request #19 from kraman/dev/kraman/bug/815971
-  (dmcphers@redhat.com)
-- Fix bug in mongo auth service where auth failure is returning nil instead of
-  Exception (kraman@gmail.com)
-- Adding a seperate message for errors returned by cartridge when trying to add
-  them. Fixing CLIENT_RESULT error in node Removing tmp editor file
-  (kraman@gmail.com)
-- Added tests (kraman@gmail.com)
-- BugZ# 817957. Adding rest api for creating a user in the mongo auth service.
-  Rest API will be accessabel only from local host and will require login/pass
-  of an existing user. (kraman@gmail.com)
-- moving broker auth key and iv encoding/decoding both into the plugin
-  (abhgupta@redhat.com)
-
-* Thu Apr 26 2012 Krishna Raman <kraman@gmail.com> 0.8.4-1
-- Added README for OpenShift Origin-mongo plugin (rpenta@redhat.com)
-- cleaning up spec files (dmcphers@redhat.com)
-- decoding the broker auth key before returning from login in the auth plugin
-  (abhgupta@redhat.com)
-
-* Sat Apr 21 2012 Krishna Raman <kraman@gmail.com> 0.8.3-1
-- new package built with tito
+- Module name and gem path fixes for auth plugins (kraman@gmail.com)

data/test/dummy/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.13'
+gem 'rails', '3.2.8'
 gem 'openshift-origin-auth-mongo'
 gem 'mocha'
 # Bundle edge Rails instead:

data/test/dummy/script/rails

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env oo-ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-auth-mongo
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 17
   prerelease: false
   segments: 
-  - 0
-  - 8
-  - 9
-  version: 0.8.9
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 -04:00
+date: 2013-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -98,15 +109,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/openshift-origin-auth-mongo/engine/engine.rb
-- lib/openshift-origin-auth-mongo/app/models/rest_account.rb
-- lib/openshift-origin-auth-mongo/app/controllers/account_controller.rb
-- lib/openshift-origin-auth-mongo/config/routes.rb
-- lib/openshift-origin-auth-mongo/config/initializers/openshift-origin-auth-mongo-defaults.conf
-- lib/openshift-origin-auth-mongo/config/initializers/openshift-origin-auth-mongo.rb
-- lib/openshift-origin-auth-mongo/lib/openshift/mongo_auth_service.rb
+- lib/mongo_auth_engine.rb
+- lib/openshift/mongo_auth_service.rb
 - lib/openshift-origin-auth-mongo.rb
 - bin/oo-register-user
+- conf/openshift-origin-auth-mongo.conf.example
+- config/routes.rb
+- config/initializers/openshift-origin-auth-mongo.rb
+- app/models/rest_account.rb
+- app/controllers/account_controller.rb
 - test/functional/account_controller_test.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/controllers/application_controller.rb

data/lib/openshift-origin-auth-mongo/config/initializers/openshift-origin-auth-mongo.rb

@@ -1,62 +0,0 @@
-require 'openshift-origin-common/config'
-
-Broker::Application.configure do
-  conf = OpenShift::Config.new(File.join(OpenShift::Config::PLUGINS_DIR, File.basename(__FILE__, '.rb') + '.conf'))
-  defaults = OpenShift::Config.new(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb') + '-defaults.conf'))
-
-  # Grab this now because we need it for the MONGO_HOST_PORT parsing.
-  replica_sets = conf.get_bool("MONGO_REPLICA_SETS") || defaults.get_bool("MONGO_REPLICA_SETS")
-
-  hp = conf.get("MONGO_HOST_PORT") || defaults.get("MONGO_HOST_PORT")
-
-  # Depending on the value of the MONGO_REPLICA_SETS setting, MONGO_HOST_PORT
-  # must follow one of two formats, as described below.
-
-  if !hp
-    raise "Broker is missing Mongo configuration."
-  elif replica_sets
-    # The string should be of the following form:
-    #
-    #   host-1:port-1 host-2:port-2 ...
-    #
-    # We need to parse into an array of arrays:
-    #
-    #   [[<host-1>, <port-1>], [<host-2>, <port-2>], ...]
-    #
-    # where each host is a string and each port is an integer.
-
-    host_port = hp.split.map do |x|
-      (h,p) = x.split(":")
-      [h, p.to_i]
-    end
-  else
-
-    # The string should be of the following form:
-    #
-    #   host:port
-    #
-    # We need to parse into an array:
-    #
-    #   [host,port]
-    #
-    # where host is a string and port is an integer.
-
-    (h,p) = hp.split(":")
-    host_port = [h, p.to_i]
-  end
-
-  config.auth = {
-    :salt => conf.get("AUTH_SALT") || defaults.get("AUTH_SALT"),
-    :privkeyfile => conf.get("AUTH_PRIVKEYFILE") || defaults.get("AUTH_PRIVKEYFILE"),
-    :privkeypass => conf.get("AUTH_PRIVKEYPASS") || defaults.get("AUTH_PRIVKEYPASS"),
-    :pubkeyfile  => conf.get("AUTH_PUBKEYFILE") || defaults.get("AUTH_PUBKEYFILE"),
-
-    :mongo_replica_sets => replica_sets,
-    :mongo_host_port => host_port,
-
-    :mongo_user => conf.get("MONGO_USER") || defaults.get("MONGO_USER"),
-    :mongo_password => conf.get("MONGO_PASSWORD") || defaults.get("MONGO_PASSWORD"),
-    :mongo_db => conf.get("MONGO_DB") || defaults.get("MONGO_DB"),
-    :mongo_collection => conf.get("MONGO_COLLECTION") || defaults.get("MONGO_COLLECTION")
-  }
-end

data/lib/openshift-origin-auth-mongo/engine/engine.rb

@@ -1,12 +0,0 @@
-require 'openshift-origin-controller'
-require 'rails'
-
-module OpenShift
-  class MongoAuthServiceEngine < Rails::Engine
-    paths.app.controllers      << "lib/openshift-origin-auth-mongo/app/controllers"
-    paths.lib                  << "lib/openshift-origin-auth-mongo/lib"
-    paths.config               << "lib/openshift-origin-auth-mongo/config"
-    paths.app.models           << "lib/openshift-origin-auth-mongo/app/models"    
-    config.autoload_paths      += %W(#{config.root}/lib)
-  end
-end