Skip to content

Commit 1efbc94

Browse files
committed
Merge branch 'master' into dev
2 parents e847c51 + c4cdfb4 commit 1efbc94

File tree

12 files changed

+117
-92
lines changed

12 files changed

+117
-92
lines changed

.github/ISSUE_TEMPLATE/BUG.md

-34
This file was deleted.

.github/ISSUE_TEMPLATE/BUG.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Bug Report
2+
description: File a bug report
3+
title: "[BUG]: "
4+
labels: ["bug"]
5+
assignees:
6+
- octocat
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Before you submit a bug report please make sure that the same bug was not reported previously.
12+
Further, make sure to include as much information as possible to help identifying it.
13+
- type: input
14+
id: version
15+
attributes:
16+
label: Version Information
17+
description: Which version(s) of the backend, frontend and ui (depending on the bug) are you using.
18+
validations:
19+
required: true
20+
- type: input
21+
id: hashcat
22+
attributes:
23+
label: Hashcat
24+
description: If applicable, which version of Hashcat were you running?
25+
validations:
26+
required: false
27+
- type: textarea
28+
id: description
29+
attributes:
30+
label: Description
31+
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.
32+
value: "<<It's broke>> is not a description."
33+
validations:
34+
required: true

.github/ISSUE_TEMPLATE/ENHANCEMENT.md

-19
This file was deleted.
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Enhancement
2+
description: Enhancement of a feature or functionality
3+
title: "[ENHANCEMENT]: "
4+
labels: ["enhancement"]
5+
assignees:
6+
- octocat
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Please try to describe the desired enhancement as exactly as possible.
12+
- type: textarea
13+
id: description
14+
attributes:
15+
label: Description
16+
description: "Describe your enhancement proposal as detailed as possible, providing examples helps to understand the desired behavior."
17+
value: "Enhancement Description"
18+
validations:
19+
required: true
20+

.github/ISSUE_TEMPLATE/EPIC.md

-19
This file was deleted.

.github/ISSUE_TEMPLATE/EPIC.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Epic
2+
description: Feature issue for large additions/changes. Should only be used by Collaborators.
3+
title: "[EPIC]: "
4+
labels: ["epic"]
5+
assignees:
6+
- octocat
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Please try to describe the desired new addition in detail, i.e. by providing example behaviour, needed actions, handling etc.
12+
- type: textarea
13+
id: description
14+
attributes:
15+
label: Description
16+
description: "Describe your EPIC feature here."
17+
value: "make sure you only propose epic features"
18+
validations:
19+
required: true

.github/ISSUE_TEMPLATE/FEATURE.md

-19
This file was deleted.

.github/ISSUE_TEMPLATE/FEATURE.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Feature
2+
description: Request a new feature or functionality
3+
title: "[FEATURE]: "
4+
labels: ["feature"]
5+
assignees:
6+
- octocat
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Please try to describe the desired new functionality in detail, i.e. by providing example behaviour, needed actions, handling etc.
12+
- type: textarea
13+
id: description
14+
attributes:
15+
label: Description
16+
description: "Describe desired functionality here."
17+
value: "make sure that no feature request exists with the same request already"
18+
validations:
19+
required: true

doc/changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

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

67

78
# v0.13.1 -> v0.14.0

doc/user-api/sections/agent.tex

+23
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,29 @@
358358
}
359359
\end{verbatim}
360360
}
361+
\subsection*{\textit{deleteAgent}}
362+
Delete an agent from the server.
363+
{
364+
\color{blue}
365+
\begin{verbatim}
366+
{
367+
"section": "agent",
368+
"request": "deleteAgent",
369+
"agentId": "241",
370+
"accessKey": "mykey"
371+
}
372+
\end{verbatim}
373+
}
374+
{
375+
\color{OliveGreen}
376+
\begin{verbatim}
377+
{
378+
"section": "agent",
379+
"request": "deleteAgent",
380+
"response": "OK"
381+
}
382+
\end{verbatim}
383+
}
361384
\subsection*{\textit{getBinaries}}
362385
Lists which agent binaries are available on the server to be used for agents.
363386
{

doc/user-api/user-api.pdf

9.96 KB
Binary file not shown.

src/inc/utils/PretaskUtils.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer,
305305
else if (strpos($cmdLine, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS)) === false) {
306306
throw new HTException("The attack command does not contain the hashlist alias!");
307307
}
308-
else if (strlen($attackCmd) > 256) {
308+
else if (strlen($cmdLine) > 256) {
309309
throw new HTException("Attack command is too long (max 256 characters)!");
310310
}
311311
else if (Util::containsBlacklistedChars($cmdLine)) {

0 commit comments

Comments
 (0)