Skip to content

Commit 00f4f2d

Browse files
committed
Revert "try an allowlist"
1 parent fc010ec commit 00f4f2d

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

+2-28
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ class NativeAssetsBuildRunner {
434434
null,
435435
hookKernelFile,
436436
packageLayout!,
437-
_filteredEnvironment(_environmentVariablesFilter),
438437
),
439438
);
440439
if (buildOutput == null) return null;
@@ -490,7 +489,6 @@ class NativeAssetsBuildRunner {
490489
final environmentFile = File.fromUri(
491490
config.outputDirectory.resolve('../environment.json'),
492491
);
493-
final environment = _filteredEnvironment(_environmentVariablesFilter);
494492
if (buildOutputFile.existsSync() &&
495493
dependenciesHashFile.existsSync() &&
496494
environmentFile.existsSync()) {
@@ -514,7 +512,7 @@ ${e.message}
514512
!const MapEquality<String, String>().equals(
515513
(json.decode(await environmentFile.readAsString()) as Map)
516514
.cast<String, String>(),
517-
environment);
515+
Platform.environment);
518516
if (!dependenciesOutdated && !environmentChanged) {
519517
logger.info(
520518
[
@@ -537,15 +535,14 @@ ${e.message}
537535
resources,
538536
hookKernelFile,
539537
packageLayout,
540-
environment,
541538
);
542539
if (result == null) {
543540
if (await dependenciesHashFile.exists()) {
544541
await dependenciesHashFile.delete();
545542
}
546543
} else {
547544
await environmentFile.writeAsString(
548-
json.encode(environment),
545+
json.encode(Platform.environment),
549546
);
550547
final modifiedDuringBuild = await dependenciesHashes.hashFiles(
551548
[
@@ -564,18 +561,6 @@ ${e.message}
564561
);
565562
}
566563

567-
/// Limit the environment that hook invocations get to see.
568-
///
569-
/// This allowlist lists environment variables needed to run mainstream
570-
/// compilers.
571-
static const _environmentVariablesFilter = {
572-
'ANDROID_HOME',
573-
'PATH',
574-
'SYSTEMROOT',
575-
'TEMP',
576-
'TMP',
577-
};
578-
579564
Future<HookOutput?> _runHookForPackage(
580565
Hook hook,
581566
HookConfig config,
@@ -585,7 +570,6 @@ ${e.message}
585570
Uri? resources,
586571
File hookKernelFile,
587572
PackageLayout packageLayout,
588-
Map<String, String> environment,
589573
) async {
590574
final configFile = config.outputDirectory.resolve('../config.json');
591575
final configFileContents =
@@ -610,8 +594,6 @@ ${e.message}
610594
executable: dartExecutable,
611595
arguments: arguments,
612596
logger: logger,
613-
includeParentEnvironment: false,
614-
environment: environment,
615597
);
616598

617599
var deleteOutputIfExists = false;
@@ -668,12 +650,6 @@ ${e.message}
668650
}
669651
}
670652

671-
Map<String, String> _filteredEnvironment(Set<String> allowList) => {
672-
for (final entry in Platform.environment.entries)
673-
if (allowList.contains(entry.key.toUpperCase()))
674-
entry.key: entry.value,
675-
};
676-
677653
/// Compiles the hook to kernel and caches the kernel.
678654
///
679655
/// If any of the Dart source files, or the package config changed after
@@ -776,8 +752,6 @@ ${e.message}
776752
executable: dartExecutable,
777753
arguments: compileArguments,
778754
logger: logger,
779-
includeParentEnvironment: false,
780-
environment: _filteredEnvironment({'HOME', 'PUB_CACHE'}),
781755
);
782756
var success = true;
783757
if (compileResult.exitCode != 0) {

0 commit comments

Comments
 (0)