diff --git a/model/src/main/java/com/jsql/model/InjectionModel.java b/model/src/main/java/com/jsql/model/InjectionModel.java index 8282e97ada..56bc832599 100644 --- a/model/src/main/java/com/jsql/model/InjectionModel.java +++ b/model/src/main/java/com/jsql/model/InjectionModel.java @@ -271,20 +271,20 @@ public String inject( if (isReport) { Color colorReport = UIManager.getColor("TextArea.inactiveForeground"); - String report = "
" + StringUtil.formatReport(colorReport, "Method: ") + httpRequest.method(); - report += "
" + StringUtil.formatReport(colorReport, "Path: ") + httpRequest.uri().getPath(); + String report = "
" + StringUtil.formatReport(colorReport, "Method: ") + httpRequest.method(); + report += "
" + StringUtil.formatReport(colorReport, "Path: ") + httpRequest.uri().getPath(); if (httpRequest.uri().getQuery() != null) { - report += "
" + StringUtil.formatReport(colorReport, "Query: ") + httpRequest.uri().getQuery(); + report += "
" + StringUtil.formatReport(colorReport, "Query: ") + httpRequest.uri().getQuery(); } if ( !(this.mediatorUtils.getParameterUtil().getListRequest().isEmpty() && this.mediatorUtils.getCsrfUtil().getTokenCsrf() == null) ) { - report += "
" + StringUtil.formatReport(colorReport, "Body: ") + body; + report += "
" + StringUtil.formatReport(colorReport, "Body: ") + body; } - report += "
" + StringUtil.formatReport(colorReport, "Header: ") + httpRequest.headers().map().entrySet().stream() + report += "
" + StringUtil.formatReport(colorReport, "Header: ") + httpRequest.headers().map().entrySet().stream() .map(entry -> String.format("%s: %s", entry.getKey(), String.join(StringUtils.EMPTY, entry.getValue()))) - .collect(Collectors.joining("
")); + .collect(Collectors.joining("
")); return report; } @@ -702,6 +702,6 @@ public void appendAnalysisReport(String analysisReport) { } public void appendAnalysisReport(String analysisReport, boolean isInit) { - this.analysisReport += (isInit ? StringUtils.EMPTY : "

") + analysisReport; + this.analysisReport += (isInit ? StringUtils.EMPTY : "

") + analysisReport; } } diff --git a/model/src/main/java/com/jsql/model/injection/vendor/MediatorVendor.java b/model/src/main/java/com/jsql/model/injection/vendor/MediatorVendor.java index 32afc9ac6d..9c7180dd24 100644 --- a/model/src/main/java/com/jsql/model/injection/vendor/MediatorVendor.java +++ b/model/src/main/java/com/jsql/model/injection/vendor/MediatorVendor.java @@ -191,11 +191,11 @@ public Vendor fingerprintVendor() { String.join( StringUtils.EMPTY, "# Date: ", LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE), - "
# Tested on: ", SystemUtils.OS_NAME, " (", SystemUtils.OS_VERSION, ")", - "
# Tool: ", StringUtil.APP_NAME, " v", this.injectionModel.getPropertiesUtil().getVersionJsql(), + "
# Tested on: ", SystemUtils.OS_NAME, " (", SystemUtils.OS_VERSION, ")", + "
# Tool: ", StringUtil.APP_NAME, " v", this.injectionModel.getPropertiesUtil().getVersionJsql(), " (", urlGitHub, ")", - "
# Database: ", vendorFound.toString(), - "

## Vulnerability summary" + "
# Database: ", vendorFound.toString(), + "

## Vulnerability summary" ), true ); diff --git a/view/src/main/java/com/jsql/view/swing/menubar/AppMenubar.java b/view/src/main/java/com/jsql/view/swing/menubar/AppMenubar.java index 0ec2f44f0b..181212b39f 100644 --- a/view/src/main/java/com/jsql/view/swing/menubar/AppMenubar.java +++ b/view/src/main/java/com/jsql/view/swing/menubar/AppMenubar.java @@ -34,6 +34,7 @@ import javax.swing.*; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; +import javax.swing.text.JTextComponent; import javax.swing.text.StyleConstants; import java.awt.*; import java.awt.event.InputEvent; @@ -112,7 +113,7 @@ private JMenu initMenuEdit() { if (MediatorHelper.tabResults().getSelectedComponent() instanceof PanelTable) { ((PanelTable) MediatorHelper.tabResults().getSelectedComponent()).copyTable(); } else if (MediatorHelper.tabResults().getSelectedComponent() instanceof JScrollPane) { - ((JTextArea) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).copy(); + ((JTextComponent) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).copy(); } }); @@ -125,7 +126,7 @@ private JMenu initMenuEdit() { } else if (MediatorHelper.tabResults().getSelectedComponent() instanceof JScrollPane) { // Textarea need focus to select all ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView().requestFocusInWindow(); - ((JTextArea) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).selectAll(); + ((JTextComponent) ((JScrollPane) MediatorHelper.tabResults().getSelectedComponent()).getViewport().getView()).selectAll(); } });