Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Copy link
Contributor

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 calling Namespace.new in). So the comment above is misleading.

{
// 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;
}

Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line th->ns = ns specifies the main namespace as the current namespace. So the cleaning RubyGems status should be done above 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
Expand Down
Loading