Skip to content

Commit

Permalink
Merge pull request #1362 from psu-libraries/nov-24-sec-vulns
Browse files Browse the repository at this point in the history
resolve security vulnerabilities
  • Loading branch information
Smullz622 authored Nov 26, 2024
2 parents edbe632 + 0a75633 commit ec62083
Show file tree
Hide file tree
Showing 20 changed files with 2,147 additions and 2,303 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'net-smtp', require: false
gem 'okcomputer', '~> 1.18'
gem 'puma', '~> 6'
gem 'rack-mini-profiler'
gem 'rails', '~> 7.1.3.4'
gem 'rails', '~> 7.1.4.1'
gem 'rsolr', '>= 2.5'
gem 'rubyzip'
gem 'shakapacker', '= 7.1'
Expand Down
150 changes: 74 additions & 76 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
actioncable (7.1.4.2)
actionpack (= 7.1.4.2)
activesupport (= 7.1.4.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionmailbox (7.1.4.2)
actionpack (= 7.1.4.2)
activejob (= 7.1.4.2)
activerecord (= 7.1.4.2)
activestorage (= 7.1.4.2)
activesupport (= 7.1.4.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionmailer (7.1.4.2)
actionpack (= 7.1.4.2)
actionview (= 7.1.4.2)
activejob (= 7.1.4.2)
activesupport (= 7.1.4.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.1.4.2)
actionview (= 7.1.4.2)
activesupport (= 7.1.4.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
actiontext (7.1.4.2)
actionpack (= 7.1.4.2)
activerecord (= 7.1.4.2)
activestorage (= 7.1.4.2)
activesupport (= 7.1.4.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (7.1.4.2)
activesupport (= 7.1.4.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
activejob (7.1.4.2)
activesupport (= 7.1.4.2)
globalid (>= 0.3.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (7.1.4.2)
activesupport (= 7.1.4.2)
activerecord (7.1.4.2)
activemodel (= 7.1.4.2)
activesupport (= 7.1.4.2)
timeout (>= 0.4.0)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
activestorage (7.1.4.2)
actionpack (= 7.1.4.2)
activejob (= 7.1.4.2)
activerecord (= 7.1.4.2)
activesupport (= 7.1.4.2)
marcel (~> 1.0)
activesupport (7.1.3.4)
activesupport (7.1.4.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -136,14 +136,14 @@ GEM
childprocess (5.0.0)
coderay (1.1.3)
colorize (0.8.1)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
config (5.4.0)
deep_merge (~> 1.2, >= 1.2.1)
connection_pool (2.4.1)
crack (0.4.5)
rexml
crass (1.0.6)
date (3.3.4)
date (3.4.0)
debug_inspector (1.2.0)
deep_merge (1.2.2)
deprecation (1.1.0)
Expand Down Expand Up @@ -214,10 +214,10 @@ GEM
domain_name (~> 0.5)
http-form_data (2.3.0)
httpclient (2.8.3)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.11.5)
Expand Down Expand Up @@ -253,7 +253,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.22.0)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -272,15 +272,15 @@ GEM
memory_profiler (1.0.1)
method_source (1.0.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.24.1)
mini_portile2 (2.8.8)
minitest (5.25.2)
msgpack (1.7.2)
multipart-post (2.4.0)
mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
mutex_m (0.3.0)
mysql2 (0.5.6)
net-imap (0.4.14)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -297,8 +297,8 @@ GEM
rubocop-rails (~> 2.3)
rubocop-rspec (~> 2)
scss_lint (~> 0.55)
nio4r (2.7.3)
nokogiri (1.16.6)
nio4r (2.7.4)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
okcomputer (1.18.5)
Expand All @@ -315,12 +315,12 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
psych (5.1.2)
psych (5.2.0)
stringio
public_suffix (5.0.5)
puma (6.4.3)
nio4r (~> 2.0)
racc (1.8.0)
racc (1.8.1)
rack (3.1.8)
rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
Expand All @@ -334,23 +334,22 @@ GEM
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rackup (2.2.1)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
rails (7.1.4.2)
actioncable (= 7.1.4.2)
actionmailbox (= 7.1.4.2)
actionmailer (= 7.1.4.2)
actionpack (= 7.1.4.2)
actiontext (= 7.1.4.2)
actionview (= 7.1.4.2)
activejob (= 7.1.4.2)
activemodel (= 7.1.4.2)
activerecord (= 7.1.4.2)
activestorage (= 7.1.4.2)
activesupport (= 7.1.4.2)
bundler (>= 1.15.0)
railties (= 7.1.3.4)
railties (= 7.1.4.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -362,9 +361,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
railties (7.1.4.2)
actionpack (= 7.1.4.2)
activesupport (= 7.1.4.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -375,10 +374,10 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.7.0)
rdoc (6.8.1)
psych (>= 4.0.0)
regexp_parser (2.9.0)
reline (0.5.9)
reline (0.5.11)
io-console (~> 0.5)
request_store (1.6.0)
rack (>= 1.4)
Expand Down Expand Up @@ -488,10 +487,10 @@ GEM
sqlite3 (1.5.4)
mini_portile2 (~> 2.8.0)
stackprof (0.2.26)
stringio (3.1.1)
thor (1.3.1)
stringio (3.1.2)
thor (1.3.2)
tilt (2.4.0)
timeout (0.4.1)
timeout (0.4.2)
traject (3.8.2)
concurrent-ruby (>= 0.8.0)
dot-properties (>= 0.1.1)
Expand Down Expand Up @@ -525,15 +524,14 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.2)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
yell (2.2.2)
zeitwerk (2.6.16)
zeitwerk (2.6.18)

PLATFORMS
ruby
Expand Down Expand Up @@ -570,7 +568,7 @@ DEPENDENCIES
pry-byebug
puma (~> 6)
rack-mini-profiler
rails (~> 7.1.3.4)
rails (~> 7.1.4.1)
rails-controller-testing
rsolr (>= 2.5)
rspec-its
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/availability/components/availability.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ const Availability = ({ structuredHoldings, summaryHoldings }) => (
: null;

const [visibleHoldings, setVisibleHoldings] = useState(
holdings.slice(0, initialVisibleCount)
holdings.slice(0, initialVisibleCount),
);
const [moreHoldings, setMoreHoldings] = useState(
holdings.length > initialVisibleCount
? holdings.slice(initialVisibleCount)
: []
: [],
);
const [lastA11yIndex, setLastA11yIndex] = useState(0);

Expand Down
10 changes: 6 additions & 4 deletions app/javascript/availability/components/special_request_link.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,24 @@ const SpecialRequestLink = ({ holding, locationText }) => {

const pubPlace = (data) =>
encodeURIComponent(
data.publication_place_ssm ? data.publication_place_ssm : ''
data.publication_place_ssm ? data.publication_place_ssm : '',
);

const edition = (data) =>
encodeURIComponent(
data.edition_display_ssm ? data.edition_display_ssm : ''
data.edition_display_ssm ? data.edition_display_ssm : '',
);

const restrictions = (data) =>
encodeURIComponent(
data.restrictions_access_note_ssm ? data.restrictions_access_note_ssm : ''
data.restrictions_access_note_ssm
? data.restrictions_access_note_ssm
: '',
);

const subLocation = (data) =>
encodeURIComponent(
data.sublocation_ssm ? data.sublocation_ssm.join('; ') : ''
data.sublocation_ssm ? data.sublocation_ssm.join('; ') : '',
);

const label = () => {
Expand Down
Loading

0 comments on commit ec62083

Please sign in to comment.