strelka 0.0.1.pre.254 → 0.0.1.pre.257

data/ChangeLog

@@ -1,12 +1,50 @@
+2012-06-04  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/auth.rb, lib/strelka/authprovider/hostaccess.rb,
+	spec/strelka/authprovider/hostaccess_spec.rb:
+	Fix required arguments for the hostaccess auth provider.
+	[4a20533a0551] [tip]
+
+2012-06-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* examples/Procfile, examples/config.yml,
+	examples/static/examples.html, lib/strelka/authprovider/basic.rb:
+	Applied fixes for the examples/.
+	[d52a6f2ddc3d]
+
+2012-06-01  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/app/auth.rb, lib/strelka/session/db.rb,
+	lib/strelka/session/default.rb, spec/strelka/app/auth_spec.rb,
+	spec/strelka/session/db_spec.rb:
+	Allow the configured auth provider to work with inherited
+	subhandlers. Require connection string configuration for the DB
+	session class.
+	[c1bb99c6ba36]
+
 2012-05-31  Michael Granger  <ged@FaerieMUD.org>
 
+	* lib/strelka/session/db.rb, lib/strelka/session/default.rb:
+	Move .configure method to the bottom of class methods to avoid
+	calling them before they're defined.
+	[b80079d190c2]
+
+	* lib/strelka.rb, lib/strelka/app.rb, lib/strelka/app/auth.rb,
+	lib/strelka/app/sessions.rb:
+	Load-order bugfixes for Configurability API.
+	[3c639d92e751]
+
+	* Manifest.txt:
+	Updating the manifest
+	[b4fcae2e5d2b]
+
 	* .tm_properties, lib/strelka/app/auth.rb,
 	lib/strelka/authprovider/basic.rb,
 	lib/strelka/authprovider/hostaccess.rb,
 	spec/strelka/app/auth_spec.rb,
 	spec/strelka/authprovider/basic_spec.rb:
 	Rewriting auth plugin to work app-agnostically
-	[f569df3baa60] [tip]
+	[f569df3baa60]
 
 	* lib/strelka/app/sessions.rb, lib/strelka/cookie.rb,
 	lib/strelka/session/db.rb, lib/strelka/session/default.rb,
@@ -88,7 +126,7 @@
 	* bin/strelka:
 	Load the apps in bin/strelka before dumping the config so
 	Configurability defaults for them show up
-	[726ed30cb34e]
+	[726ed30cb34e] [github/master]
 
 	* .rvm.gems, Rakefile:
 	Add dependency on Foreman
@@ -700,7 +738,7 @@
 
 	* lib/strelka/app/errors.rb, spec/strelka/app/errors_spec.rb:
 	Add documentation for the Errors plugin, improve test coverage.
-	[ff3ef6e5a7a1]
+	[ff3ef6e5a7a1] [github/master@default]
 
 	* Manifest.txt:
 	Add session files to the manifest

data/examples/Procfile

@@ -1,8 +1,8 @@
 # Foreman procfile
 mongrel: m2sh.rb -c mongrel2.sqlite start
-helloworld: ../bin/strelka -l info -c config.yml start hello-world
-auth: ../bin/strelka -l info -c config.yml start auth-demo
-auth2: ../bin/strelka -l info -c config.yml start auth-demo2
-sessions: ../bin/strelka -l info -c config.yml start sessions-demo
+helloworld: ../bin/strelka -D . -l warn -c config.yml start hello-world
+auth: ../bin/strelka -D . -l warn -c config.yml start auth-demo
+auth2: ../bin/strelka -D . -l warn -c config.yml start auth-demo2
+sessions: ../bin/strelka -D . -l debug -c config.yml start sessions-demo
 # ws: ../bin/strelka -l info -c config.yml start ws-echo
 

data/examples/config.yml

@@ -7,14 +7,17 @@ auth:
 basicauth:
   realm: Examples
   users:
-    ged: "iEPX+SQWIR3p67lj/0zigSWTKHg="
+    ged: "dn44fsIrKF6KmBw0im4GIJktSpM="
     jblack: "1pAnQNSVtpL1z88QwXV4sG8NMP8="
     kmurgen: "MZj9+VhZ8C9+aJhmwp+kWBL76Vs="
 
 sessions:
   type: default
-  options:
-    cookie-name: "session-demo"
+
+defaultsession:
+  cookie_name: "session-demo"
+  cookie_options:
+    expires: +5m
 
 templates:
   template_paths:

data/examples/static/examples.html

@@ -24,6 +24,7 @@
 		<li><a href="/hello">Hello World</a> - A super-basic handler.</li>
 		<li><a href="/sessions">Sessions Demo</a> - Demo of the <code>:sessions</code> plugin.</li>
 		<li><a href="/auth">Auth Demo</a> - Demo of the <code>:auth</code> plugin.</li>
+		<li><a href="/formauth">Form Auth Demo</a> - Demo of the <code>:auth</code> plugin with the :errors plugin for auth failure management.</li>
 	</ul>
 
 </body>

data/lib/strelka/app/auth.rb

@@ -123,11 +123,12 @@ require 'strelka/authprovider'
 # Sometimes simple authentication isn't sufficient for accessing some
 # resources, especially if you have some kind of permissions system that
 # dictates who can see/use what. That's where the second stage of the
-# authentification process comes into play: Authorization.
+# auth process comes into play: Authorization.
 #
-# The AuthProvider you're using may provide some form of general authorization
-# itself (especially a custom one), but typically authorization is particular to an application and
-# even particular actions within the application.
+# The AuthProvider you're using may provide some form of general
+# authorization itself (especially a custom one), but typically
+# authorization is particular to an application and even particular
+# actions within the application.
 #
 # To facilitate mapping out what actions are available to whom, there is a
 # declaration similar to require_auth_for that can define a set of permissions
@@ -257,10 +258,10 @@ module Strelka::App::Auth
 	### Configurability API -- configure the Auth plugin via the 'auth' section of the
 	### unified config.
 	def self::configure( config=nil )
-		if config && config.provider?
+		if config && config[:provider]
 			self.log.debug "Setting up the %p AuthProvider for apps: %p" %
-				[ config.provider, self.extended_apps ]
-			self.extended_apps.each {|app| app.auth_provider = config.provider }
+				[ config[:provider], self.extended_apps ]
+			self.extended_apps.each {|app| app.auth_provider = config[:provider] }
 		else
 			self.log.warn "Setting up the default AuthProvider for apps %p" % [ self.extended_apps ]
 			self.extended_apps.each {|app| app.auth_provider = DEFAULT_AUTH_PROVIDER }
@@ -306,6 +307,7 @@ module Strelka::App::Auth
 		### Extension callback -- add instance variables to extending objects.
 		def inherited( subclass )
 			super
+			Strelka::App::Auth.extended_apps << subclass
 			subclass.instance_variable_set( :@auth_provider, @auth_provider )
 			subclass.instance_variable_set( :@positive_auth_criteria, @positive_auth_criteria.dup )
 			subclass.instance_variable_set( :@negative_auth_criteria, @negative_auth_criteria.dup )

data/lib/strelka/authprovider/basic.rb

@@ -24,6 +24,9 @@ require 'strelka/mixins'
 #
 #   --
 #   auth:
+#     provider: basic
+#
+#   basicauth:
 #     realm: Acme Admin Console
 #     users:
 #       mgranger: "9d5lIumnMJXmVT/34QrMuyj+p0E="

data/lib/strelka/authprovider/hostaccess.rb

@@ -77,7 +77,7 @@ class Strelka::AuthProvider::HostAccess < Strelka::AuthProvider
 
 	### Check authorization for the specified +request+ by testing its the IP in its
 	### X-forwarded-for header against the allowed_netblocks.
-	def authorize( _, request )
+	def authorize( _, request, _ )
 		client_ip = request.header.x_forwarded_for or
 			raise "No X-Forwarded-For header?!"
 		addr = IPAddr.new( client_ip )

data/lib/strelka/session/db.rb

@@ -66,12 +66,12 @@ class Strelka::Session::Db < Strelka::Session::Default
 	### attribute to a Sequel dataset on the configured DB table.
 	###
 	def self::initialize_sessions_table
-		if self.db.table_exists?( self.table_name )
+		if self.db.table_exists?( self.table_name.to_sym )
 			self.log.debug "Using existing sessions table for %p" % [ db ]
 
 		else
 			self.log.debug "Creating new sessions table for %p" % [ db ]
-			self.db.create_table( self.table_name ) do
+			self.db.create_table( self.table_name.to_sym ) do
 				text :session_id, :index => true
 				text :session
 				timestamp :created
@@ -134,19 +134,15 @@ class Strelka::Session::Db < Strelka::Session::Default
 	def self::configure( options=nil )
 		super
 
-		if options
-			self.table_name = options[:table_name]
-			self.db = options[ :connect ].nil? ?
-				 Mongrel2::Config.in_memory_db :
-				 Sequel.connect( options[:connect] )
-		else
-			self.table_name = CONFIG_DEFAULTS[:table_name]
-			self.db = Mongrel2::Config.in_memory_db
-		end
+		if options && options[:connect]
+			self.log.warn "Configuring dbsession with: %p" % [ options ]
+			self.table_name = options[:table_name] || CONFIG_DEFAULTS[:table_name]
+			self.db = Sequel.connect( options[:connect] )
 
-		self.db.logger = Loggability[ Mongrel2 ].proxy_for( self.db )
-		self.db.sql_log_level = :debug
-		self.initialize_sessions_table
+			self.db.logger = Loggability[ Mongrel2 ].proxy_for( self.db )
+			self.db.sql_log_level = :debug
+			self.initialize_sessions_table
+		end
 	end
 
 

data/lib/strelka/session/default.rb

@@ -182,7 +182,7 @@ class Strelka::Session::Default < Strelka::Session
 		session_cookie = Strelka::Cookie.new(
 			self.class.cookie_name,
 			self.session_id,
-			self.class.cookie_options
+			self.class.cookie_options || {}
 		)
 
 		response.cookies << session_cookie

data/spec/strelka/app/auth_spec.rb

@@ -47,7 +47,6 @@ describe Strelka::App::Auth do
 		app.auth_provider.should < Strelka::AuthProvider
 	end
 
-
 	it "adds the Auth mixin to the request class" do
 		app = Class.new( Strelka::App ) do
 			plugins :auth
@@ -116,6 +115,12 @@ describe Strelka::App::Auth do
 			req.authenticated_user.should == 'anonymous'
 		end
 
+		it "has its configured auth provider inherited by subclasses" do
+			Strelka::App::Auth.configure( :provider => 'basic' )
+			subclass = Class.new( @app )
+			subclass.auth_provider.should == Strelka::AuthProvider::Basic
+		end
+
 		it "has its auth config inherited by subclasses" do
 			subclass = Class.new( @app )
 

data/spec/strelka/authprovider/hostaccess_spec.rb

@@ -56,13 +56,13 @@ describe Strelka::AuthProvider::HostAccess do
 
 	it "allows a request that originates from one of its allowed netblocks" do
 		req = @request_factory.get( '/admin/console', :x_forwarded_for => '127.0.0.1' )
-		@provider.authorize( nil, req ).should be_true()
+		@provider.authorize( nil, req, nil ).should be_true()
 	end
 
 
 	it "doesn't allow a request which is not from one of its allowed netblocks" do
 		req = @request_factory.get( '/admin/console', :x_forwarded_for => '8.8.8.8' )
-		@provider.authorize( nil, req ).should be_false()
+		@provider.authorize( nil, req, nil ).should be_false()
 	end
 
 

data/spec/strelka/session/db_spec.rb

@@ -31,20 +31,22 @@ describe Strelka::Session::Db do
 				:hurrrg => true
 			}
 		}
+		@default_config = {
+			cookie_name: 'chunkers',
+			connect: {
+				adapter: Mongrel2::Config.sqlite_adapter
+			}
+		}
 	end
 
 	before( :each ) do
-		Strelka.log.debug "BEFORE each"
+		described_class.configure( @default_config )
 		@cookie_name = described_class.cookie_name
-		described_class.configure
-		Strelka.log.debug "/BEFORE each"
 	end
 
 	after( :each ) do
-		Strelka.log.debug "AFTER each"
 		described_class.db.drop_table( :sessions ) if
 			described_class.db.table_exists?( :sessions )
-		Strelka.log.debug "/AFTER each"
 	end
 
 	after( :all ) do
@@ -58,7 +60,7 @@ describe Strelka::Session::Db do
 
 
 	it "can change the default table name" do
-		described_class.configure( :table_name => :brothy )
+		described_class.configure( @default_config.merge(:table_name => :brothy) )
 		described_class.db.table_exists?( :brothy ).should be_true()
 		described_class.db.drop_table( :brothy )
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.254
+  version: 0.0.1.pre.257
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop