strelka 0.18.0 → 0.19.0

data/lib/strelka/session/default.rb

@@ -78,7 +78,7 @@ class Strelka::Session::Default < Strelka::Session
 		cookie = request.cookies[ self.cookie_name ] or return nil
 
 		if cookie.value =~ /^([[:xdigit:]]+)$/i
-			return $1.untaint
+			return $1
 		else
 			self.log.warn "Request with a malformed session cookie: %p" % [ request ]
 			return nil

data/spec/strelka/app/parameters_spec.rb

@@ -119,39 +119,13 @@ RSpec.describe Strelka::App::Parameters do
 			end
 
 			it "validates parameters from the request" do
-				req = @request_factory.get( (+'/user/search?username=anheptoh').taint )
+				req = @request_factory.get( (+'/user/search?username=anheptoh') )
 				@app.new.handle( req )
 
 				expect( req.params ).to be_a( Strelka::ParamValidator )
 				expect( req.params ).to be_okay()
 				expect( req.params ).to_not have_errors()
 				expect( req.params[:username] ).to eq( 'anheptoh' )
-				expect( req.params[:username] ).to be_tainted()
-			end
-
-			it "untaints all parameters if global untainting is enabled" do
-				@app.class_eval do
-					untaint_all_constraints true
-				end
-
-				expect( @app.untaint_all_constraints ).to be_truthy()
-				req = @request_factory.get( (+'/user/search?username=shereshnaheth').taint )
-				@app.new.handle( req )
-
-				expect( req.params[:username] ).to eq( 'shereshnaheth' )
-				expect( req.params[:username] ).to_not be_tainted()
-			end
-
-			it "untaints parameters flagged for untainting" do
-				@app.class_eval do
-					param :message, :printable, :untaint
-				end
-
-				req = @request_factory.get( (+'/user/search?message=I+love+the+circus.').taint )
-				@app.new.handle( req )
-
-				expect( req.params[:message] ).to_not be_tainted()
-				expect( req.params[:message] ).to eq( 'I love the circus.' )
 			end
 
 		end

data/spec/strelka/app_spec.rb

@@ -245,18 +245,6 @@ RSpec.describe Strelka::App do
 		expect( @app ).to be_in_devmode()
 	end
 
-	it "configures itself to be in 'developer mode' if debugging is enabled" do
-		debugsetting = $DEBUG
-
-		begin
-			$DEBUG = true
-			@app.configure
-			expect( @app ).to be_in_devmode()
-		ensure
-			$DEBUG = debugsetting
-		end
-	end
-
 	it "closes async uploads with a 413 Request Entity Too Large by default" do
 		@req.headers.x_mongrel2_upload_start = 'an/uploaded/file/path'
 

data/spec/strelka/mixins_spec.rb

@@ -279,16 +279,6 @@ RSpec.describe Strelka, "mixins" do
 			expect( copy.default_proc ).to eq( original.default_proc )
 		end
 
-		it "preserves taintedness of copied objects" do
-			original = Object.new
-			original.taint
-
-			copy = Strelka::DataUtilities.deep_copy( original )
-
-			expect( copy ).to_not be( original )
-			expect( copy ).to be_tainted()
-		end
-
 		it "preserves frozen-ness of copied objects" do
 			original = Object.new
 			original.freeze

data/spec/strelka/paramvalidator_spec.rb

@@ -16,12 +16,6 @@ require 'strelka/paramvalidator'
 #####################################################################
 RSpec.describe Strelka::ParamValidator do
 
-	# Utility function to make tainted frozen strings out of frozen string literals
-	def tainted( string )
-		return ( +string ).taint.freeze
-	end
-
-
 	before(:each) do
 		@validator = Strelka::ParamValidator.new
 	end
@@ -138,16 +132,6 @@ RSpec.describe Strelka::ParamValidator do
 			expect( @validator.error_messages.first ).to match( /foo/i )
 		end
 
-		it "untaints valid args if told to do so" do
-			tainted_one = tainted( "1" )
-
-			@validator.add( :number, /^\d+$/, :untaint )
-			@validator.validate( 'number' => tainted_one )
-
-			expect( @validator[:number] ).to eq( "1" )
-			expect( @validator[:number].tainted? ).to be_falsey()
-		end
-
 		it "knows the names of fields that were required but missing from the parameters" do
 			@validator.add( :id, :integer, :required )
 			@validator.validate( {} )
@@ -340,38 +324,6 @@ RSpec.describe Strelka::ParamValidator do
 			})
 		end
 
-		it "untaints both keys and values in complex hash fields if untainting is turned on" do
-			@validator.add( 'recipe[ingredient][rarity]', /^([\w\-]+)$/, :required )
-			@validator.add( 'recipe[ingredient][name]', :string )
-			@validator.add( 'recipe[ingredient][cost]', :string )
-			@validator.add( 'recipe[yield]', :string )
-			@validator.untaint_all_constraints = true
-
-			args = {
-				tainted('recipe[ingredient][rarity]') => tainted('super-rare'),
-				tainted('recipe[ingredient][name]') => tainted('nutmeg'),
-				tainted('recipe[ingredient][cost]') => tainted('$0.18'),
-				tainted('recipe[yield]') => tainted('2 loaves'),
-			}
-			@validator.validate( args )
-
-			expect( @validator.valid ).to eq({
-				'recipe' => {
-					'ingredient' => { 'name' => 'nutmeg', 'cost' => '$0.18', 'rarity' => 'super-rare' },
-					'yield' => '2 loaves'
-				}
-			})
-
-			@validator.valid.keys.each {|key| expect(key).to_not be_tainted() }
-			@validator.valid.values.each {|key| expect(key).to_not be_tainted() }
-			@validator.valid['recipe'].keys.each {|key| expect(key).to_not be_tainted() }
-			@validator.valid['recipe']['ingredient'].keys.each {|key| expect(key).to_not be_tainted() }
-			expect( @validator.valid['recipe']['yield'] ).to_not be_tainted()
-			expect( @validator.valid['recipe']['ingredient']['rarity'] ).to_not be_tainted()
-			expect( @validator.valid['recipe']['ingredient']['name'] ).to_not be_tainted()
-			expect( @validator.valid['recipe']['ingredient']['cost'] ).to_not be_tainted()
-		end
-
 	end # describe "hash parameters"
 
 	describe "merging new parameters" do
@@ -453,12 +405,10 @@ RSpec.describe Strelka::ParamValidator do
 			end
 
 			it "returns the captures with named captures as a Hash" do
-				@validator.add( :order_number, /(?<category>[[:upper:]]{3})-(?<sku>\d{12})/, :untaint )
-				@validator.validate( 'order_number' => tainted("   JVV-886451300133   ") )
+				@validator.add( :order_number, /(?<category>[[:upper:]]{3})-(?<sku>\d{12})/ )
+				@validator.validate( 'order_number' => "   JVV-886451300133   ".dup )
 
 				expect( @validator[:order_number] ).to eq( {:category => 'JVV', :sku => '886451300133'} )
-				expect( @validator[:order_number][:category] ).to_not be_tainted()
-				expect( @validator[:order_number][:sku] ).to_not be_tainted()
 			end
 
 			it "returns the captures as an array " +
@@ -782,7 +732,7 @@ RSpec.describe Strelka::ParamValidator do
 
 		end
 
-		describe ":date constaints" do
+		describe ":date constraints" do
 
 			before( :each ) do
 				@validator.add( :expires, :date )
@@ -808,7 +758,7 @@ RSpec.describe Strelka::ParamValidator do
 
 		end
 
-		describe ":datetime constaints" do
+		describe ":datetime constraints" do
 
 			before( :each ) do
 				@validator.add( :expires, :datetime )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -11,31 +11,31 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdtYWhs
-  b24vREM9bWFydGluaS9EQz1udTAeFw0xODEyMDkwMzMxNTJaFw0xOTEyMDkwMzMx
-  NTJaMCIxIDAeBgNVBAMMF21haGxvbi9EQz1tYXJ0aW5pL0RDPW51MIIBojANBgkq
-  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3cz7ILM8n+Y5nvz7mVRVqE8LusWdT8NX
-  nlnETynDndenI+a2S3j22DR+U4ooGUjuCHE3iR1CVmTDGbxFfNRfmnC1AN9Hybat
-  ewW+onvMBye7yfO0bJB5vkqaW5vd35rzquOffgBtJMo7rPRu6pX8RkL34Wnew4J7
-  POooUcYbWSAO934HSCUC8wVm6b4v/ejVF1Lk44Dz45jtMqtR7KTAtpipdbTXAarO
-  HQy3eVes/0oTqhk4CP50r1KP09nUHTn2lzVaCN9vmNE/Jwe0AuQ9ImvZXPpCsMMl
-  V03/tuJ++48sVmOIusJkASPupXcdI6zqsjYw2vLMFtuYNskRSvwbn6Wm6x9hLWWj
-  IRp5FvHPORLRCHFizXRmXZ3PyFHqbv6m4yG0SyfMzOXPk3Hn5dqqmK+BFCihTZIN
-  fqpBmuxyNEE21fSO9ALLlWeW9ffg9Ye5Sc1n3yEyv8rPb9VDvi1B5N6xIcDFMNVs
-  RiCamNbET4Sq9VIYwYtcB1f6EataqFEhAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBR8KtAhZIhe2uPQHCgU5HurIG7crTAcBgNVHREE
-  FTATgRFtYWhsb25AbWFydGluaS5udTAcBgNVHRIEFTATgRFtYWhsb25AbWFydGlu
-  aS5udTANBgkqhkiG9w0BAQsFAAOCAYEABMyF43FOfY+DULlLbR/S6k62DxsJn6dA
-  YE1DI0o/IGN9t6ga7iQT944HM3gg1AIsONBvFwU31/VLG3Pp91k6YVEQvZITKBOz
-  EVjhTfKBvoqWyuwMKCYn9ZtCASfZDFec7SMsgwIbKuncb6RKjH9cYauuDOtd55lC
-  pie+OmOF330StWH/Z/WY5WiRGstpL5/Qk0y4NMqcV/T59fNIVNxG4k5/VNgVYQIM
-  4Yrvx5tkYPIvPOroIGfDu6CfrQVNg4QJrQN2LZmXGoEV47v1kdV9kMAeFDBkTmPS
-  XqnsRK6X7WhFON8/7CliGvF+T8dmfGJS5R46x7FIzendFMA6pY4IknfGEabzyL9O
-  8IIu155/luqHPnzYLlRi4n+hzwkwGh9erCmbMqrsATqVf4C20H7EAOlDlhmNDqiV
-  g3nSb5geweeDxf7Phf3qyZgglWB4UGR0aUkzOwj6yFj1ugCU2R7CwNhqgmtdkvYm
-  tuLuv1oCfpuEmRh93FiLFsOLV3auiU+c
+  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
+  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
+  L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
+  M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
+  5PU2AEbf04GGSrmqADGWXeaslaoRdb1fu/0M5qfPTRn5V39sWD9umuDAF9qqil/x
+  Sl6phTvgBrG8GExHbNZpLARd3xrBYLEFsX7RvBn2UPfgsrtvpdXjsHGfpT3IPN+B
+  vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
+  dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
+  ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
+  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
+  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
+  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
+  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
+  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
+  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
+  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
+  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
+  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: mongrel2
   requirement: !ruby/object:Gem::Requirement
@@ -192,61 +192,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -276,104 +248,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
-description: |-
-  Strelka is a framework for creating and deploying
-  Mongrel2[http://mongrel2.org/] web applications in Ruby.
-
-  It's named after a lesser known {Russian
-  cosmonaut}[http://en.wikipedia.org/wiki/Strelka_(dog)#Belka_and_Strelka] who was
-  one of the first canine space travelers to orbit the Earth and return alive.
-  Her name means "little arrow".
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+description: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]
+  web applications in Ruby.
 email:
 - mahlon@martini.nu
-- ged@FaerieMUD.org
-executables:
-- strelka
+- ged@faeriemud.org
+executables: []
 extensions: []
-extra_rdoc_files:
-- Deploying.rdoc
-- History.rdoc
-- IDEAS.rdoc
-- MILESTONES.rdoc
-- Manifest.txt
-- Plugins.rdoc
-- README.rdoc
-- Tutorial.rdoc
+extra_rdoc_files: []
 files:
-- ".gemtest"
-- ChangeLog
 - Deploying.rdoc
 - History.rdoc
 - IDEAS.rdoc
-- MILESTONES.rdoc
-- Manifest.txt
 - Plugins.rdoc
 - README.rdoc
 - Rakefile
 - Tutorial.rdoc
 - bin/strelka
-- contrib/hoetemplate/History.rdoc.erb
-- contrib/hoetemplate/Manifest.txt.erb
-- contrib/hoetemplate/README.rdoc.erb
-- contrib/hoetemplate/Rakefile.erb
-- contrib/hoetemplate/data/project/apps/file_name_app
-- contrib/hoetemplate/data/project/templates/layout.tmpl.erb
-- contrib/hoetemplate/data/project/templates/top.tmpl.erb
-- contrib/hoetemplate/lib/file_name.rb.erb
-- contrib/hoetemplate/spec/file_name_spec.rb.erb
-- contrib/strelka-dogs/doggie6.svg
-- contrib/strelka-dogs/doggie7.svg
-- examples/Procfile
-- examples/apps/auth-demo
-- examples/apps/auth-demo2
-- examples/apps/hello-world
-- examples/apps/sessions-demo
-- examples/apps/upload-demo
-- examples/apps/ws-chat
-- examples/apps/ws-echo
-- examples/config.yml
-- examples/gen-config.rb
-- examples/static/examples.css
-- examples/static/examples.html
-- examples/strelka.conf.example
-- examples/templates/auth-form.tmpl
-- examples/templates/auth-success.tmpl
-- examples/templates/layout.tmpl
-- examples/templates/upload-form.tmpl
-- examples/templates/upload-success.tmpl
 - lib/strelka.rb
 - lib/strelka/app.rb
 - lib/strelka/app/auth.rb
@@ -477,30 +387,28 @@ files:
 - spec/strelka/websocketserver/routing_spec.rb
 - spec/strelka/websocketserver_spec.rb
 - spec/strelka_spec.rb
-homepage: http://deveiate.org/projects/Strelka
+homepage: https://hg.sr.ht/~ged/Strelka
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]
-  web applications in Ruby
+  web applications in Ruby.
 test_files: []