Skip to content

Commit 29aecdd

Browse files
Added owasp credential properties (#111)
1 parent b2e9cf9 commit 29aecdd

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

Diff for: plugin/src/main/kotlin/com/exactpro/th2/gradle/BaseTh2Plugin.kt

+4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ class BaseTh2Plugin : Plugin<Project> {
9393
apiKey = project.findProperty("nvdApiKey") as? String
9494
delay = (project.findProperty("nvdDelay") as? String)?.toInt() ?: 10_000
9595
datafeedUrl = project.findProperty("nvdDatafeedUrl") as? String
96+
datafeedUser = project.findProperty("nvdDatafeedUser") as? String
97+
datafeedPassword = project.findProperty("nvdDatafeedPassword") as? String
9698
}
9799

98100
analyzers.apply {
@@ -102,6 +104,8 @@ class BaseTh2Plugin : Plugin<Project> {
102104

103105
kev.apply {
104106
url = project.findProperty("analyzersKnownExploitedURL") as? String
107+
user = project.findProperty("analyzersKnownExploitedUser") as? String
108+
password = project.findProperty("analyzersKnownExploitedPassword") as? String
105109
}
106110
}
107111
}

Diff for: plugin/src/test/kotlin/com/exactpro/th2/gradle/BaseTh2PluginTest.kt

+25-1
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,21 @@ internal class BaseTh2PluginTest {
9090
val nvdApiKey = "test-nvdApiKey"
9191
val nvdDelay = 9_999
9292
val nvdDatafeedUrl = "https://nvdDatafeedUrl.test"
93+
val nvdDatafeedUser = "test-nvdDatafeedUser"
94+
val nvdDatafeedPassword = "test-nvdDatafeedPassword"
9395
val analyzersKnownExploitedURL = "https://knownExploitedURL.test"
96+
val analyzersKnownExploitedUser = "test-analyzersKnownExploitedUser"
97+
val analyzersKnownExploitedPassword = "test-analyzersKnownExploitedPassword"
9498
val project = ProjectBuilder.builder().build()
9599

96100
project.extensions.extraProperties["nvdApiKey"] = nvdApiKey
97101
project.extensions.extraProperties["nvdDelay"] = nvdDelay.toString()
98102
project.extensions.extraProperties["nvdDatafeedUrl"] = nvdDatafeedUrl
103+
project.extensions.extraProperties["nvdDatafeedUser"] = nvdDatafeedUser
104+
project.extensions.extraProperties["nvdDatafeedPassword"] = nvdDatafeedPassword
99105
project.extensions.extraProperties["analyzersKnownExploitedURL"] = analyzersKnownExploitedURL
106+
project.extensions.extraProperties["analyzersKnownExploitedUser"] = analyzersKnownExploitedUser
107+
project.extensions.extraProperties["analyzersKnownExploitedPassword"] = analyzersKnownExploitedPassword
100108
project.pluginManager.apply("com.exactpro.th2.gradle.base")
101109

102110
val dependencyCheckExtension = project.the<DependencyCheckExtension>()
@@ -106,11 +114,27 @@ internal class BaseTh2PluginTest {
106114
{ assertEquals(nvdApiKey, nvd.apiKey, "unexpected dependencyCheck.nvd.apiKey") },
107115
{ assertEquals(nvdDelay, nvd.delay, "unexpected dependencyCheck.nvd.nvdDelay") },
108116
{ assertEquals(nvdDatafeedUrl, nvd.datafeedUrl, "unexpected dependencyCheck.nvd.datafeedUrl") },
117+
{ assertEquals(nvdDatafeedUser, nvd.datafeedUser, "unexpected dependencyCheck.nvd.datafeedUser") },
118+
{ assertEquals(nvdDatafeedPassword, nvd.datafeedPassword, "unexpected dependencyCheck.nvd.datafeedPassword") },
109119
{
110120
assertEquals(
111121
analyzersKnownExploitedURL,
112122
analyzers.kev.url,
113-
"unexpected dependencyCheck.analyzers.knownExploitedURL",
123+
"unexpected dependencyCheck.analyzers.kev.url",
124+
)
125+
},
126+
{
127+
assertEquals(
128+
analyzersKnownExploitedUser,
129+
analyzers.kev.user,
130+
"unexpected dependencyCheck.analyzers.kev.user",
131+
)
132+
},
133+
{
134+
assertEquals(
135+
analyzersKnownExploitedPassword,
136+
analyzers.kev.password,
137+
"unexpected dependencyCheck.analyzers.kev.password",
114138
)
115139
},
116140
)

0 commit comments

Comments
 (0)