-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Fix Namespace RubyGems isolation issue #13313
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.
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
Open
jsxs0
wants to merge
4
commits into
ruby:master
Choose a base branch
from
jsxs0:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+28
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -567,6 +567,22 @@ namespace_initialize(VALUE namespace) | |
|
||
setup_pushing_loading_namespace(ns); | ||
|
||
// Initialize RubyGems for this new namespace, if gems are enabled. | ||
// We check if Gem exists in the main namespace as an indicator | ||
if (rb_const_defined(rb_cObject, rb_intern("Gem"))) | ||
{ | ||
// First check if we need to remove an inherited Gem constant in this namespace's Object | ||
VALUE ns_object = rb_const_get(namespace, rb_intern("Object")); | ||
if (rb_const_defined(ns_object, rb_intern("Gem"))) | ||
{ | ||
// Remove the inherited Gem constant | ||
rb_const_remove(ns_object, rb_intern("Gem")); | ||
} | ||
|
||
// Now load a fresh copy of RubyGems in this namespace | ||
rb_funcall(namespace, rb_intern("require"), 1, rb_str_new_cstr("rubygems")); | ||
} | ||
|
||
return namespace; | ||
} | ||
|
||
|
@@ -1007,6 +1023,18 @@ rb_initialize_main_namespace(void) | |
rb_const_set(rb_cNamespace, rb_intern("MAIN"), main_ns); | ||
|
||
vm->main_namespace = th->ns = main_namespace = ns; | ||
|
||
// If RubyGems was loaded in the root namespace during boot, | ||
// remove it and load a fresh copy in the main namespace | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The line |
||
if (rb_const_defined(rb_cObject, rb_intern("Gem"))) | ||
{ | ||
// Remove the Gem constant from the root Object | ||
rb_const_remove(rb_cObject, rb_intern("Gem")); | ||
|
||
// Now load RubyGems fresh in this namespace if it wasn't disabled | ||
// (if Gem was defined, then gems must be enabled) | ||
rb_funcall(ns->ns_object, rb_intern("require"), 1, rb_str_new_cstr("rubygems")); | ||
} | ||
} | ||
|
||
static VALUE | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check doesn't check
Gem
in main, but the current namespace (the namespace callingNamespace.new
in). So the comment above is misleading.