Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow links clickable in template editor #119

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Allow links clickable in template editor #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5757d1
allow links clickable in template editor
RamanaReddy0M Sep 5, 2024
948cb70
make links action to ctrl+click
RamanaReddy0M Sep 11, 2024
a50f164
update upload artifact version
RamanaReddy0M Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: mvn --batch-mode --update-snapshots verify

- name: 'Upload Artifact'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: nuclei-burp-plugin-SNAPSHOT-build
path: target/nuclei-burp-plugin-1.1.3-SNAPSHOT-jar-with-dependencies.jar
74 changes: 59 additions & 15 deletions src/main/java/io/projectdiscovery/nuclei/gui/TemplateGeneratorTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,20 @@
import org.yaml.snakeyaml.error.YAMLException;

import javax.swing.*;
import javax.swing.event.MouseInputAdapter;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
import java.awt.*;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -121,14 +126,14 @@ private String createCommand(Path nucleiPath, URL targetUrl) {
}

return String.format("%s -v -t %s -u %s",
wrapWithQuotesIfNecessary(nucleiPath.toString()),
wrapWithQuotesIfNecessary(this.templatePath.toString()),
wrapWithQuotesIfNecessary(targetUrl.toString()));
wrapWithQuotesIfNecessary(nucleiPath.toString()),
wrapWithQuotesIfNecessary(this.templatePath.toString()),
wrapWithQuotesIfNecessary(targetUrl.toString()));
}

private static String wrapWithQuotesIfNecessary(String input) {
return input.contains(" ") ? String.format("\"%s\"", input)
: input;
: input;
RamanaReddy0M marked this conversation as resolved.
Show resolved Hide resolved
}

private void setKeyboardShortcuts() {
Expand Down Expand Up @@ -249,9 +254,48 @@ private RSyntaxTextArea createSmartTextEditor(String templateYaml) {

setupAutoCompletion(textEditor);

// Add mouse listener for Ctrl + Click
textEditor.addMouseListener(new MouseInputAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 1 && e.isControlDown()) { // Trigger on Ctrl + Click
int offset = textEditor.viewToModel2D(e.getPoint());
String url = getUrlAtOffset(textEditor, offset);
if (url != null) {
try {
SwingUtils.openWebPage(new URI(url).toURL());
} catch (IOException | URISyntaxException ex) {
ex.printStackTrace();
}
}
}
}
});

return textEditor;
}

private String getUrlAtOffset(RSyntaxTextArea textEditor, int offset) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method could use a unit test

try {
int start = offset;
int end = offset;
while (start > 0 && !Character.isWhitespace(textEditor.getText(start - 1, 1).charAt(0))) {
start--;
}
while (end < textEditor.getDocument().getLength() && !Character.isWhitespace(textEditor.getText(end, 1).charAt(0))) {
end++;
}

String potentialUrl = textEditor.getText(start, end - start);
if (potentialUrl.startsWith("http://") || potentialUrl.startsWith("https://")) {
return potentialUrl;
}
} catch (BadLocationException e) {
e.printStackTrace();
}
return null;
}

private JMenu createTemplateEditorMenuItems() {
final JMenu templateMenu = new JMenu("Add");
templateMenu.add(createTemplateEditorClassificationMenu());
Expand Down Expand Up @@ -476,8 +520,8 @@ public void approveSelection() {
final File selectedFile = getSelectedFile();
if (selectedFile.exists() && getDialogType() == SAVE_DIALOG) {
final int result = JOptionPane.showConfirmDialog(this, "The selected file already exists. Do you want to overwrite it?",
"Overwrite existing file?",
JOptionPane.YES_NO_CANCEL_OPTION);
"Overwrite existing file?",
JOptionPane.YES_NO_CANCEL_OPTION);
switch (result) {
case JOptionPane.YES_OPTION:
super.approveSelection();
Expand Down Expand Up @@ -511,14 +555,14 @@ private void executeButtonClick() {
}

CommandLineUtils.asyncExecuteCommand(command,
bufferedReader -> bufferedReader.lines()
.map(line -> line + "\n")
.forEach(line -> SwingUtilities.invokeLater(() -> {
this.outputPane.appendText(line, noColor);
this.outputPane.repaint();
})),
exitCode -> SwingUtilities.invokeLater(() -> this.outputPane.appendText("\nThe process exited with code " + exitCode)),
this.nucleiGeneratorSettings::logError);
bufferedReader -> bufferedReader.lines()
RamanaReddy0M marked this conversation as resolved.
Show resolved Hide resolved
.map(line -> line + "\n")
.forEach(line -> SwingUtilities.invokeLater(() -> {
this.outputPane.appendText(line, noColor);
this.outputPane.repaint();
})),
exitCode -> SwingUtilities.invokeLater(() -> this.outputPane.appendText("\nThe process exited with code " + exitCode)),
this.nucleiGeneratorSettings::logError);
}
}
}
}
2 changes: 2 additions & 0 deletions src/main/java/io/projectdiscovery/nuclei/gui/TemplateGeneratorWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ public static void main(String[] args) throws Exception {
" author: forgedhallpass\n" +
" name: Template Name\n" +
" severity: info\n" +
"reference:\n"+
" - https://github.com/projectdiscovery/nuclei-templates\n"+
"http:\n" +
" - raw:\n" +
" - |\n" +
Expand Down
Loading