Skip to content

Commit 475b294

Browse files
authored
Merge pull request #20620 from adfoster-r7/pin-rack-dependencies
Pin rack dependencies
2 parents 8672c52 + 3532254 commit 475b294

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ PATH
7171
pdf-reader
7272
pg
7373
puma
74-
rack
74+
rack (~> 2.2)
7575
railties
7676
rasn1 (= 0.14.0)
7777
rb-readline
@@ -102,13 +102,13 @@ PATH
102102
ruby_smb (~> 3.3.15)
103103
rubyntlm
104104
rubyzip
105-
sinatra
105+
sinatra (~> 3.2)
106106
sqlite3 (= 1.7.3)
107107
sshkey
108108
stringio (= 3.1.1)
109109
swagger-blocks
110110
syslog
111-
thin
111+
thin (~> 1.x)
112112
tzinfo
113113
tzinfo-data
114114
unix-crypt

metasploit-framework.gemspec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,12 @@ Gem::Specification.new do |spec|
107107
# Required for Metasploit Web Services
108108
spec.add_runtime_dependency 'puma'
109109
spec.add_runtime_dependency 'ruby-mysql'
110-
spec.add_runtime_dependency 'thin'
111-
spec.add_runtime_dependency 'sinatra'
112-
spec.add_runtime_dependency 'rack'
110+
# webserver - pinned due to: https://github.com/github/secure_headers/issues/514
111+
spec.add_runtime_dependency 'thin', '~> 1.x'
112+
# rack pinned due to authlogic warnings when setting cookie keys with a / char present: https://github.com/binarylogic/authlogic/issues/779
113+
spec.add_runtime_dependency 'rack', '~> 2.2'
114+
# 4.x needs tested and verified for JSON RPC service
115+
spec.add_runtime_dependency 'sinatra', '~> 3.2'
113116
spec.add_runtime_dependency 'warden'
114117
spec.add_runtime_dependency 'swagger-blocks'
115118
# Required for JSON-RPC client

0 commit comments

Comments
 (0)