From 7700c3dbe84c879f5c5a147eda756796bb5c3e23 Mon Sep 17 00:00:00 2001 From: obfuscurity Date: Tue, 29 Jan 2013 13:24:24 -0500 Subject: [PATCH 1/5] set our session_secret explicitly --- lib/descartes/routes/setup.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/descartes/routes/setup.rb b/lib/descartes/routes/setup.rb index 19bd292..2b45b22 100644 --- a/lib/descartes/routes/setup.rb +++ b/lib/descartes/routes/setup.rb @@ -6,6 +6,7 @@ class Web < Sinatra::Base disable :raise_errors if Config.rack_env.eql?("production") disable :show_exceptions if Config.rack_env.eql?("production") use Rack::SslEnforcer if Config.force_https + set :session_secret, Config.session_secret end before do From 461d03b07999228566a767aa01b531c403ba5672 Mon Sep 17 00:00:00 2001 From: obfuscurity Date: Tue, 29 Jan 2013 13:30:41 -0500 Subject: [PATCH 2/5] bump sinatra_auth_github to 0.12.0 --- Gemfile | 2 +- Gemfile.lock | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index b21cd31..90a0917 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "pg" gem "sequel" gem "omniauth" gem 'omniauth-google-apps' -gem "sinatra_auth_github", "0.9.0" +gem "sinatra_auth_github", "0.12.0" gem "openid-redis-store" gem "rack-canonical-host" gem "rack-ssl-enforcer" diff --git a/Gemfile.lock b/Gemfile.lock index 7e1e7ed..b411914 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM eventmachine (1.0.0) faraday (0.8.4) multipart-post (~> 1.1) - faraday_middleware (0.8.8) + faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) foreman (0.59.0) thor (>= 0.13.6) @@ -17,15 +17,15 @@ GEM json (1.7.5) method_source (0.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.5.0) multipart-post (1.1.5) oauth2 (0.5.2) faraday (~> 0.7) multi_json (~> 1.0) - octokit (1.9.4) + octokit (1.19.0) addressable (~> 2.2) faraday (~> 0.8) - faraday_middleware (~> 0.8) + faraday_middleware (~> 0.9) hashie (~> 1.2) multi_json (~> 1.3) omniauth (1.1.1) @@ -80,10 +80,9 @@ GEM rack (~> 1.3, >= 1.3.4) rack-protection (~> 1.1, >= 1.1.2) tilt (~> 1.3, >= 1.3.3) - sinatra_auth_github (0.9.0) + sinatra_auth_github (0.12.0) sinatra (~> 1.0) - warden-github (~> 0.9.0) - yajl-ruby (~> 1.1) + warden-github (~> 0.12.0) slop (3.3.3) thin (1.2.10) daemons (>= 1.0.9) @@ -94,10 +93,10 @@ GEM tzinfo (0.3.35) warden (1.2.1) rack (>= 1.0) - warden-github (0.9.1) + warden-github (0.12.1) json (~> 1.5) oauth2 (~> 0.5.2) - octokit (~> 1.9.4) + octokit (~> 1.19.0) rest-client (~> 1.6.1) warden (~> 1.0) yajl-ruby (~> 1.1) @@ -124,5 +123,5 @@ DEPENDENCIES rufus-scheduler sequel sinatra (= 1.3.1) - sinatra_auth_github (= 0.9.0) + sinatra_auth_github (= 0.12.0) thin (= 1.2.10) From 230641864ce8c65a9a6b38645e51b6fc89f8ff8f Mon Sep 17 00:00:00 2001 From: obfuscurity Date: Tue, 29 Jan 2013 13:47:23 -0500 Subject: [PATCH 3/5] bump to sinatra_auth_github 0.12.1 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 90a0917..e090a71 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "pg" gem "sequel" gem "omniauth" gem 'omniauth-google-apps' -gem "sinatra_auth_github", "0.12.0" +gem "sinatra_auth_github", "0.12.1" gem "openid-redis-store" gem "rack-canonical-host" gem "rack-ssl-enforcer" diff --git a/Gemfile.lock b/Gemfile.lock index b411914..6f86e6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM rack (~> 1.3, >= 1.3.4) rack-protection (~> 1.1, >= 1.1.2) tilt (~> 1.3, >= 1.3.3) - sinatra_auth_github (0.12.0) + sinatra_auth_github (0.12.1) sinatra (~> 1.0) warden-github (~> 0.12.0) slop (3.3.3) @@ -123,5 +123,5 @@ DEPENDENCIES rufus-scheduler sequel sinatra (= 1.3.1) - sinatra_auth_github (= 0.12.0) + sinatra_auth_github (= 0.12.1) thin (= 1.2.10) From 1af0ad763107a7c1e17399210e72694e38957d78 Mon Sep 17 00:00:00 2001 From: obfuscurity Date: Mon, 11 Mar 2013 21:58:37 -0400 Subject: [PATCH 4/5] update sinatra_auth_github --- Gemfile | 2 +- Gemfile.lock | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index e090a71..a5792b2 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem "pg" gem "sequel" gem "omniauth" gem 'omniauth-google-apps' -gem "sinatra_auth_github", "0.12.1" +gem "sinatra_auth_github", "0.13.3" gem "openid-redis-store" gem "rack-canonical-host" gem "rack-ssl-enforcer" diff --git a/Gemfile.lock b/Gemfile.lock index 6f86e6b..25f42fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ GEM daemons (1.1.9) diff-lcs (1.1.3) eventmachine (1.0.0) - faraday (0.8.4) + faraday (0.8.6) multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) @@ -17,17 +17,16 @@ GEM json (1.7.5) method_source (0.8) mime-types (1.19) - multi_json (1.5.0) - multipart-post (1.1.5) - oauth2 (0.5.2) - faraday (~> 0.7) - multi_json (~> 1.0) - octokit (1.19.0) + multi_json (1.6.1) + multipart-post (1.2.0) + netrc (0.7.7) + octokit (1.23.0) addressable (~> 2.2) faraday (~> 0.8) faraday_middleware (~> 0.9) hashie (~> 1.2) multi_json (~> 1.3) + netrc (~> 0.7.7) omniauth (1.1.1) hashie (~> 1.2) rack @@ -80,9 +79,9 @@ GEM rack (~> 1.3, >= 1.3.4) rack-protection (~> 1.1, >= 1.1.2) tilt (~> 1.3, >= 1.3.3) - sinatra_auth_github (0.12.1) + sinatra_auth_github (0.13.3) sinatra (~> 1.0) - warden-github (~> 0.12.0) + warden-github (~> 0.13.1) slop (3.3.3) thin (1.2.10) daemons (>= 1.0.9) @@ -93,14 +92,9 @@ GEM tzinfo (0.3.35) warden (1.2.1) rack (>= 1.0) - warden-github (0.12.1) - json (~> 1.5) - oauth2 (~> 0.5.2) - octokit (~> 1.19.0) - rest-client (~> 1.6.1) - warden (~> 1.0) - yajl-ruby (~> 1.1) - yajl-ruby (1.1.0) + warden-github (0.13.2) + octokit (>= 1.22.0) + warden (> 1.0) PLATFORMS ruby @@ -123,5 +117,5 @@ DEPENDENCIES rufus-scheduler sequel sinatra (= 1.3.1) - sinatra_auth_github (= 0.12.1) + sinatra_auth_github (= 0.13.3) thin (= 1.2.10) From edefd7ac60061318a93f6ff34ff9a04e872ab7eb Mon Sep 17 00:00:00 2001 From: obfuscurity Date: Mon, 11 Mar 2013 22:12:10 -0400 Subject: [PATCH 5/5] add SESSION_SECRET for travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4843622..7ca9771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +env: SESSION_SECRET=foobar before_script: - psql -c 'create database descartes;' -U postgres