Skip to content

Commit e652e1c

Browse files
committed
Improve copy/paste from vuln report
- Fixes #96005: select/copy issue on vuln report
1 parent 14c7038 commit e652e1c

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

model/src/main/java/com/jsql/model/InjectionModel.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,20 +271,20 @@ public String inject(
271271

272272
if (isReport) {
273273
Color colorReport = UIManager.getColor("TextArea.inactiveForeground");
274-
String report = "<br>" + StringUtil.formatReport(colorReport, "Method: ") + httpRequest.method();
275-
report += "<br>" + StringUtil.formatReport(colorReport, "Path: ") + httpRequest.uri().getPath();
274+
String report = "<br>&#10;" + StringUtil.formatReport(colorReport, "Method: ") + httpRequest.method();
275+
report += "<br>&#10;" + StringUtil.formatReport(colorReport, "Path: ") + httpRequest.uri().getPath();
276276
if (httpRequest.uri().getQuery() != null) {
277-
report += "<br>" + StringUtil.formatReport(colorReport, "Query: ") + httpRequest.uri().getQuery();
277+
report += "<br>&#10;" + StringUtil.formatReport(colorReport, "Query: ") + httpRequest.uri().getQuery();
278278
}
279279
if (
280280
!(this.mediatorUtils.getParameterUtil().getListRequest().isEmpty()
281281
&& this.mediatorUtils.getCsrfUtil().getTokenCsrf() == null)
282282
) {
283-
report += "<br>" + StringUtil.formatReport(colorReport, "Body: ") + body;
283+
report += "<br>&#10;" + StringUtil.formatReport(colorReport, "Body: ") + body;
284284
}
285-
report += "<br>" + StringUtil.formatReport(colorReport, "Header: ") + httpRequest.headers().map().entrySet().stream()
285+
report += "<br>&#10;" + StringUtil.formatReport(colorReport, "Header: ") + httpRequest.headers().map().entrySet().stream()
286286
.map(entry -> String.format("%s: %s", entry.getKey(), String.join(StringUtils.EMPTY, entry.getValue())))
287-
.collect(Collectors.joining("<br>"));
287+
.collect(Collectors.joining("<br>&#10;"));
288288
return report;
289289
}
290290

@@ -702,6 +702,6 @@ public void appendAnalysisReport(String analysisReport) {
702702
}
703703

704704
public void appendAnalysisReport(String analysisReport, boolean isInit) {
705-
this.analysisReport += (isInit ? StringUtils.EMPTY : "<br><br>") + analysisReport;
705+
this.analysisReport += (isInit ? StringUtils.EMPTY : "<br>&#10;<br>&#10;") + analysisReport;
706706
}
707707
}

model/src/main/java/com/jsql/model/injection/vendor/MediatorVendor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ public Vendor fingerprintVendor() {
191191
String.join(
192192
StringUtils.EMPTY,
193193
"# Date: ", LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE),
194-
"<br># Tested on: ", SystemUtils.OS_NAME, " (", SystemUtils.OS_VERSION, ")",
195-
"<br># Tool: ", StringUtil.APP_NAME, " v", this.injectionModel.getPropertiesUtil().getVersionJsql(),
194+
"<br>&#10;# Tested on: ", SystemUtils.OS_NAME, " (", SystemUtils.OS_VERSION, ")",
195+
"<br>&#10;# Tool: ", StringUtil.APP_NAME, " v", this.injectionModel.getPropertiesUtil().getVersionJsql(),
196196
" (<a href=", urlGitHub, ">", urlGitHub, "</a>)",
197-
"<br># Database: ", vendorFound.toString(),
198-
"<br><br>## Vulnerability summary</span>"
197+
"<br>&#10;# Database: ", vendorFound.toString(),
198+
"<br>&#10;<br>&#10;## Vulnerability summary</span>"
199199
),
200200
true
201201
);

view/src/main/java/com/jsql/view/swing/menubar/AppMenubar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import javax.swing.*;
3535
import javax.swing.table.JTableHeader;
3636
import javax.swing.table.TableColumnModel;
37+
import javax.swing.text.JTextComponent;
3738
import javax.swing.text.StyleConstants;
3839
import java.awt.*;
3940
import java.awt.event.InputEvent;
@@ -112,7 +113,7 @@ private JMenu initMenuEdit() {
112113
if (MediatorHelper.tabResults().getSelectedComponent() instanceof PanelTable) {
113114
((PanelTable) MediatorHelper.tabResults().getSelectedComponent()).copyTable();
114115
} else if (MediatorHelper.tabResults().getSelectedComponent() instanceof JScrollPane) {
115-
((JTextArea) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).copy();
116+
((JTextComponent) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).copy();
116117
}
117118
});
118119

@@ -125,7 +126,7 @@ private JMenu initMenuEdit() {
125126
} else if (MediatorHelper.tabResults().getSelectedComponent() instanceof JScrollPane) {
126127
// Textarea need focus to select all
127128
((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView().requestFocusInWindow();
128-
((JTextArea) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).selectAll();
129+
((JTextComponent) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).selectAll();
129130
}
130131
});
131132

0 commit comments

Comments
 (0)