Skip to content

Commit 6ea87ed

Browse files
vepanimasintellij-monorepo-bot
authored andcommitted
[graphql]: WEB-73646 check whether a project is trusted before loading JS/TS config
GitOrigin-RevId: bba26dfa0b9367cfc7a36fe3875177f4ae10c974
1 parent 83290b9 commit 6ea87ed

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

javascript/src/com/intellij/graphql/javascript/config/GraphQLJavaScriptConfigLoader.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.intellij.graphql.javascript.config
33
import com.google.gson.Gson
44
import com.intellij.execution.process.CapturingProcessRunner
55
import com.intellij.execution.process.ProcessOutput
6+
import com.intellij.ide.trustedProjects.TrustedProjects
67
import com.intellij.javascript.nodejs.PackageJsonData
78
import com.intellij.javascript.nodejs.execution.NodeTargetRun
89
import com.intellij.javascript.nodejs.execution.NodeTargetRunOptions
@@ -43,6 +44,10 @@ class GraphQLJavaScriptConfigLoader : GraphQLConfigCustomLoader {
4344
}
4445

4546
override fun load(project: Project, file: VirtualFile): Map<*, *>? {
47+
if (!TrustedProjects.isProjectTrusted(project)) {
48+
return null
49+
}
50+
4651
val interpreter = getInterpreter(project)
4752
if (interpreter == null) {
4853
if (interpreterNotificationShown.compareAndSet(false, true)) {

src/main/com/intellij/lang/jsgraphql/ide/config/loader/GraphQLConfigCustomLoader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface GraphQLConfigCustomLoader {
1212

1313
companion object {
1414
@JvmField
15-
val EP_NAME =
15+
val EP_NAME: ExtensionPointName<GraphQLConfigCustomLoader> =
1616
ExtensionPointName.create<GraphQLConfigCustomLoader>("com.intellij.lang.jsgraphql.configCustomLoader")
1717

1818
fun forFile(file: VirtualFile): GraphQLConfigCustomLoader? {

src/main/com/intellij/lang/jsgraphql/ide/config/loader/GraphQLConfigLoader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class GraphQLConfigLoader(private val project: Project) {
164164
private fun readJs(file: VirtualFile): Map<*, *>? {
165165
val loader = GraphQLConfigCustomLoader.forFile(file)
166166
if (loader == null) {
167-
val msg = "custom loader not found for ${file.path}"
167+
val msg = "custom loader isn't found for ${file.path}"
168168
LOG.warn(msg)
169169
throw IllegalArgumentException(msg)
170170
}

0 commit comments

Comments
 (0)