Skip to content

Commit

Permalink
Merge branch 'master' into issue/969
Browse files Browse the repository at this point in the history
  • Loading branch information
rixvet committed Aug 28, 2023
2 parents 37f3cf1 + c4cdfb4 commit 7bb1a13
Show file tree
Hide file tree
Showing 12 changed files with 117 additions and 92 deletions.
34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/BUG.md

This file was deleted.

34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Bug Report
description: File a bug report
title: "[BUG]: "
labels: ["bug"]
assignees:
- octocat
body:
- type: markdown
attributes:
value: |
Before you submit a bug report please make sure that the same bug was not reported previously.
Further, make sure to include as much information as possible to help identifying it.
- type: input
id: version
attributes:
label: Version Information
description: Which version(s) of the backend, frontend and ui (depending on the bug) are you using.
validations:
required: true
- type: input
id: hashcat
attributes:
label: Hashcat
description: If applicable, which version of Hashcat were you running?
validations:
required: false
- type: textarea
id: description
attributes:
label: Description
description: Describe your issue in as much detail as possible, this may include the exact task command you are trying to run, debug output from the client by running "hashtopolis.exe -d" or with debug flag set on the python client and steps to reproduce.
value: "<<It's broke>> is not a description."
validations:
required: true
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/ENHANCEMENT.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/ENHANCEMENT.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Enhancement
description: Enhancement of a feature or functionality
title: "[ENHANCEMENT]: "
labels: ["enhancement"]
assignees:
- octocat
body:
- type: markdown
attributes:
value: |
Please try to describe the desired enhancement as exactly as possible.
- type: textarea
id: description
attributes:
label: Description
description: "Describe your enhancement proposal as detailed as possible, providing examples helps to understand the desired behavior."
value: "Enhancement Description"
validations:
required: true

19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/EPIC.md

This file was deleted.

19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/EPIC.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Epic
description: Feature issue for large additions/changes. Should only be used by Collaborators.
title: "[EPIC]: "
labels: ["epic"]
assignees:
- octocat
body:
- type: markdown
attributes:
value: |
Please try to describe the desired new addition in detail, i.e. by providing example behaviour, needed actions, handling etc.
- type: textarea
id: description
attributes:
label: Description
description: "Describe your EPIC feature here."
value: "make sure you only propose epic features"
validations:
required: true
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/FEATURE.md

This file was deleted.

19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Feature
description: Request a new feature or functionality
title: "[FEATURE]: "
labels: ["feature"]
assignees:
- octocat
body:
- type: markdown
attributes:
value: |
Please try to describe the desired new functionality in detail, i.e. by providing example behaviour, needed actions, handling etc.
- type: textarea
id: description
attributes:
label: Description
description: "Describe desired functionality here."
value: "make sure that no feature request exists with the same request already"
validations:
required: true
1 change: 1 addition & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Bugfixes
- Clicking pretask in Supertask create screen now directs correctly to the pretask and not a task with the same id (#945)
- Pretask attackCmd parameter was not checked for maximum length of 256 on creation (#963)


# v0.13.1 -> v0.14.0
Expand Down
23 changes: 23 additions & 0 deletions doc/user-api/sections/agent.tex
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,29 @@
}
\end{verbatim}
}
\subsection*{\textit{deleteAgent}}
Delete an agent from the server.
{
\color{blue}
\begin{verbatim}
{
"section": "agent",
"request": "deleteAgent",
"agentId": "241",
"accessKey": "mykey"
}
\end{verbatim}
}
{
\color{OliveGreen}
\begin{verbatim}
{
"section": "agent",
"request": "deleteAgent",
"response": "OK"
}
\end{verbatim}
}
\subsection*{\textit{getBinaries}}
Lists which agent binaries are available on the server to be used for agents.
{
Expand Down
Binary file modified doc/user-api/user-api.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/inc/utils/PretaskUtils.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer,
else if (strpos($cmdLine, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS)) === false) {
throw new HTException("The attack command does not contain the hashlist alias!");
}
else if (strlen($attackCmd) > 256) {
else if (strlen($cmdLine) > 256) {
throw new HTException("Attack command is too long (max 256 characters)!");
}
else if (Util::containsBlacklistedChars($cmdLine)) {
Expand Down

0 comments on commit 7bb1a13

Please sign in to comment.