Skip to content

Commit 4183ae5

Browse files
kluevercopybara-github
authored andcommitted
Migrate from ByteString.copyFrom(String, "UTF-8") to ByteString.copyFromUtf8(String) to avoid the unnecessary checked UnsupportedEncodingException handling.
PiperOrigin-RevId: 852523115 Change-Id: I59f4506982403ec1c3c4dd0622c7911ce35749d1
1 parent f7df903 commit 4183ae5

6 files changed

Lines changed: 9 additions & 10 deletions

File tree

community/detectors/apache_solr_arbitrary_file_reading/src/main/java/com/google/tsunami/plugins/detectors/solr/ApacheSolrArbitraryFileReadingDetector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private boolean enableRemoteStreaming(
192192
var request =
193193
post(targetUri)
194194
.withEmptyHeaders()
195-
.setRequestBody(ByteString.copyFrom(payload, "UTF8"))
195+
.setRequestBody(ByteString.copyFromUtf8(payload))
196196
.build();
197197
var response = httpClient.send(request);
198198
checkTracesBuilder.add(request, response);
@@ -213,7 +213,7 @@ private void closeRemoteStreaming(
213213
var request =
214214
post(targetUri)
215215
.withEmptyHeaders()
216-
.setRequestBody(ByteString.copyFrom(payload, "UTF8"))
216+
.setRequestBody(ByteString.copyFromUtf8(payload))
217217
.build();
218218
var response = httpClient.send(request, networkService);
219219
checkTracesBuilder.add(request, response);

community/detectors/confluence_cve_2021_26084/src/main/java/com/google/tsunami/plugins/detectors/confluence/AtlassianConfluencePreAuthOgnlInjectionDetector.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,10 @@ private boolean isServiceVulnerable(NetworkService networkService) {
112112
post(targetUri)
113113
.setHeaders(
114114
HttpHeaders.builder()
115-
.addHeader("Content-Type",
116-
"application/x-www-form-urlencoded")
115+
.addHeader("Content-Type", "application/x-www-form-urlencoded")
117116
.addHeader("User-Agent", "TSUNAMI_SCANNER")
118117
.build())
119-
.setRequestBody(ByteString.copyFrom(PAYLOAD, "utf-8"))
118+
.setRequestBody(ByteString.copyFromUtf8(PAYLOAD))
120119
.build(),
121120
networkService);
122121
if (response.status() == HttpStatus.FORBIDDEN && response.bodyString().isPresent()) {

community/detectors/rce/apache_spark_exposed_api/src/main/java/com/google/tsunami/plugins/detectors/rce/apachesparksexposedapi/ApacheSparksExposedApiVulnDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private boolean exploitUri(NetworkService networkService) {
140140
.addHeader("Content-Type", "application/json")
141141
.addHeader("User-Agent", "TSUNAMI_SCANNER")
142142
.build())
143-
.setRequestBody(ByteString.copyFrom(finished_payload, "utf-8"))
143+
.setRequestBody(ByteString.copyFromUtf8(finished_payload))
144144
.build(),
145145
networkService);
146146
if (response.status() == HttpStatus.OK && response.bodyString().isPresent()) {

google/detectors/rce/cve20179805/src/main/java/com/google/tsunami/plugins/detectors/rce/cve20179805/ApacheStrutsInsecureDeserializeDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void executeCommand(NetworkService networkService, String targetUri, Str
170170
httpClient.send(
171171
post(targetUri)
172172
.setHeaders(headers)
173-
.setRequestBody(ByteString.copyFrom(payload, "UTF-8"))
173+
.setRequestBody(ByteString.copyFromUtf8(payload))
174174
.build(),
175175
networkService);
176176
}

google/detectors/rce/joomla/rusty_rce/src/main/java/com/google/tsunami/plugins/detectors/rce/joomla/rustyrce/JoomlaRustyRCEDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private HttpResponse executeHttpRequestWithPayload(
203203
return httpClient.send(
204204
post(targetUri)
205205
.setHeaders(headers)
206-
.setRequestBody(ByteString.copyFrom(payload, "UTF-8"))
206+
.setRequestBody(ByteString.copyFromUtf8(payload))
207207
.build(),
208208
networkService);
209209
}

google/detectors/rce/solr_cve201917558/src/main/java/com/google/tsunami/plugins/detectors/rce/SolrVelocityTemplateRceDetector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private boolean createResponseWriter(
171171
httpClient.send(
172172
post(targetUri)
173173
.withEmptyHeaders()
174-
.setRequestBody(ByteString.copyFrom(payload, "UTF8"))
174+
.setRequestBody(ByteString.copyFromUtf8(payload))
175175
.build(),
176176
networkService);
177177
return response.status().code() == 200;
@@ -217,7 +217,7 @@ private void cleanupResponseWriter(
217217
httpClient.send(
218218
post(targetUri)
219219
.withEmptyHeaders()
220-
.setRequestBody(ByteString.copyFrom(payload, "UTF8"))
220+
.setRequestBody(ByteString.copyFromUtf8(payload))
221221
.build(),
222222
networkService);
223223
if (response.status().code() != 200) {

0 commit comments

Comments
 (0)