sinatra-portier 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3da293640f70f3b3f0b91c3bea64407d0682b997d901470f40f643164d1d92f
-  data.tar.gz: aefa14eeed1e114e25896608699ffdff4b1b89e846c8964d116be57a1b123b13
+  metadata.gz: cbb567b7fdc34ac49a53113b97b08a27b52c2fd1e85552c2ea44eb7cabfc9666
+  data.tar.gz: 3528e61f4a6fdc75ed3d2aee2bb80235a139860ca079b63d6ee3cfac487adbf3
 SHA512:
-  metadata.gz: e0b4ab607a02a0aecb07b728200b9341f786c022ce8621668a0f4738531d2dbf64f1a5d12e7a6c40e7919b2efb5fed479f0c9fc973afbf3029229a1ff0cf69a1
-  data.tar.gz: a600a75cf7247e8f31c4e0b3f5149df87396b749c4e72a970601fb5163b42d5304826b1a2cc82aac8387bd3f6c6b7a5cd17777dc3d2640f20a7ace47c0fb0411
+  metadata.gz: ce0b199ca249d27d1cefc7db7c25f6bb5595165d7076843a190c448e61b596fcd2b0e3c362ddaf155ca6f7fb3002a73511b0ba4a8f111a5ffc1f5b1bc7b8e15c
+  data.tar.gz: 5c6e1b3cc2890c87f32bda865530accd31ff97df69c5977d1c1de5009337cda8f38447756da9ca202cfae8d34859c8f9d98a6a606efc4d76120ec5587dedceba

data/README.md

@@ -53,7 +53,13 @@ end
 ```
 
 See the rdoc for more details on the helper functions.  For a functioning
-example app, run <tt>rackup -p $PORT</tt> in the example directory.
+example app, start the app in the example directory:
+
+```
+bundle install
+bundle exec rackup -p PORT
+
+```
 
 Available sinatra settings:
 

data/example/app.rb

@@ -1,28 +1,29 @@
-#!/usr/bin/env ruby
-
-$: << File.join(File.dirname(__FILE__), "..", "lib")
-
-require "sinatra/base"
-require "sinatra/browserid"
-
-class TestApp < Sinatra::Base
-  register Sinatra::BrowserID
+require 'sinatra'
+require 'sinatra/browserid'
+
+
+register Sinatra::BrowserID
+
+set :sessions, true
+# Disabling origin-check is needed to make webkit-browsers like Chrome work. 
+# Behind a proxy you will also need to disable :remote_token, regardless for which browser.
+set :protection, except: [:http_origin] 
+get '/' do
+    if authorized?
+        "Welcome, #{authorized_email}"
+    else
+        render_login_button
+    end
+end
 
-  set :sessions, true
+get '/secure' do
+    authorize!                 # require a user be logged in
 
-  get '/' do
-    erb :index
-  end
+    authorized_email   # browserid email
+end
 
-  get '/logout' do
+get '/logout' do
     logout!
 
     redirect '/'
-  end
-
-  get '/confidential' do
-    authorize!
-
-    "Hey #{authorized_email}, you're authorized!"
-  end
-end
+end

data/example/config.ru

@@ -1,2 +1,8 @@
-require "./app"
-run TestApp
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
+
+require './app.rb'
+
+run Sinatra::Application.new

data/lib/sinatra/browserid.rb

@@ -9,6 +9,7 @@ require 'ipaddr'
 require "sinatra/base"
 require 'sinatra/browserid/helpers'
 require 'sinatra/browserid/template'
+require 'addressable/uri'
 
 # This module provides an interface to verify a users email address
 # with browserid.org.
@@ -33,7 +34,8 @@ module Sinatra
               begin
                   # 3. Server checks signature
                   # for that, fetch the public key from the LA instance (TODO: Do that beforehand for trusted instances, and generally cache the key)
-                  public_key_jwks = ::JSON.parse(URI.parse(URI.escape(settings.browserid_url + '/keys.json')).read)
+                  public_key_jwks_uri = Addressable::URI.parse(settings.browserid_url + '/keys.json')
+                  public_key_jwks = ::JSON.parse(URI.parse(public_key_jwks_uri).read)
                   public_key = OpenSSL::PKey::RSA.new
                   if public_key.respond_to? :set_key
                     # set n and d via the new set_key function, as direct access to n and e is blocked for some ruby and openssl versions.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-portier
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Pete Fritchman
 - Malte Paskuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2021-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -67,7 +67,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
-description: 
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.8'
+description:
 email:
 - malte@paskuda.biz
 executables: []
@@ -77,7 +91,6 @@ files:
 - README.md
 - example/app.rb
 - example/config.ru
-- example/views/index.erb
 - lib/sinatra/browserid.rb
 - lib/sinatra/browserid/helpers.rb
 - lib/sinatra/browserid/template.rb
@@ -85,7 +98,7 @@ files:
 homepage: https://github.com/onli/sinatra-portier
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--inline-source"
 require_paths:
@@ -101,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Sinatra extension for user authentication with portier
 test_files: []

data/example/views/index.erb

@@ -1,21 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<h1>Test App</h1>
-
-<p>
-<% if authorized? %>
-Hello, <%= authorized_email %> <a href="/logout">(logout)</a>
-<% else %>
-<%= render_login_button %>
-<% end %>
-</p>
-
-<p>
-see a <a href="/confidential">page that requires a login</a>.
-</p>
-
-</body>
-</html>