rack-pubcookie 0.0.1 → 0.0.2

data/lib/rack/pubcookie/auth.rb

@@ -1,6 +1,5 @@
-require 'active_support/core_ext/object/to_query'
+require 'rack/utils'
 require 'openssl'
-require 'openssl/evp'
 require 'base64'
 
 module Rack
@@ -57,7 +56,7 @@ module Rack
         index2 = bytes.pop
         index1 = bytes.pop
 
-        if true # Should eventually check for aes vs des encryption...
+        if true # TODO: should check for aes vs des encryption...
           decrypted = des_decrypt bytes, index1, index2
         else
           decrypted = aes_decrypt bytes, index1, index2
@@ -107,7 +106,10 @@ module Rack
       end
 
       def login_page_html
-        input_val = Base64.encode64 request_login_arguments.to_query
+        query = request_login_arguments.to_a.map{ |k, v|
+          "#{k}=#{Rack::Utils.escape v}"
+        }.join '&'
+        input_val = Base64.encode64 query
         input_val = input_val.gsub("\n", '')
 
         # Curious why exactly this template? This was taken from the pubcookie

data/lib/rack/pubcookie/des.rb

@@ -19,7 +19,7 @@ module Rack
         signature = c.update(bytes[0..127].pack('c*'))
         decrypted = c.update(bytes[128..-1].pack('c*'))
 
-        if OpenSSL::EVP.verify_md5(@granting, signature, decrypted)
+        if @granting.public_key.verify(OpenSSL::Digest::MD5.new, signature, decrypted)
           decrypted
         else
           nil

data/lib/rack/pubcookie/fake.rb

@@ -1,5 +1,11 @@
 module Rack
   module Pubcookie
+
+    # This Rack interface is meant to be used in development. It mocks out
+    # pubcookie authentication by always setting the REMOTE_USER variable to
+    # a specific username given to the constructor.
+    #
+    # This is not meant to be used in production obviously...
     class Fake
 
       def initialize app, username

data/lib/rack/pubcookie/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Pubcookie
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex Crichton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -04:00
+date: 2010-12-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -41,10 +41,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -69,36 +69,16 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
 description: Pubcookie finally leaves the world of apache!
 email: 
 - alex@alexcrichton.com
 executables: []
 
-extensions: 
-- ext/openssl/extconf.rb
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- README.md
-- Rakefile
-- ext/openssl/evp.c
-- ext/openssl/extconf.rb
 - lib/rack-pubcookie.rb
 - lib/rack/pubcookie.rb
 - lib/rack/pubcookie/aes.rb
@@ -106,7 +86,7 @@ files:
 - lib/rack/pubcookie/des.rb
 - lib/rack/pubcookie/fake.rb
 - lib/rack/pubcookie/version.rb
-- rack-pubcookie.gemspec
+- README.md
 - spec/fixtures/granting.crt
 - spec/fixtures/invalid.crt
 - spec/fixtures/test.com
@@ -121,7 +101,6 @@ rdoc_options: []
 
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/.gitignore

@@ -1,8 +0,0 @@
-pkg/*
-*.gem
-.bundle
-
-ext/**/*.bundle
-ext/**/Makefile
-ext/**/*.so
-ext/**/*.o

data/Gemfile

@@ -1,4 +0,0 @@
-source :rubygems
-
-# Specify your gem's dependencies in rack-pubcookie.gemspec
-gemspec :require => 'rack/pubcookie'

data/Gemfile.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-pubcookie (0.0.1)
-      activesupport
-      rack
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.1)
-    diff-lcs (1.1.2)
-    nokogiri (1.4.3.1)
-    rack (1.2.1)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  nokogiri
-  rack
-  rack-pubcookie!
-  rack-test
-  rspec

data/Rakefile

@@ -1,10 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-desc "Build the C extensions"
-task :build_extensions do
-  Dir.chdir(File.expand_path('../ext/openssl', __FILE__)) do
-    sh 'make distclean' if File.exists? 'Makefile'
-    sh 'ruby extconf.rb && make'
-  end
-end

data/ext/openssl/evp.c

@@ -1,36 +0,0 @@
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <ruby.h>
-
-#define GetX509(obj, x509) Data_Get_Struct(obj, X509, x509)
-
-#ifndef RUBY_19
-# define RSTRING_LEN(s) (RSTRING(s)->len)
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-
-VALUE evp_verify_md5(VALUE self, VALUE cert, VALUE signature, VALUE str) {
-  X509 *x509;
-  EVP_MD_CTX ctx;
-  EVP_PKEY *key;
-
-  GetX509(cert, x509);
-  key = X509_extract_key(x509);
-
-  EVP_VerifyInit(&ctx, EVP_md5());
-  EVP_VerifyUpdate(&ctx, RSTRING_PTR(str), RSTRING_LEN(str));
-
-  int ret_val = EVP_VerifyFinal(&ctx,
-        (unsigned char*) RSTRING_PTR(signature),
-        (unsigned int)   RSTRING_LEN(signature),
-        key);
-
-  return ret_val == 1 ? Qtrue : Qfalse;
-}
-
-Init_evp() {
-  VALUE cOpenSSL = rb_define_module("OpenSSL");
-  VALUE cEVP     = rb_define_module_under(cOpenSSL, "EVP");
-
-  rb_define_singleton_method(cEVP, "verify_md5", evp_verify_md5, 3);
-}

data/ext/openssl/extconf.rb

@@ -1,9 +0,0 @@
-require 'mkmf'
-
-if RUBY_VERSION =~ /1\.9/
-  $CFLAGS << ' -DRUBY_19'
-end
-
-if have_header('openssl/evp.h') && have_header('openssl/x509.h')
-  create_makefile('evp')
-end

data/rack-pubcookie.gemspec

@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'rack/pubcookie/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'rack-pubcookie'
-  s.version     = Rack::Pubcookie::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Alex Crichton']
-  s.email       = ['alex@alexcrichton.com']
-  s.homepage    = 'http://github.com/alexcrichton/rack-pubcookie'
-  s.summary     = 'An implentation of pubcookie based on Rack in Ruby'
-  s.description = 'Pubcookie finally leaves the world of apache!'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extensions    = ['ext/openssl/extconf.rb']
-  s.require_paths = ['lib', 'ext']
-
-  s.add_dependency 'rack'
-  s.add_dependency 'activesupport'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'nokogiri'
-end