languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 20:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Censor dart:_blink and dart:builtin from the enumeration of libraries in the isolate and from import lists. Note we are not censoring dart:_internal.

Browse source 
For the moment, this doesn't seem to break any language invariants, but that may happen if
a) the censored libraries start producing instances, whose classes would claim to have no library
b) types from the censored libraries are used in type annotations in the privileged libraries that can import them, resulting in types other than dynamic that claim to belong to no library

R=iposva@google.com

Review URL: https://codereview.chromium.org//321293002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@37238 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
rmacnak@google.com 2014-06-11 17:58:17 +00:00
parent c50d676220
commit ce490637b2
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
runtime/lib/mirrors.cc
View file

@ -385,6 +385,10 @@ static RawInstance* CreateLibraryMirror(const Library& lib) {
str = lib.name();
args.SetAt(1, str);
str = lib.url();
if (str.Equals("dart:builtin") || str.Equals("dart:_blink")) {
// Censored library (grumble).
return Instance::null();
}
args.SetAt(2, str);
return CreateMirror(Symbols::_LocalLibraryMirror(), args);
}
@ -406,6 +410,10 @@ static RawInstance* CreateLibraryDependencyMirror(const Instance& importer,
const Library& importee = Library::Handle(ns.library());
const Instance& importee_mirror =
Instance::Handle(CreateLibraryMirror(importee));
if (importee_mirror.IsNull()) {
// Imported library is censored: censor the import.
return Instance::null();
}
const Array& show_names = Array::Handle(ns.show_names());
const Array& hide_names = Array::Handle(ns.hide_names());
@ -461,7 +469,9 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
ns ^= ports.At(i);
if (!ns.IsNull()) {
dep = CreateLibraryDependencyMirror(lib_mirror, ns, prefix, true);
deps.Add(dep);
if (!dep.IsNull()) {
deps.Add(dep);
}
}
}
@ -470,7 +480,9 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
for (intptr_t i = 0; i < ports.Length(); i++) {
ns ^= ports.At(i);
dep = CreateLibraryDependencyMirror(lib_mirror, ns, prefix, false);
deps.Add(dep);
if (!dep.IsNull()) {
deps.Add(dep);
}
}
// Prefixed imports.
@ -486,7 +498,9 @@ DEFINE_NATIVE_ENTRY(LibraryMirror_libraryDependencies, 2) {
ns ^= ports.At(i);
if (!ns.IsNull()) {
dep = CreateLibraryDependencyMirror(lib_mirror, ns, prefix, true);
deps.Add(dep);
if (!dep.IsNull()) {
deps.Add(dep);
}
}
}
}
@ -549,18 +563,21 @@ static RawInstance* CreateIsolateMirror() {
static RawInstance* CreateMirrorSystem() {
Isolate* isolate = Isolate::Current();
const GrowableObjectArray& libraries =
GrowableObjectArray::Handle(isolate->object_store()->libraries());
const GrowableObjectArray& libraries = GrowableObjectArray::Handle(
isolate, isolate->object_store()->libraries());
const intptr_t num_libraries = libraries.Length();
const Array& library_mirrors = Array::Handle(Array::New(num_libraries));
Library& library = Library::Handle();
Instance& library_mirror = Instance::Handle();
const GrowableObjectArray& library_mirrors = GrowableObjectArray::Handle(
isolate, GrowableObjectArray::New(num_libraries));
Library& library = Library::Handle(isolate);
Instance& library_mirror = Instance::Handle(isolate);
for (int i = 0; i < num_libraries; i++) {
library ^= libraries.At(i);
library_mirror = CreateLibraryMirror(library);
library_mirrors.SetAt(i, library_mirror);
if (!library_mirror.IsNull()) {
library_mirrors.Add(library_mirror);
}
}
const Instance& isolate_mirror = Instance::Handle(CreateIsolateMirror());

15
tests/lib/mirrors/mirrors_reader_test.dart
View file

@ -7,16 +7,29 @@
library test.mirrors.reader;
import 'dart:mirrors';
import 'package:expect/expect.dart';
import 'mirrors_reader.dart';
class RuntimeMirrorsReader extends MirrorsReader {
final MirrorSystem mirrorSystem;
final String mirrorSystemType;
RuntimeMirrorsReader(MirrorSystem mirrorSystem,
{bool verbose: false, bool includeStackTrace: false})
: this.mirrorSystemType = '${mirrorSystem.runtimeType}',
: this.mirrorSystem = mirrorSystem,
this.mirrorSystemType = '${mirrorSystem.runtimeType}',
super(verbose: verbose, includeStackTrace: includeStackTrace);
visitLibraryMirror(LibraryMirror mirror) {
super.visitLibraryMirror(mirror);
Expect.equals(mirror, mirrorSystem.libraries[mirror.uri]);
}
visitClassMirror(ClassMirror mirror) {
super.visitClassMirror(mirror);
Expect.isNotNull(mirror.owner);
}
bool allowUnsupported(var receiver, String tag, UnsupportedError exception) {
if (mirrorSystemType == '_LocalMirrorSystem') {
// VM mirror system.