Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix preview #15

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+21 −6
Open

Fix preview #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9aa289
turn off path protection as it mangles slashes in ror URIs
gbilder Jan 27, 2020
05795b1
upgrade rack to deal with low severity security issue
gbilder Jan 27, 2020
cf835b2
provide sample file to reconcile
gbilder Jan 27, 2020
5a85838
forgot to bundle
gbilder Jan 27, 2020
1549116
fix port in README
gbilder Jan 27, 2020
410a533
missing empty .env file
gbilder Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .env
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "http://rubygems.org"
gem "sinatra"
gem "json"
gem "rack"
gem "rack", ">= 1.6.12"
gem "rspec"
gem "simplecov"
gem "sinatra-cross_origin"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ GEM
json (2.1.0)
minitest (5.11.3)
public_suffix (3.0.3)
rack (1.6.11)
rack (1.6.12)
rack-protection (1.5.5)
rack
rack-test (1.1.0)
Expand Down Expand Up @@ -83,7 +83,7 @@ DEPENDENCIES
codeclimate-test-reporter (~> 1.0, >= 1.0.8)
factory_bot
json
rack
rack (>= 1.6.12)
rack-test
rspec
simplecov
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ But if you really want to install and work with the reconciler locally, you can

## test

`curl http://localhost:4567/heartbeat`
`curl http://localhost:9292/heartbeat`

You should see something like:

Expand Down
3 changes: 1 addition & 2 deletions app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
require 'open-uri'

set :bind, '0.0.0.0'
set :protection, except: :frame_options

set :protection, :except=>[:frame_options,:path_traversal]
ROR_API = 'https://api.ror.org'.freeze
ROR_RECON = 'https://reconcile.ror.org'.freeze
MAX_RESULTS = 5
Expand Down
16 changes: 16 additions & 0 deletions example/publisher_affiliation_names_with_local_ids.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
publisher_id name
1000001 University of Oxford
1000002 Oxford University
1000003 Welcome Trust
1000004 US Department of Transportation
1000005 National Aeronautics and Space Administration
1000006 National Institutes of Health
1000007 U.S. Department of Transportation
1000008 US Department of Transport
1000009 NASA
1000010 Wellcome Trust
1000011 Sloan Foundation
1000012 National Institute of Health
1000013 All Souls College, University of Oxford
1000014 Oxfnord University
1000015 The Foundation for Psychoceramics